Skip to content

Commit 55a0cad

Browse files
Kiran Sidhartha Ravikumarcoffeys
authored andcommitted
8254982: (tz) Upgrade time-zone data to tzdata2020c
Reviewed-by: erikj, naoto
1 parent ac1748e commit 55a0cad

File tree

4 files changed

+33
-3
lines changed

4 files changed

+33
-3
lines changed

make/data/tzdata/VERSION

Lines changed: 1 addition & 1 deletion
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-
tzdata2020b
24+
tzdata2020c

make/data/tzdata/australasia

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,19 @@ Zone Indian/Cocos 6:27:40 - LMT 1900
404404
# From Michael Deckers (2019-08-06):
405405
# https://www.laws.gov.fj/LawsAsMade/downloadfile/848
406406

407+
# From Raymond Kumar (2020-10-08):
408+
# [DST in Fiji] is from December 20th 2020, till 17th January 2021.
409+
# From Alan Mintz (2020-10-08):
410+
# https://www.laws.gov.fj/LawsAsMade/GetFile/1071
411+
# From Tim Parenti (2020-10-08):
412+
# https://www.fijivillage.com/news/Daylight-saving-from-Dec-20th-this-year-to-Jan-17th-2021-8rf4x5/
413+
# "Minister for Employment, Parveen Bala says they had never thought of
414+
# stopping daylight saving. He says it was just to decide on when it should
415+
# start and end. Bala says it is a short period..."
416+
# Since the end date is still in line with our ongoing predictions, assume for
417+
# now that the later-than-usual start date is a one-time departure from the
418+
# recent second Sunday in November pattern.
419+
407420
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
408421
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 -
409422
Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
@@ -415,7 +428,9 @@ Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 -
415428
Rule Fiji 2014 only - Jan Sun>=18 2:00 0 -
416429
Rule Fiji 2014 2018 - Nov Sun>=1 2:00 1:00 -
417430
Rule Fiji 2015 max - Jan Sun>=12 3:00 0 -
418-
Rule Fiji 2019 max - Nov Sun>=8 2:00 1:00 -
431+
Rule Fiji 2019 only - Nov Sun>=8 2:00 1:00 -
432+
Rule Fiji 2020 only - Dec 20 2:00 1:00 -
433+
Rule Fiji 2021 max - Nov Sun>=8 2:00 1:00 -
419434
# Zone NAME STDOFF RULES FORMAT [UNTIL]
420435
Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
421436
12:00 Fiji +12/+13

make/data/tzdata/europe

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1612,6 +1612,8 @@ Rule Hungary 1946 only - Oct 7 2:00 0 -
16121612
# https://library.hungaricana.hu/hu/view/Zala_1948_09/?pg=64
16131613
# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniNepujsag_1948/?pg=53
16141614
# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniNepujsag_1948/?pg=160
1615+
# https://library.hungaricana.hu/hu/view/UjSzo_1949_01-04/?pg=102
1616+
# https://library.hungaricana.hu/hu/view/KeletMagyarorszag_1949_03/?pg=96
16151617
# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1949_09/?pg=94
16161618
Rule Hungary 1947 1949 - Apr Sun>=4 2:00s 1:00 S
16171619
Rule Hungary 1947 1949 - Oct Sun>=1 2:00s 0 -
@@ -1627,9 +1629,10 @@ Rule Hungary 1955 only - Oct 2 3:00 0 -
16271629
# https://library.hungaricana.hu/hu/view/PestMegyeiHirlap_1957_09/?pg=143
16281630
Rule Hungary 1956 1957 - Jun Sun>=1 2:00 1:00 S
16291631
Rule Hungary 1956 1957 - Sep lastSun 3:00 0 -
1630-
# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg=1227
1632+
# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg=189
16311633
Rule Hungary 1980 only - Apr 6 0:00 1:00 S
16321634
Rule Hungary 1980 only - Sep 28 1:00 0 -
1635+
# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg=1227
16331636
# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1981_01/?pg=79
16341637
# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1982/?pg=115
16351638
# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1983/?pg=85
@@ -1640,6 +1643,7 @@ Rule Hungary 1981 1983 - Sep lastSun 1:00 0 -
16401643
Zone Europe/Budapest 1:16:20 - LMT 1890 Nov 1
16411644
1:00 C-Eur CE%sT 1918
16421645
# https://library.hungaricana.hu/hu/view/OGYK_RT_1941/?pg=1204
1646+
# https://library.hungaricana.hu/hu/view/OGYK_RT_1942/?pg=3955
16431647
1:00 Hungary CE%sT 1941 Apr 7 23:00
16441648
1:00 C-Eur CE%sT 1945
16451649
1:00 Hungary CE%sT 1984

test/jdk/java/util/Formatter/BasicDateTime.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1687,6 +1687,17 @@ public static void test() {
16871687

16881688
// Get the supported ids for GMT-08:00 (Pacific Standard Time)
16891689
String[] ids = TimeZone.getAvailableIDs(-8 * 60 * 60 * 1000);
1690+
// With tzdata2020b, the test fails for the mentioned zones expecting
1691+
// "PST" but JDK has Zone name "MST" for JRE locale provider.
1692+
// Therefore excluding them as the test is only looking for a GMT-08:00
1693+
// time zone ID. See JDK-8254865.
1694+
final List<String> list = new ArrayList<String>();
1695+
Collections.addAll(list, ids);
1696+
list.remove("America/Dawson");
1697+
list.remove("America/WhiteHorse");
1698+
list.remove("Canada/Yukon");
1699+
ids = list.toArray(new String[list.size()]);
1700+
16901701
// Create a Pacific Standard Time time zone
16911702
SimpleTimeZone tz = new SimpleTimeZone(-8 * 60 * 60 * 1000, ids[0]);
16921703
// public GregorianCalendar(TimeZone zone, Locale aLocale);

0 commit comments

Comments
 (0)