|
 |
189079 |
commit 826a9b80d7db0395308d9f8d5f23d5afc0756971
|
|
|
189079 |
Author: duke <duke@openjdk.org>
|
|
|
189079 |
Date: Fri Oct 14 20:26:41 2022 +0000
|
|
|
189079 |
|
|
|
189079 |
Backport 21407dec0156301871a83328615e4d975c4287c4
|
|
|
189079 |
|
|
|
189079 |
diff --git a/make/data/tzdata/VERSION b/make/data/tzdata/VERSION
|
|
|
189079 |
index 889d0e6dad7..b8cb36e69f4 100644
|
|
|
189079 |
--- a/make/data/tzdata/VERSION
|
|
|
189079 |
+++ b/make/data/tzdata/VERSION
|
|
|
189079 |
@@ -21,4 +21,4 @@
|
|
|
189079 |
# or visit www.oracle.com if you need additional information or have any
|
|
|
189079 |
# questions.
|
|
|
189079 |
#
|
|
|
189079 |
-tzdata2022d
|
|
|
189079 |
+tzdata2022e
|
|
|
189079 |
diff --git a/make/data/tzdata/asia b/make/data/tzdata/asia
|
|
|
189079 |
index f9df7432947..5b2337fd0b6 100644
|
|
|
189079 |
--- a/make/data/tzdata/asia
|
|
|
189079 |
+++ b/make/data/tzdata/asia
|
|
|
189079 |
@@ -2254,6 +2254,17 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u
|
|
|
189079 |
# From the Arabic version, it seems to say it would be at midnight
|
|
|
189079 |
# (assume 24:00) on the last Thursday in February, starting from 2022.
|
|
|
189079 |
|
|
|
189079 |
+# From Issam Al-Zuwairi (2022-10-05):
|
|
|
189079 |
+# The Council of Ministers in Jordan decided Wednesday 5th October 2022,
|
|
|
189079 |
+# that daylight saving time (DST) will be throughout the year....
|
|
|
189079 |
+#
|
|
|
189079 |
+# From Brian Inglis (2022-10-06):
|
|
|
189079 |
+# https://petra.gov.jo/Include/InnerPage.jsp?ID=45567&lang=en&name=en_news
|
|
|
189079 |
+#
|
|
|
189079 |
+# From Paul Eggert (2022-10-05):
|
|
|
189079 |
+# Like Syria, model this as a transition from EEST +03 (DST) to plain +03
|
|
|
189079 |
+# (non-DST) at the point where DST would otherwise have ended.
|
|
|
189079 |
+
|
|
|
189079 |
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
|
189079 |
Rule Jordan 1973 only - Jun 6 0:00 1:00 S
|
|
|
189079 |
Rule Jordan 1973 1975 - Oct 1 0:00 0 -
|
|
|
189079 |
@@ -2285,11 +2296,12 @@ Rule Jordan 2005 only - Sep lastFri 0:00s 0 -
|
|
|
189079 |
Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 -
|
|
|
189079 |
Rule Jordan 2013 only - Dec 20 0:00 0 -
|
|
|
189079 |
Rule Jordan 2014 2021 - Mar lastThu 24:00 1:00 S
|
|
|
189079 |
-Rule Jordan 2014 max - Oct lastFri 0:00s 0 -
|
|
|
189079 |
-Rule Jordan 2022 max - Feb lastThu 24:00 1:00 S
|
|
|
189079 |
+Rule Jordan 2014 2022 - Oct lastFri 0:00s 0 -
|
|
|
189079 |
+Rule Jordan 2022 only - Feb lastThu 24:00 1:00 S
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
Zone Asia/Amman 2:23:44 - LMT 1931
|
|
|
189079 |
- 2:00 Jordan EE%sT
|
|
|
189079 |
+ 2:00 Jordan EE%sT 2022 Oct 28 0:00s
|
|
|
189079 |
+ 3:00 - +03
|
|
|
189079 |
|
|
|
189079 |
|
|
|
189079 |
# Kazakhstan
|
|
|
189079 |
@@ -3838,19 +3850,27 @@ Rule Syria 2007 only - Nov Fri>=1 0:00 0 -
|
|
|
189079 |
# Our brief summary:
|
|
|
189079 |
# https://www.timeanddate.com/news/time/syria-dst-2012.html
|
|
|
189079 |
|
|
|
189079 |
-# From Arthur David Olson (2012-03-27):
|
|
|
189079 |
-# Assume last Friday in March going forward XXX.
|
|
|
189079 |
+# From Steffen Thorsen (2022-10-05):
|
|
|
189079 |
+# Syria is adopting year-round DST, starting this autumn....
|
|
|
189079 |
+# From https://www.enabbaladi.net/archives/607812
|
|
|
189079 |
+# "This [the decision] came after the weekly government meeting today,
|
|
|
189079 |
+# Tuesday 4 October ..."
|
|
|
189079 |
+#
|
|
|
189079 |
+# From Paul Eggert (2022-10-05):
|
|
|
189079 |
+# Like Jordan, model this as a transition from EEST +03 (DST) to plain +03
|
|
|
189079 |
+# (non-DST) at the point where DST would otherwise have ended.
|
|
|
189079 |
|
|
|
189079 |
Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S
|
|
|
189079 |
Rule Syria 2008 only - Nov 1 0:00 0 -
|
|
|
189079 |
Rule Syria 2009 only - Mar lastFri 0:00 1:00 S
|
|
|
189079 |
Rule Syria 2010 2011 - Apr Fri>=1 0:00 1:00 S
|
|
|
189079 |
-Rule Syria 2012 max - Mar lastFri 0:00 1:00 S
|
|
|
189079 |
-Rule Syria 2009 max - Oct lastFri 0:00 0 -
|
|
|
189079 |
+Rule Syria 2012 2022 - Mar lastFri 0:00 1:00 S
|
|
|
189079 |
+Rule Syria 2009 2022 - Oct lastFri 0:00 0 -
|
|
|
189079 |
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq
|
|
|
189079 |
- 2:00 Syria EE%sT
|
|
|
189079 |
+ 2:00 Syria EE%sT 2022 Oct 28 0:00
|
|
|
189079 |
+ 3:00 - +03
|
|
|
189079 |
|
|
|
189079 |
# Tajikistan
|
|
|
189079 |
# From Shanks & Pottenger.
|
|
|
189079 |
diff --git a/make/data/tzdata/europe b/make/data/tzdata/europe
|
|
|
189079 |
index accc845dbaf..2832c4b9763 100644
|
|
|
189079 |
--- a/make/data/tzdata/europe
|
|
|
189079 |
+++ b/make/data/tzdata/europe
|
|
|
189079 |
@@ -3417,7 +3417,7 @@ Zone Europe/Madrid -0:14:44 - LMT 1901 Jan 1 0:00u
|
|
|
189079 |
0:00 Spain WE%sT 1940 Mar 16 23:00
|
|
|
189079 |
1:00 Spain CE%sT 1979
|
|
|
189079 |
1:00 EU CE%sT
|
|
|
189079 |
-Zone Africa/Ceuta -0:21:16 - LMT 1900 Dec 31 23:38:44
|
|
|
189079 |
+Zone Africa/Ceuta -0:21:16 - LMT 1901 Jan 1 0:00u
|
|
|
189079 |
0:00 - WET 1918 May 6 23:00
|
|
|
189079 |
0:00 1:00 WEST 1918 Oct 7 23:00
|
|
|
189079 |
0:00 - WET 1924
|
|
|
189079 |
diff --git a/make/data/tzdata/northamerica b/make/data/tzdata/northamerica
|
|
|
189079 |
index 114cef14cce..ce4ee74582c 100644
|
|
|
189079 |
--- a/make/data/tzdata/northamerica
|
|
|
189079 |
+++ b/make/data/tzdata/northamerica
|
|
|
189079 |
@@ -462,7 +462,7 @@ Rule Chicago 1922 1966 - Apr lastSun 2:00 1:00 D
|
|
|
189079 |
Rule Chicago 1922 1954 - Sep lastSun 2:00 0 S
|
|
|
189079 |
Rule Chicago 1955 1966 - Oct lastSun 2:00 0 S
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
-Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 12:09:24
|
|
|
189079 |
+Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 18:00u
|
|
|
189079 |
-6:00 US C%sT 1920
|
|
|
189079 |
-6:00 Chicago C%sT 1936 Mar 1 2:00
|
|
|
189079 |
-5:00 - EST 1936 Nov 15 2:00
|
|
|
189079 |
@@ -471,7 +471,7 @@ Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 12:09:24
|
|
|
189079 |
-6:00 Chicago C%sT 1967
|
|
|
189079 |
-6:00 US C%sT
|
|
|
189079 |
# Oliver County, ND switched from mountain to central time on 1992-10-25.
|
|
|
189079 |
-Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 12:14:48
|
|
|
189079 |
+Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 19:00u
|
|
|
189079 |
-7:00 US M%sT 1992 Oct 25 2:00
|
|
|
189079 |
-6:00 US C%sT
|
|
|
189079 |
# Morton County, ND, switched from mountain to central time on
|
|
|
189079 |
@@ -481,7 +481,7 @@ Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 12:14:48
|
|
|
189079 |
# Jones, Mellette, and Todd Counties in South Dakota;
|
|
|
189079 |
# but in practice these other counties were already observing central time.
|
|
|
189079 |
# See <http://www.epa.gov/fedrgstr/EPA-IMPACT/2003/October/Day-28/i27056.htm>.
|
|
|
189079 |
-Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
|
|
|
189079 |
+Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 19:00u
|
|
|
189079 |
-7:00 US M%sT 2003 Oct 26 2:00
|
|
|
189079 |
-6:00 US C%sT
|
|
|
189079 |
|
|
|
189079 |
@@ -498,7 +498,7 @@ Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
|
|
|
189079 |
# largest city in Mercer County). Google Maps places Beulah's city hall
|
|
|
189079 |
# at 47° 15' 51" N, 101° 46' 40" W, which yields an offset of 6h47'07".
|
|
|
189079 |
|
|
|
189079 |
-Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53
|
|
|
189079 |
+Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 19:00u
|
|
|
189079 |
-7:00 US M%sT 2010 Nov 7 2:00
|
|
|
189079 |
-6:00 US C%sT
|
|
|
189079 |
|
|
|
189079 |
@@ -530,7 +530,7 @@ Rule Denver 1921 only - May 22 2:00 0 S
|
|
|
189079 |
Rule Denver 1965 1966 - Apr lastSun 2:00 1:00 D
|
|
|
189079 |
Rule Denver 1965 1966 - Oct lastSun 2:00 0 S
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
-Zone America/Denver -6:59:56 - LMT 1883 Nov 18 12:00:04
|
|
|
189079 |
+Zone America/Denver -6:59:56 - LMT 1883 Nov 18 19:00u
|
|
|
189079 |
-7:00 US M%sT 1920
|
|
|
189079 |
-7:00 Denver M%sT 1942
|
|
|
189079 |
-7:00 US M%sT 1946
|
|
|
189079 |
@@ -583,7 +583,7 @@ Rule CA 1950 1966 - Apr lastSun 1:00 1:00 D
|
|
|
189079 |
Rule CA 1950 1961 - Sep lastSun 2:00 0 S
|
|
|
189079 |
Rule CA 1962 1966 - Oct lastSun 2:00 0 S
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
-Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 12:07:02
|
|
|
189079 |
+Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 20:00u
|
|
|
189079 |
-8:00 US P%sT 1946
|
|
|
189079 |
-8:00 CA P%sT 1967
|
|
|
189079 |
-8:00 US P%sT
|
|
|
189079 |
@@ -845,7 +845,7 @@ Zone Pacific/Honolulu -10:31:26 - LMT 1896 Jan 13 12:00
|
|
|
189079 |
# Go with the Arizona State Library instead.
|
|
|
189079 |
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
-Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 11:31:42
|
|
|
189079 |
+Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 19:00u
|
|
|
189079 |
-7:00 US M%sT 1944 Jan 1 0:01
|
|
|
189079 |
-7:00 - MST 1944 Apr 1 0:01
|
|
|
189079 |
-7:00 US M%sT 1944 Oct 1 0:01
|
|
|
189079 |
@@ -873,7 +873,7 @@ Link America/Phoenix America/Creston
|
|
|
189079 |
# switched four weeks late in 1974.
|
|
|
189079 |
#
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
-Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11
|
|
|
189079 |
+Zone America/Boise -7:44:49 - LMT 1883 Nov 18 20:00u
|
|
|
189079 |
-8:00 US P%sT 1923 May 13 2:00
|
|
|
189079 |
-7:00 US M%sT 1974
|
|
|
189079 |
-7:00 - MST 1974 Feb 3 2:00
|
|
|
189079 |
@@ -945,7 +945,7 @@ Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D
|
|
|
189079 |
Rule Indianapolis 1941 1954 - Sep lastSun 2:00 0 S
|
|
|
189079 |
Rule Indianapolis 1946 1954 - Apr lastSun 2:00 1:00 D
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
-Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 12:15:22
|
|
|
189079 |
+Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 18:00u
|
|
|
189079 |
-6:00 US C%sT 1920
|
|
|
189079 |
-6:00 Indianapolis C%sT 1942
|
|
|
189079 |
-6:00 US C%sT 1946
|
|
|
189079 |
@@ -965,7 +965,7 @@ Rule Marengo 1951 only - Sep lastSun 2:00 0 S
|
|
|
189079 |
Rule Marengo 1954 1960 - Apr lastSun 2:00 1:00 D
|
|
|
189079 |
Rule Marengo 1954 1960 - Sep lastSun 2:00 0 S
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
-Zone America/Indiana/Marengo -5:45:23 - LMT 1883 Nov 18 12:14:37
|
|
|
189079 |
+Zone America/Indiana/Marengo -5:45:23 - LMT 1883 Nov 18 18:00u
|
|
|
189079 |
-6:00 US C%sT 1951
|
|
|
189079 |
-6:00 Marengo C%sT 1961 Apr 30 2:00
|
|
|
189079 |
-5:00 - EST 1969
|
|
|
189079 |
@@ -989,7 +989,7 @@ Rule Vincennes 1960 only - Oct lastSun 2:00 0 S
|
|
|
189079 |
Rule Vincennes 1961 only - Sep lastSun 2:00 0 S
|
|
|
189079 |
Rule Vincennes 1962 1963 - Oct lastSun 2:00 0 S
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
-Zone America/Indiana/Vincennes -5:50:07 - LMT 1883 Nov 18 12:09:53
|
|
|
189079 |
+Zone America/Indiana/Vincennes -5:50:07 - LMT 1883 Nov 18 18:00u
|
|
|
189079 |
-6:00 US C%sT 1946
|
|
|
189079 |
-6:00 Vincennes C%sT 1964 Apr 26 2:00
|
|
|
189079 |
-5:00 - EST 1969
|
|
|
189079 |
@@ -1009,7 +1009,7 @@ Rule Perry 1955 1960 - Sep lastSun 2:00 0 S
|
|
|
189079 |
Rule Perry 1956 1963 - Apr lastSun 2:00 1:00 D
|
|
|
189079 |
Rule Perry 1961 1963 - Oct lastSun 2:00 0 S
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
-Zone America/Indiana/Tell_City -5:47:03 - LMT 1883 Nov 18 12:12:57
|
|
|
189079 |
+Zone America/Indiana/Tell_City -5:47:03 - LMT 1883 Nov 18 18:00u
|
|
|
189079 |
-6:00 US C%sT 1946
|
|
|
189079 |
-6:00 Perry C%sT 1964 Apr 26 2:00
|
|
|
189079 |
-5:00 - EST 1967 Oct 29 2:00
|
|
|
189079 |
@@ -1026,7 +1026,7 @@ Rule Pike 1955 1960 - Sep lastSun 2:00 0 S
|
|
|
189079 |
Rule Pike 1956 1964 - Apr lastSun 2:00 1:00 D
|
|
|
189079 |
Rule Pike 1961 1964 - Oct lastSun 2:00 0 S
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
-Zone America/Indiana/Petersburg -5:49:07 - LMT 1883 Nov 18 12:10:53
|
|
|
189079 |
+Zone America/Indiana/Petersburg -5:49:07 - LMT 1883 Nov 18 18:00u
|
|
|
189079 |
-6:00 US C%sT 1955
|
|
|
189079 |
-6:00 Pike C%sT 1965 Apr 25 2:00
|
|
|
189079 |
-5:00 - EST 1966 Oct 30 2:00
|
|
|
189079 |
@@ -1048,7 +1048,7 @@ Rule Starke 1955 1956 - Oct lastSun 2:00 0 S
|
|
|
189079 |
Rule Starke 1957 1958 - Sep lastSun 2:00 0 S
|
|
|
189079 |
Rule Starke 1959 1961 - Oct lastSun 2:00 0 S
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
-Zone America/Indiana/Knox -5:46:30 - LMT 1883 Nov 18 12:13:30
|
|
|
189079 |
+Zone America/Indiana/Knox -5:46:30 - LMT 1883 Nov 18 18:00u
|
|
|
189079 |
-6:00 US C%sT 1947
|
|
|
189079 |
-6:00 Starke C%sT 1962 Apr 29 2:00
|
|
|
189079 |
-5:00 - EST 1963 Oct 27 2:00
|
|
|
189079 |
@@ -1064,7 +1064,7 @@ Rule Pulaski 1946 1954 - Sep lastSun 2:00 0 S
|
|
|
189079 |
Rule Pulaski 1955 1956 - Oct lastSun 2:00 0 S
|
|
|
189079 |
Rule Pulaski 1957 1960 - Sep lastSun 2:00 0 S
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
-Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 12:13:35
|
|
|
189079 |
+Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 18:00u
|
|
|
189079 |
-6:00 US C%sT 1946
|
|
|
189079 |
-6:00 Pulaski C%sT 1961 Apr 30 2:00
|
|
|
189079 |
-5:00 - EST 1969
|
|
|
189079 |
@@ -1075,7 +1075,7 @@ Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 12:13:35
|
|
|
189079 |
#
|
|
|
189079 |
# Switzerland County, Indiana, did not observe DST from 1973 through 2005.
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
-Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 12:19:44
|
|
|
189079 |
+Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 18:00u
|
|
|
189079 |
-6:00 US C%sT 1954 Apr 25 2:00
|
|
|
189079 |
-5:00 - EST 1969
|
|
|
189079 |
-5:00 US E%sT 1973
|
|
|
189079 |
@@ -1111,7 +1111,7 @@ Rule Louisville 1950 1961 - Apr lastSun 2:00 1:00 D
|
|
|
189079 |
Rule Louisville 1950 1955 - Sep lastSun 2:00 0 S
|
|
|
189079 |
Rule Louisville 1956 1961 - Oct lastSun 2:00 0 S
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
-Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 12:16:58
|
|
|
189079 |
+Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 18:00u
|
|
|
189079 |
-6:00 US C%sT 1921
|
|
|
189079 |
-6:00 Louisville C%sT 1942
|
|
|
189079 |
-6:00 US C%sT 1946
|
|
|
189079 |
@@ -1145,7 +1145,7 @@ Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 12:16:58
|
|
|
189079 |
# Federal Register 65, 160 (2000-08-17), pp 50154-50158.
|
|
|
189079 |
# https://www.gpo.gov/fdsys/pkg/FR-2000-08-17/html/00-20854.htm
|
|
|
189079 |
#
|
|
|
189079 |
-Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 12:20:36
|
|
|
189079 |
+Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 18:00u
|
|
|
189079 |
-6:00 US C%sT 1946
|
|
|
189079 |
-6:00 - CST 1968
|
|
|
189079 |
-6:00 US C%sT 2000 Oct 29 2:00
|
|
|
189079 |
@@ -2640,6 +2640,8 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
|
|
|
189079 |
# longitude they are located at.
|
|
|
189079 |
|
|
|
189079 |
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
|
|
189079 |
+Rule Mexico 1931 only - May 1 23:00 1:00 D
|
|
|
189079 |
+Rule Mexico 1931 only - Oct 1 0:00 0 S
|
|
|
189079 |
Rule Mexico 1939 only - Feb 5 0:00 1:00 D
|
|
|
189079 |
Rule Mexico 1939 only - Jun 25 0:00 0 S
|
|
|
189079 |
Rule Mexico 1940 only - Dec 9 0:00 1:00 D
|
|
|
189079 |
@@ -2656,13 +2658,13 @@ Rule Mexico 2002 max - Apr Sun>=1 2:00 1:00 D
|
|
|
189079 |
Rule Mexico 2002 max - Oct lastSun 2:00 0 S
|
|
|
189079 |
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
|
|
189079 |
# Quintana Roo; represented by Cancún
|
|
|
189079 |
-Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 0:12:56
|
|
|
189079 |
+Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 6:00u
|
|
|
189079 |
-6:00 - CST 1981 Dec 23
|
|
|
189079 |
-5:00 Mexico E%sT 1998 Aug 2 2:00
|
|
|
189079 |
-6:00 Mexico C%sT 2015 Feb 1 2:00
|
|
|
189079 |
-5:00 - EST
|
|
|
189079 |
# Campeche, Yucatán; represented by Mérida
|
|
|
189079 |
-Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32
|
|
|
189079 |
+Zone America/Merida -5:58:28 - LMT 1922 Jan 1 6:00u
|
|
|
189079 |
-6:00 - CST 1981 Dec 23
|
|
|
189079 |
-5:00 - EST 1982 Dec 2
|
|
|
189079 |
-6:00 Mexico C%sT
|
|
|
189079 |
@@ -2676,23 +2678,21 @@ Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32
|
|
|
189079 |
# See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,
|
|
|
189079 |
# 2016-03-12
|
|
|
189079 |
# http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza
|
|
|
189079 |
-Zone America/Matamoros -6:40:00 - LMT 1921 Dec 31 23:20:00
|
|
|
189079 |
+Zone America/Matamoros -6:30:00 - LMT 1922 Jan 1 6:00u
|
|
|
189079 |
-6:00 - CST 1988
|
|
|
189079 |
-6:00 US C%sT 1989
|
|
|
189079 |
-6:00 Mexico C%sT 2010
|
|
|
189079 |
-6:00 US C%sT
|
|
|
189079 |
# Durango; Coahuila, Nuevo León, Tamaulipas (away from US border)
|
|
|
189079 |
-Zone America/Monterrey -6:41:16 - LMT 1921 Dec 31 23:18:44
|
|
|
189079 |
+Zone America/Monterrey -6:41:16 - LMT 1922 Jan 1 6:00u
|
|
|
189079 |
-6:00 - CST 1988
|
|
|
189079 |
-6:00 US C%sT 1989
|
|
|
189079 |
-6:00 Mexico C%sT
|
|
|
189079 |
# Central Mexico
|
|
|
189079 |
-Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24
|
|
|
189079 |
+Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 7:00u
|
|
|
189079 |
-7:00 - MST 1927 Jun 10 23:00
|
|
|
189079 |
-6:00 - CST 1930 Nov 15
|
|
|
189079 |
- -7:00 - MST 1931 May 1 23:00
|
|
|
189079 |
- -6:00 - CST 1931 Oct
|
|
|
189079 |
- -7:00 - MST 1932 Apr 1
|
|
|
189079 |
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
|
189079 |
-6:00 Mexico C%sT 2001 Sep 30 2:00
|
|
|
189079 |
-6:00 - CST 2002 Feb 20
|
|
|
189079 |
-6:00 Mexico C%sT
|
|
|
189079 |
@@ -2700,35 +2700,29 @@ Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24
|
|
|
189079 |
# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
|
|
|
189079 |
# Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
|
|
|
189079 |
# (See the 2016-03-12 El Universal source mentioned above.)
|
|
|
189079 |
-Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 0:02:20
|
|
|
189079 |
+Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 7:00u
|
|
|
189079 |
-7:00 - MST 1927 Jun 10 23:00
|
|
|
189079 |
-6:00 - CST 1930 Nov 15
|
|
|
189079 |
- -7:00 - MST 1931 May 1 23:00
|
|
|
189079 |
- -6:00 - CST 1931 Oct
|
|
|
189079 |
- -7:00 - MST 1932 Apr 1
|
|
|
189079 |
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
|
189079 |
-6:00 - CST 1996
|
|
|
189079 |
-6:00 Mexico C%sT 1998
|
|
|
189079 |
-6:00 - CST 1998 Apr Sun>=1 3:00
|
|
|
189079 |
-7:00 Mexico M%sT 2010
|
|
|
189079 |
-7:00 US M%sT
|
|
|
189079 |
# Chihuahua (away from US border)
|
|
|
189079 |
-Zone America/Chihuahua -7:04:20 - LMT 1921 Dec 31 23:55:40
|
|
|
189079 |
+Zone America/Chihuahua -7:04:20 - LMT 1922 Jan 1 7:00u
|
|
|
189079 |
-7:00 - MST 1927 Jun 10 23:00
|
|
|
189079 |
-6:00 - CST 1930 Nov 15
|
|
|
189079 |
- -7:00 - MST 1931 May 1 23:00
|
|
|
189079 |
- -6:00 - CST 1931 Oct
|
|
|
189079 |
- -7:00 - MST 1932 Apr 1
|
|
|
189079 |
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
|
189079 |
-6:00 - CST 1996
|
|
|
189079 |
-6:00 Mexico C%sT 1998
|
|
|
189079 |
-6:00 - CST 1998 Apr Sun>=1 3:00
|
|
|
189079 |
-7:00 Mexico M%sT
|
|
|
189079 |
# Sonora
|
|
|
189079 |
-Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08
|
|
|
189079 |
+Zone America/Hermosillo -7:23:52 - LMT 1922 Jan 1 7:00u
|
|
|
189079 |
-7:00 - MST 1927 Jun 10 23:00
|
|
|
189079 |
-6:00 - CST 1930 Nov 15
|
|
|
189079 |
- -7:00 - MST 1931 May 1 23:00
|
|
|
189079 |
- -6:00 - CST 1931 Oct
|
|
|
189079 |
- -7:00 - MST 1932 Apr 1
|
|
|
189079 |
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
|
189079 |
-6:00 - CST 1942 Apr 24
|
|
|
189079 |
-7:00 - MST 1949 Jan 14
|
|
|
189079 |
-8:00 - PST 1970
|
|
|
189079 |
@@ -2763,24 +2757,20 @@ Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08
|
|
|
189079 |
# Use "Bahia_Banderas" to keep the name to fourteen characters.
|
|
|
189079 |
|
|
|
189079 |
# Mazatlán
|
|
|
189079 |
-Zone America/Mazatlan -7:05:40 - LMT 1921 Dec 31 23:54:20
|
|
|
189079 |
+Zone America/Mazatlan -7:05:40 - LMT 1922 Jan 1 7:00u
|
|
|
189079 |
-7:00 - MST 1927 Jun 10 23:00
|
|
|
189079 |
-6:00 - CST 1930 Nov 15
|
|
|
189079 |
- -7:00 - MST 1931 May 1 23:00
|
|
|
189079 |
- -6:00 - CST 1931 Oct
|
|
|
189079 |
- -7:00 - MST 1932 Apr 1
|
|
|
189079 |
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
|
189079 |
-6:00 - CST 1942 Apr 24
|
|
|
189079 |
-7:00 - MST 1949 Jan 14
|
|
|
189079 |
-8:00 - PST 1970
|
|
|
189079 |
-7:00 Mexico M%sT
|
|
|
189079 |
|
|
|
189079 |
# Bahía de Banderas
|
|
|
189079 |
-Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00
|
|
|
189079 |
+Zone America/Bahia_Banderas -7:01:00 - LMT 1922 Jan 1 7:00u
|
|
|
189079 |
-7:00 - MST 1927 Jun 10 23:00
|
|
|
189079 |
-6:00 - CST 1930 Nov 15
|
|
|
189079 |
- -7:00 - MST 1931 May 1 23:00
|
|
|
189079 |
- -6:00 - CST 1931 Oct
|
|
|
189079 |
- -7:00 - MST 1932 Apr 1
|
|
|
189079 |
+ -7:00 Mexico M%sT 1932 Apr 1
|
|
|
189079 |
-6:00 - CST 1942 Apr 24
|
|
|
189079 |
-7:00 - MST 1949 Jan 14
|
|
|
189079 |
-8:00 - PST 1970
|
|
|
189079 |
@@ -2788,7 +2778,7 @@ Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00
|
|
|
189079 |
-6:00 Mexico C%sT
|
|
|
189079 |
|
|
|
189079 |
# Baja California
|
|
|
189079 |
-Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56
|
|
|
189079 |
+Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 7:00u
|
|
|
189079 |
-7:00 - MST 1924
|
|
|
189079 |
-8:00 - PST 1927 Jun 10 23:00
|
|
|
189079 |
-7:00 - MST 1930 Nov 15
|
|
|
189079 |
diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
|
|
|
189079 |
index 71470168456..0cad939008f 100644
|
|
|
189079 |
--- a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
|
|
|
189079 |
+++ b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
|
|
|
189079 |
@@ -1 +1 @@
|
|
|
189079 |
-tzdata2022d
|
|
|
189079 |
+tzdata2022e
|
|
|
189079 |
diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
|
|
|
189079 |
index b3823958ae4..2f2786f1c69 100644
|
|
|
189079 |
--- a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
|
|
|
189079 |
+++ b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
|
|
|
189079 |
@@ -97,9 +97,7 @@ America/Winnipeg CST CDT
|
|
|
189079 |
America/Yakutat AKST AKDT
|
|
|
189079 |
America/Yellowknife MST MDT
|
|
|
189079 |
Antarctica/Macquarie AEST AEDT
|
|
|
189079 |
-Asia/Amman EET EEST
|
|
|
189079 |
Asia/Beirut EET EEST
|
|
|
189079 |
-Asia/Damascus EET EEST
|
|
|
189079 |
Asia/Famagusta EET EEST
|
|
|
189079 |
Asia/Gaza EET EEST
|
|
|
189079 |
Asia/Hebron EET EEST
|