From edf5c072b3583696b4640777aeb5ae6df1c3b8ad Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Thu, 26 Jan 2023 01:46:50 +0000 Subject: [PATCH] Update to jdk-19.0.2 release Update release notes to 19.0.2 Drop JDK-8293834 (CLDR update for Kyiv) which is now upstream Drop JDK-8294357 (tzdata2022d), JDK-8295173 (tzdata2022e) & JDK-8296108 (tzdata2022f) local patches which are now upstream Drop JDK-8296715 (CLDR update for 2022f) which is now upstream Add local patch JDK-8295447 (javac NPE) which was accepted into 19u upstream but not in the GA tag Add local patches for JDK-8296239 & JDK-8299439 (Croatia Euro update) which are present in 8u, 11u & 17u releases --- .gitignore | 1 + NEWS | 133 ++ java-latest-openjdk.spec | 45 +- jdk8293834-kyiv_cldr_update.patch | 59 - jdk8294357-tzdata2022d.patch | 303 ---- jdk8295173-tzdata2022e.patch | 422 ----- jdk8295447-npe_in_constructor.patch | 97 + jdk8296108-tzdata2022f.patch | 2621 --------------------------- jdk8296239-iso4217_up174.patch | 79 + jdk8296715-cldr2022f.patch | 89 - jdk8299439-test_for_hr.patch | 63 + sources | 2 +- 12 files changed, 398 insertions(+), 3516 deletions(-) delete mode 100644 jdk8293834-kyiv_cldr_update.patch delete mode 100644 jdk8294357-tzdata2022d.patch delete mode 100644 jdk8295173-tzdata2022e.patch create mode 100644 jdk8295447-npe_in_constructor.patch delete mode 100644 jdk8296108-tzdata2022f.patch create mode 100644 jdk8296239-iso4217_up174.patch delete mode 100644 jdk8296715-cldr2022f.patch create mode 100644 jdk8299439-test_for_hr.patch diff --git a/.gitignore b/.gitignore index e52f711..312e85f 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /openjdk-jdk18u-jdk-18.0.2+9.tar.xz /openjdk-jdk19u-jdk-19+36.tar.xz /openjdk-jdk19u-jdk-19.0.1+10.tar.xz +/openjdk-jdk19u-jdk-19.0.2+7.tar.xz diff --git a/NEWS b/NEWS index a473fca..8a9b0d0 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,139 @@ Key: JDK-X - https://bugs.openjdk.java.net/browse/JDK-X CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release OpenJDK 19.0.2 (2023-01-17): +=========================================== +Live versions of these release notes can be found at: + * https://builds.shipilev.net/backports-monitor/release-notes-19.0.2.html + +* CVEs + - CVE-2023-21835 + - CVE-2023-21843 +* Security fixes + - JDK-8286070: Improve UTF8 representation + - JDK-8286496: Improve Thread labels + - JDK-8287411: Enhance DTLS performance + - JDK-8288516: Enhance font creation + - JDK-8293554: Enhanced DH Key Exchanges + - JDK-8293598: Enhance InetAddress address handling + - JDK-8293717: Objective view of ObjectView + - JDK-8293734: Improve BMP image handling + - JDK-8293742: Better Banking of Sounds + - JDK-8295687: Better BMP bounds +* Other changes + - JDK-8022403: sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java fails + - JDK-8029633: Raw inner class constructor ref should not perform diamond inference + - JDK-8178698: javax/sound/midi/Sequencer/MetaCallback.java failed with timeout + - JDK-8277970: Test jdk/sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.java fails with "tag mismatch" + - JDK-8279941: sun/security/pkcs11/Signature/TestDSAKeyLength.java fails when NSS version detection fails + - JDK-8285604: closed sun/java2d/GdiRendering/ClipShapeRendering.java failed with "Incorrect color ffeeeeee instead of ff0000ff in pixel (100, 100)" + - JDK-8285835: SIGSEGV in PhaseIdealLoop::build_loop_late_post_work + - JDK-8286314: Trampoline not created for far runtime targets outside small CodeCache + - JDK-8286624: Regression Test CoordinateTruncationBug.java fails on OL8.3 + - JDK-8287217: C2: PhaseCCP: remove not visited nodes, prevent type inconsistency + - JDK-8288132: Update test artifacts in QuoVadis CA interop tests + - JDK-8288377: [REDO] DST not applying properly with zone id offset set with TZ env variable + - JDK-8288992: AArch64: CMN should be handled the same way as CMP + - JDK-8290164: compiler/runtime/TestConstantsInError.java fails on riscv + - JDK-8290246: test fails "assert(init != __null) failed: initialization not found" + - JDK-8290451: Incorrect result when switching to C2 OSR compilation from C1 + - JDK-8290496: riscv: Fix build warnings-as-errors with GCC 11 + - JDK-8290529: C2: assert(BoolTest(btest).is_canonical()) failure + - JDK-8290694: Update the release date after forking Oct CPU22_10 + - JDK-8290705: StringConcat::validate_mem_flow asserts with "unexpected user: StoreI" + - JDK-8290711: assert(false) failed: infinite loop in PhaseIterGVN::optimize + - JDK-8290781: Segfault at PhaseIdealLoop::clone_loop_handle_data_uses + - JDK-8290900: Build failure with Clang 14+ due to function warning attribute + - JDK-8290964: C2 compilation fails with assert "non-reduction loop contains reduction nodes" + - JDK-8290974: Bump version numbers for January 2023 CPU + - JDK-8291508: Fix some tests with "requires vm.jvmti & vm.continuations" + - JDK-8291599: Assertion in PhaseIdealLoop::skeleton_predicate_has_opaque after JDK-8289127 + - JDK-8291633: Build failures with GCC 11, Alpine 3 due to incompatible casts from nullptr + - JDK-8291775: C2: assert(r != __null && r->is_Region()) failed: this phi must have a region + - JDK-8292158: AES-CTR cipher state corruption with AVX-512 + - JDK-8292159: TYPE_USE annotations on generic type arguments of record components discarded + - JDK-8292385: assert(ctrl == kit.control()) failed: Control flow was added although the intrinsic bailed out + - JDK-8292695: SIGQUIT and jcmd attaching mechanism does not work with signal chaining library + - JDK-8292756: java.lang.AssertionError at at jdk.compiler/com.sun.tools.javac.code.Scope$ScopeImpl.leave(Scope.java:386) + - JDK-8292780: misc tests failed "assert(false) failed: graph should be schedulable" + - JDK-8292899: CustomTzIDCheckDST.java testcase failed on AIX platform + - JDK-8292969: Bad Thread Utilization in ForkJoinPool + - JDK-8293044: C1: Missing access check on non-accessible class + - JDK-8293100: RISC-V: Need to save and restore callee-saved FloatRegisters in StubGenerator::generate_call_stub + - JDK-8293348: A false cyclic inheritance error reported + - JDK-8293578: Duplicate ldc generated by javac + - JDK-8293701: jdeps InverseDepsAnalyzer runs into NoSuchElementException: No value present + - JDK-8293816: CI: ciBytecodeStream::get_klass() is not consistent + - JDK-8293834: Update CLDR data following tzdata 2022c update + - JDK-8293996: C2: fix and simplify IdealLoopTree::do_remove_empty_loop + - JDK-8294307: ISO 4217 Amendment 173 Update + - JDK-8294357: (tz) Update Timezone Data to 2022d + - JDK-8294517: Update jdk19u fix version to 19.0.2 + - JDK-8294538: missing is_unloading() check in SharedRuntime::fixup_callers_callsite() + - JDK-8294602: Change milestone to fcs for releases: jdk-11.0.18, jdk-17.0.6, jdk-19.0.2 + - JDK-8294755: Update milestone to ea for 19.0.2 + - JDK-8294840: langtools OptionalDependencyTest.java use File.pathSeparator + - JDK-8295173: (tz) Update Timezone Data to 2022e + - JDK-8295264: Fix PaX check on RISC-V + - JDK-8295268: Optimized builds are broken due to incorrect assert_is_rfp shortcuts + - JDK-8295414: [Aarch64] C2: assert(false) failed: bad AD file + - JDK-8295469: S390X: Optimized builds are broken + - JDK-8295554: Move the "sizecalc.h" to the correct location + - JDK-8295723: security/infra/wycheproof/RunWycheproof.java fails with Assertion Error + - JDK-8295926: RISC-V: C1: Fix LIRGenerator::do_LibmIntrinsic + - JDK-8296083: javax/swing/JTree/6263446/bug6263446.java fails intermittently on a VM + - JDK-8296108: (tz) Update Timezone Data to 2022f + - JDK-8296448: RISC-V: Fix temp usages of heapbase register killed by MacroAssembler::en/decode_klass_not_null + - JDK-8296463: Memory leak in JVM_StartThread with the integration of Virtual threads + - JDK-8296480: java/security/cert/pkix/policyChanges/TestPolicy.java is failing + - JDK-8296485: BuildEEBasicConstraints.java test fails with SunCertPathBuilderException + - JDK-8296496: Overzealous check in sizecalc.h prevents large memory allocation + - JDK-8296602: RISC-V: improve performance of copy_memory stub + - JDK-8296632: Write a test to verify the content change of TextArea sends TextEvent + - JDK-8296715: CLDR v42 update for tzdata 2022f + - JDK-8296733: JFR: File Read event for RandomAccessFile::write(byte[]) is incorrect + - JDK-8296771: RISC-V: C2: assert(false) failed: bad AD file + - JDK-8296945: PublicMethodsTest is slow due to dependency verification with debug builds + - JDK-8296957: One more cast in SAFE_SIZE_NEW_ARRAY2 + - JDK-8296970: Remove sysThreadAvailableStackWithSlack from hotspot-symbols + - JDK-8297147: UnexpectedSourceImageSize test times out on slow machines when fastdebug is used + - JDK-8297153: sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java fails again + - JDK-8297241: Update sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java + - JDK-8297309: Memory leak in ShenandoahFullGC + - JDK-8297451: ProcessHandleImpl should assert privilege when modifying reaper thread + - JDK-8297476: Increase InlineSmallCode default from 1000 to 2500 for RISC-V + +Notes on individual issues: +=========================== + +client-libs/javax.imageio: + +JDK-8295687: Better BMP bounds +============================== +Loading a linked ICC profile within a BMP image is now disabled by +default. To re-enable it, set the new system property +`sun.imageio.bmp.enabledLinkedProfiles` to `true`. This new property +replaces the old property, +`sun.imageio.plugins.bmp.disableLinkedProfiles`. + +client-libs/javax.sound: + +JDK-8293742: Better Banking of Sounds +===================================== +Previously, the SoundbankReader implementation, +`com.sun.media.sound.JARSoundbankReader`, would download a JAR +soundbank from a URL. This behaviour is now disabled by default. To +re-enable it, set the new system property `jdk.sound.jarsoundbank` to +`true`. + +security-libs/javax.net.ssl: + +JDK-8287411: Enhance DTLS performance +===================================== +The JDK now exchanges DTLS cookies for all handshakes, new and +resumed. The previous behaviour can be re-enabled by setting the new +system property `jdk.tls.enableDtlsResumeCookie` to `false`. + New in release OpenJDK 19.0.1 (2022-10-18): =========================================== Live versions of these release notes can be found at: diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index 8883157..f424bd3 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -322,7 +322,7 @@ # New Version-String scheme-style defines %global featurever 19 %global interimver 0 -%global updatever 1 +%global updatever 2 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -379,8 +379,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 10 -%global rpmrelease 3 +%global buildver 7 +%global rpmrelease 1 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions @@ -1303,7 +1303,7 @@ Version: %{newjavaver}.%{buildver} # This package needs `.rolling` as part of Release so as to not conflict on install with # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as # java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298 -Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling%{?dist}.1 +Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1430,21 +1430,17 @@ Patch1001: fips-19u-%{fipsver}.patch ############################################# # -# OpenJDK patches targetted for 19.0.2 +# OpenJDK patches which missed 19.0.2 # ############################################# -# JDK-8293834: Update CLDR data following tzdata 2022c update -Patch2001: jdk8293834-kyiv_cldr_update.patch -# JDK-8294357: (tz) Update Timezone Data to 2022d -Patch2002: jdk8294357-tzdata2022d.patch -# JDK-8295173: (tz) Update Timezone Data to 2022e -Patch2003: jdk8295173-tzdata2022e.patch -# JDK-8296108: (tz) Update Timezone Data to 2022f -Patch2004: jdk8296108-tzdata2022f.patch -# JDK-8296715: CLDR v42 update for tzdata 2022f -Patch2005: jdk8296715-cldr2022f.patch # JDK-8297804: (tz) Update Timezone Data to 2022g Patch2006: jdk8297804-tzdata2022g.patch +# JDK-8295447: NullPointerException with invalid pattern matching construct in constructor call +Patch2007: jdk8295447-npe_in_constructor.patch +# JDK-8296239: ISO 4217 Amendment 174 Update +Patch2008: jdk8296239-iso4217_up174.patch +# JDK-8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR +Patch2009: jdk8299439-test_for_hr.patch BuildRequires: autoconf BuildRequires: automake @@ -1885,13 +1881,11 @@ pushd %{top_level_dir_name} %patch600 -p1 # nss.cfg PKCS11 support; must come last as it also alters java.security %patch1000 -p1 -# tzdata updates targetted for 19.0.2 -%patch2001 -p1 -%patch2002 -p1 -%patch2003 -p1 -%patch2004 -p1 -%patch2005 -p1 +# updates which missed 19.0.2 %patch2006 -p1 +%patch2007 -p1 +%patch2008 -p1 +%patch2009 -p1 popd # openjdk # Extract systemtap tapsets @@ -2710,6 +2704,15 @@ cjc.mainProgram(args) %endif %changelog +* Thu Jan 26 2023 Andrew Hughes - 1:19.0.2.0.7-1.rolling +- Update to jdk-19.0.2 release +- Update release notes to 19.0.2 +- Drop JDK-8293834 (CLDR update for Kyiv) which is now upstream +- Drop JDK-8294357 (tzdata2022d), JDK-8295173 (tzdata2022e) & JDK-8296108 (tzdata2022f) local patches which are now upstream +- Drop JDK-8296715 (CLDR update for 2022f) which is now upstream +- Add local patch JDK-8295447 (javac NPE) which was accepted into 19u upstream but not in the GA tag +- Add local patches for JDK-8296239 & JDK-8299439 (Croatia Euro update) which are present in 8u, 11u & 17u releases + * Thu Jan 19 2023 Fedora Release Engineering - 1:19.0.1.0.10-3.rolling.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/jdk8293834-kyiv_cldr_update.patch b/jdk8293834-kyiv_cldr_update.patch deleted file mode 100644 index a3907ab..0000000 --- a/jdk8293834-kyiv_cldr_update.patch +++ /dev/null @@ -1,59 +0,0 @@ -commit e10231248fc100f9dfa08468ac897f60b843857f -Author: Andrew John Hughes -Date: Wed Sep 28 00:51:07 2022 +0000 - - 8293834: Update CLDR data following tzdata 2022c update - - Reviewed-by: naoto - -diff --git a/make/data/cldr/common/bcp47/timezone.xml b/make/data/cldr/common/bcp47/timezone.xml -index f0812776d5d..ddbccff077c 100644 ---- a/make/data/cldr/common/bcp47/timezone.xml -+++ b/make/data/cldr/common/bcp47/timezone.xml -@@ -394,7 +394,7 @@ For terms of use, see http://www.unicode.org/copyright.html - - - -- -+ - - - -diff --git a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java -index eb56c087ad6..e398af3c151 100644 ---- a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java -+++ b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java -@@ -23,7 +23,7 @@ - - /* - * @test -- * @bug 8181157 8202537 8234347 8236548 8261279 -+ * @bug 8181157 8202537 8234347 8236548 8261279 8293834 - * @modules jdk.localedata - * @summary Checks CLDR time zone names are generated correctly at runtime - * @run testng/othervm -Djava.locale.providers=CLDR TimeZoneNamesTest -@@ -102,6 +102,24 @@ public class TimeZoneNamesTest { - "UTC+04:00", - "heure : Astrakhan", - "UTC+04:00"}, -+ {"Europe/Kyiv", Locale.US, "Eastern European Standard Time", -+ "GMT+02:00", -+ "Eastern European Summer Time", -+ "GMT+03:00", -+ "Eastern European Time", -+ "GMT+02:00"}, -+ {"Europe/Kyiv", Locale.FRANCE, "heure normale d\u2019Europe de l\u2019Est", -+ "UTC+02:00", -+ "heure d\u2019\u00e9t\u00e9 d\u2019Europe de l\u2019Est", -+ "UTC+03:00", -+ "heure d\u2019Europe de l\u2019Est", -+ "UTC+02:00"}, -+ {"Europe/Kyiv", Locale.GERMANY, "Osteurop\u00e4ische Normalzeit", -+ "OEZ", -+ "Osteurop\u00e4ische Sommerzeit", -+ "OESZ", -+ "Osteurop\u00e4ische Zeit", -+ "OEZ"}, - {"Europe/Saratov", Locale.US, "Saratov Standard Time", - "GMT+04:00", - "Saratov Daylight Time", diff --git a/jdk8294357-tzdata2022d.patch b/jdk8294357-tzdata2022d.patch deleted file mode 100644 index c733edf..0000000 --- a/jdk8294357-tzdata2022d.patch +++ /dev/null @@ -1,303 +0,0 @@ -commit 689f8f2dff8ba4c4a39a846641af988db3359480 -Author: Yoshiki Sato -Date: Wed Oct 5 01:54:50 2022 +0000 - - 8294357: (tz) Update Timezone Data to 2022d - - Backport-of: f01573368f905f27d26f1d07d9cfd26dcc736a54 - -diff --git a/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java b/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java -index 2b21a01f3f9..40f2b987e28 100644 ---- a/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java -+++ b/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java -@@ -582,12 +582,8 @@ public final class ZoneInfoFile { - // we can then pass in the dom = -1, dow > 0 into ZoneInfo - // - // hacking, assume the >=24 is the result of ZRB optimization for -- // "last", it works for now. From tzdata2020d this hacking -- // will not work for Asia/Gaza and Asia/Hebron which follow -- // Palestine DST rules. -- if (dom < 0 || dom >= 24 && -- !(zoneId.equals("Asia/Gaza") || -- zoneId.equals("Asia/Hebron"))) { -+ // "last", it works for now. -+ if (dom < 0 || dom >= 24) { - params[1] = -1; - params[2] = toCalendarDOW[dow]; - } else { -@@ -609,7 +605,6 @@ public final class ZoneInfoFile { - params[7] = 0; - } else { - // hacking: see comment above -- // No need of hacking for Asia/Gaza and Asia/Hebron from tz2021e - if (dom < 0 || dom >= 24) { - params[6] = -1; - params[7] = toCalendarDOW[dow]; -diff --git a/src/java.base/share/data/tzdata/VERSION b/src/java.base/share/data/tzdata/VERSION -index decb8716b22..889d0e6dad7 100644 ---- a/src/java.base/share/data/tzdata/VERSION -+++ b/src/java.base/share/data/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2022c -+tzdata2022d -diff --git a/src/java.base/share/data/tzdata/asia b/src/java.base/share/data/tzdata/asia -index 3a150b0f36b..f9df7432947 100644 ---- a/src/java.base/share/data/tzdata/asia -+++ b/src/java.base/share/data/tzdata/asia -@@ -3398,10 +3398,6 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 - # The winter time in 2015 started on October 23 at 01:00. - # https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY - # http://www.palestinecabinet.gov.ps/portal/meeting/details/27583 --# --# From Paul Eggert (2019-04-10): --# For now, guess spring-ahead transitions are at 00:00 on the Saturday --# preceding March's last Sunday (i.e., Sat>=24). - - # From P Chan (2021-10-18): - # http://wafa.ps/Pages/Details/34701 -@@ -3418,6 +3414,18 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 - # From Heba Hamad (2022-03-10): - # summer time will begin in Palestine from Sunday 03-27-2022, 00:00 AM. - -+# From Heba Hamad (2022-08-30): -+# winter time will begin in Palestine from Saturday 10-29, 02:00 AM by -+# 60 minutes backwards. Also the state of Palestine adopted the summer -+# and winter time for the years: 2023,2024,2025,2026 ... -+# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf -+# (2022-08-31): ... the Saturday before the last Sunday in March and October -+# at 2:00 AM ,for the years from 2023 to 2026. -+# (2022-09-05): https://mtit.pna.ps/Site/New/1453 -+# -+# From Paul Eggert (2022-08-31): -+# For now, assume that this rule will also be used after 2026. -+ - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S - Rule EgyptAsia 1957 only - May 10 0:00 1:00 S - Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 - -@@ -3448,14 +3456,16 @@ Rule Palestine 2013 only - Sep 27 0:00 0 - - Rule Palestine 2014 only - Oct 24 0:00 0 - - Rule Palestine 2015 only - Mar 28 0:00 1:00 S - Rule Palestine 2015 only - Oct 23 1:00 0 - --Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S --Rule Palestine 2016 2018 - Oct Sat>=24 1:00 0 - -+Rule Palestine 2016 2018 - Mar Sat<=30 1:00 1:00 S -+Rule Palestine 2016 2018 - Oct Sat<=30 1:00 0 - - Rule Palestine 2019 only - Mar 29 0:00 1:00 S --Rule Palestine 2019 only - Oct Sat>=24 0:00 0 - --Rule Palestine 2020 2021 - Mar Sat>=24 0:00 1:00 S -+Rule Palestine 2019 only - Oct Sat<=30 0:00 0 - -+Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S - Rule Palestine 2020 only - Oct 24 1:00 0 - --Rule Palestine 2021 max - Oct Fri>=23 1:00 0 - --Rule Palestine 2022 max - Mar Sun>=25 0:00 1:00 S -+Rule Palestine 2021 only - Oct 29 1:00 0 - -+Rule Palestine 2022 only - Mar 27 0:00 1:00 S -+Rule Palestine 2022 max - Oct Sat<=30 2:00 0 - -+Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S - - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Asia/Gaza 2:17:52 - LMT 1900 Oct -diff --git a/src/java.base/share/data/tzdata/backward b/src/java.base/share/data/tzdata/backward -index d4a29e8cf29..7765d99aedf 100644 ---- a/src/java.base/share/data/tzdata/backward -+++ b/src/java.base/share/data/tzdata/backward -@@ -113,6 +113,8 @@ Link Etc/UTC Etc/UCT - Link Europe/London Europe/Belfast - Link Europe/Kyiv Europe/Kiev - Link Europe/Chisinau Europe/Tiraspol -+Link Europe/Kyiv Europe/Uzhgorod -+Link Europe/Kyiv Europe/Zaporozhye - Link Europe/London GB - Link Europe/London GB-Eire - Link Etc/GMT GMT+0 -diff --git a/src/java.base/share/data/tzdata/europe b/src/java.base/share/data/tzdata/europe -index 879b5337536..accc845dbaf 100644 ---- a/src/java.base/share/data/tzdata/europe -+++ b/src/java.base/share/data/tzdata/europe -@@ -2638,10 +2638,14 @@ Zone Europe/Simferopol 2:16:24 - LMT 1880 - # From Alexander Krivenyshev (2014-03-17): - # time change at 2:00 (2am) on March 30, 2014 - # https://vz.ru/news/2014/3/17/677464.html --# From Paul Eggert (2014-03-30): --# Simferopol and Sevastopol reportedly changed their central town clocks --# late the previous day, but this appears to have been ceremonial --# and the discrepancies are small enough to not worry about. -+# From Tim Parenti (2022-07-01), per Paul Eggert (2014-03-30): -+# The clocks at the railway station in Simferopol were put forward from 22:00 -+# to 24:00 the previous day in a "symbolic ceremony"; however, per -+# contemporaneous news reports, "ordinary Crimeans [made] the daylight savings -+# time switch at 2am" on Sunday. -+# https://www.business-standard.com/article/pti-stories/crimea-to-set-clocks-to-russia-time-114033000014_1.html -+# https://www.reuters.com/article/us-ukraine-crisis-crimea-time/crimea-switches-to-moscow-time-amid-incorporation-frenzy-idUKBREA2S0LT20140329 -+# https://www.bbc.com/news/av/world-europe-26806583 - 2:00 EU EE%sT 2014 Mar 30 2:00 - 4:00 - MSK 2014 Oct 26 2:00s - 3:00 - MSK -@@ -3774,8 +3778,8 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. - # US colleague David Cochrane) are still trying to get more - # information upon these local deviations from Kiev rules. - # --# From Paul Eggert (2022-02-08): --# For now, assume that Ukraine's other three zones followed the same rules, -+# From Paul Eggert (2022-08-27): -+# For now, assume that Ukraine's zones all followed the same rules, - # except that Crimea switched to Moscow time in 1994 as described elsewhere. - - # From Igor Karpov, who works for the Ukrainian Ministry of Justice, -@@ -3845,21 +3849,7 @@ Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. - # * Ukrainian Government's Resolution of 20.03.1992, No. 139. - # http://www.uazakon.com/documents/date_8u/pg_grcasa.htm - --# From Paul Eggert (2022-04-12): --# As is usual in tzdb, Ukrainian zones use the most common English spellings. --# In particular, tzdb's name Europe/Kyiv uses the most common spelling in --# English for Ukraine's capital. Although tzdb's former name was Europe/Kiev, --# "Kyiv" is now more common due to widespread reporting of the current conflict. --# Conversely, tzdb continues to use the names Europe/Uzhgorod and --# Europe/Zaporozhye; this is similar to tzdb's use of Europe/Prague, which is --# certainly wrong as a transliteration of the Czech "Praha". --# English-language spelling of Ukrainian names is in flux, and --# some day "Uzhhorod" or "Zaporizhzhia" may become substantially more --# common in English; in the meantime, do not change these --# English spellings as that means less disruption for our users. -- - # Zone NAME STDOFF RULES FORMAT [UNTIL] --# This represents most of Ukraine. See above for the spelling of "Kyiv". - Zone Europe/Kyiv 2:02:04 - LMT 1880 - 2:02:04 - KMT 1924 May 2 # Kyiv Mean Time - 2:00 - EET 1930 Jun 21 -@@ -3869,34 +3859,6 @@ Zone Europe/Kyiv 2:02:04 - LMT 1880 - 2:00 1:00 EEST 1991 Sep 29 3:00 - 2:00 C-Eur EE%sT 1996 May 13 - 2:00 EU EE%sT --# Transcarpathia used CET 1990/1991. --# "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but --# "Uzhgorod" is more common in English. --Zone Europe/Uzhgorod 1:29:12 - LMT 1890 Oct -- 1:00 - CET 1940 -- 1:00 C-Eur CE%sT 1944 Oct -- 1:00 1:00 CEST 1944 Oct 26 -- 1:00 - CET 1945 Jun 29 -- 3:00 Russia MSK/MSD 1990 -- 3:00 - MSK 1990 Jul 1 2:00 -- 1:00 - CET 1991 Mar 31 3:00 -- 2:00 - EET 1992 Mar 20 -- 2:00 C-Eur EE%sT 1996 May 13 -- 2:00 EU EE%sT --# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991. --# "Zaporizhzhia" is the transliteration of the Ukrainian name, but --# "Zaporozh'ye" is more common in English. Use the common English --# spelling, except omit the apostrophe as it is not allowed in --# portable Posix file names. --Zone Europe/Zaporozhye 2:20:40 - LMT 1880 -- 2:20 - +0220 1924 May 2 -- 2:00 - EET 1930 Jun 21 -- 3:00 - MSK 1941 Aug 25 -- 1:00 C-Eur CE%sT 1943 Oct 25 -- 3:00 Russia MSK/MSD 1991 Mar 31 2:00 -- 2:00 E-Eur EE%sT 1992 Mar 20 -- 2:00 C-Eur EE%sT 1996 May 13 -- 2:00 EU EE%sT - - # Vatican City - # See Europe/Rome. -diff --git a/src/java.base/share/data/tzdata/southamerica b/src/java.base/share/data/tzdata/southamerica -index 13ec081c7e0..3c0e0e2061c 100644 ---- a/src/java.base/share/data/tzdata/southamerica -+++ b/src/java.base/share/data/tzdata/southamerica -@@ -1332,8 +1332,14 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914 - # for America/Santiago will start on midnight of September 11th; - # and will end on April 1st, 2023. Magallanes region (America/Punta_Arenas) - # will keep UTC -3 "indefinitely"... This is because on September 4th --# we will have a voting whether to approve a new Constitution.... --# https://www.interior.gob.cl/noticias/2022/08/09/comunicado-el-proximo-sabado-10-de-septiembre-los-relojes-se-deben-adelantar-una-hora/ -+# we will have a voting whether to approve a new Constitution. -+# -+# From Eduardo Romero Urra (2022-08-17): -+# https://www.diariooficial.interior.gob.cl/publicaciones/2022/08/13/43327/01/2172567.pdf -+# -+# From Paul Eggert (2022-08-17): -+# Although the presidential decree stops at fall 2026, assume that -+# similar DST rules will continue thereafter. - - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S - Rule Chile 1927 1931 - Sep 1 0:00 1:00 - -diff --git a/src/java.base/share/data/tzdata/zone.tab b/src/java.base/share/data/tzdata/zone.tab -index 51b65fa273c..ee025196e50 100644 ---- a/src/java.base/share/data/tzdata/zone.tab -+++ b/src/java.base/share/data/tzdata/zone.tab -@@ -424,8 +424,6 @@ TV -0831+17913 Pacific/Funafuti - TW +2503+12130 Asia/Taipei - TZ -0648+03917 Africa/Dar_es_Salaam - UA +5026+03031 Europe/Kyiv Ukraine (most areas) --UA +4837+02218 Europe/Uzhgorod Transcarpathia --UA +4750+03510 Europe/Zaporozhye Zaporozhye and east Lugansk - UG +0019+03225 Africa/Kampala - UM +2813-17722 Pacific/Midway Midway Islands - UM +1917+16637 Pacific/Wake Wake Island -diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION -index c32bee39fba..71470168456 100644 ---- a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION -+++ b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION -@@ -1 +1 @@ --tzdata2022c -+tzdata2022d -diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt b/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt -index a5e6428a3f5..e3ce742f887 100644 ---- a/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt -+++ b/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt -@@ -183,6 +183,8 @@ Link Etc/UTC Etc/UCT - Link Europe/London Europe/Belfast - Link Europe/Kyiv Europe/Kiev - Link Europe/Chisinau Europe/Tiraspol -+Link Europe/Kyiv Europe/Uzhgorod -+Link Europe/Kyiv Europe/Zaporozhye - Link Europe/London GB - Link Europe/London GB-Eire - Link Etc/GMT GMT+0 -diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt -index fc148537f1f..b3823958ae4 100644 ---- a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt -+++ b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt -@@ -163,11 +163,9 @@ Europe/Simferopol MSK - Europe/Sofia EET EEST - Europe/Tallinn EET EEST - Europe/Tirane CET CEST --Europe/Uzhgorod EET EEST - Europe/Vienna CET CEST - Europe/Vilnius EET EEST - Europe/Warsaw CET CEST --Europe/Zaporozhye EET EEST - Europe/Zurich CET CEST - HST HST - MET MET MEST -diff --git a/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java b/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java -index ef6405860f5..221e0d5d29c 100644 ---- a/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java -+++ b/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java -@@ -176,11 +176,12 @@ public class TestZoneInfo310 { - * save time in IANA tzdata. This bug is tracked via JDK-8223388. - * - * These are the zones/rules that employ negative DST in vanguard -- * format (as of 2019a): -+ * format (as of 2019a), Palestine added in 2022d: - * - * - Rule "Eire" - * - Rule "Morocco" - * - Rule "Namibia" -+ * - Rule "Palestine" - * - Zone "Europe/Prague" - * - * Tehran/Iran rule has rules beyond 2037, in which javazic assumes -@@ -196,6 +197,8 @@ public class TestZoneInfo310 { - zid.equals("Europe/Dublin") || // uses "Eire" rule - zid.equals("Europe/Prague") || - zid.equals("Asia/Tehran") || // last rule mismatch -+ zid.equals("Asia/Gaza") || // uses "Palestine" rule -+ zid.equals("Asia/Hebron") || // uses "Palestine" rule - zid.equals("Iran")) { // last rule mismatch - continue; - } diff --git a/jdk8295173-tzdata2022e.patch b/jdk8295173-tzdata2022e.patch deleted file mode 100644 index 22acf25..0000000 --- a/jdk8295173-tzdata2022e.patch +++ /dev/null @@ -1,422 +0,0 @@ -commit 03d3e3ddff8e9cddfda7bec3a62e5547abe630db -Author: Yoshiki Sato -Date: Tue Oct 18 08:21:15 2022 +0000 - - 8295173: (tz) Update Timezone Data to 2022e - - Backport-of: 21407dec0156301871a83328615e4d975c4287c4 - -diff --git a/src/java.base/share/data/tzdata/VERSION b/src/java.base/share/data/tzdata/VERSION -index 889d0e6dad7..b8cb36e69f4 100644 ---- a/src/java.base/share/data/tzdata/VERSION -+++ b/src/java.base/share/data/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2022d -+tzdata2022e -diff --git a/src/java.base/share/data/tzdata/asia b/src/java.base/share/data/tzdata/asia -index f9df7432947..5b2337fd0b6 100644 ---- a/src/java.base/share/data/tzdata/asia -+++ b/src/java.base/share/data/tzdata/asia -@@ -2254,6 +2254,17 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u - # From the Arabic version, it seems to say it would be at midnight - # (assume 24:00) on the last Thursday in February, starting from 2022. - -+# From Issam Al-Zuwairi (2022-10-05): -+# The Council of Ministers in Jordan decided Wednesday 5th October 2022, -+# that daylight saving time (DST) will be throughout the year.... -+# -+# From Brian Inglis (2022-10-06): -+# https://petra.gov.jo/Include/InnerPage.jsp?ID=45567&lang=en&name=en_news -+# -+# From Paul Eggert (2022-10-05): -+# Like Syria, model this as a transition from EEST +03 (DST) to plain +03 -+# (non-DST) at the point where DST would otherwise have ended. -+ - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S - Rule Jordan 1973 only - Jun 6 0:00 1:00 S - Rule Jordan 1973 1975 - Oct 1 0:00 0 - -@@ -2285,11 +2296,12 @@ Rule Jordan 2005 only - Sep lastFri 0:00s 0 - - Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 - - Rule Jordan 2013 only - Dec 20 0:00 0 - - Rule Jordan 2014 2021 - Mar lastThu 24:00 1:00 S --Rule Jordan 2014 max - Oct lastFri 0:00s 0 - --Rule Jordan 2022 max - Feb lastThu 24:00 1:00 S -+Rule Jordan 2014 2022 - Oct lastFri 0:00s 0 - -+Rule Jordan 2022 only - Feb lastThu 24:00 1:00 S - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Asia/Amman 2:23:44 - LMT 1931 -- 2:00 Jordan EE%sT -+ 2:00 Jordan EE%sT 2022 Oct 28 0:00s -+ 3:00 - +03 - - - # Kazakhstan -@@ -3838,19 +3850,27 @@ Rule Syria 2007 only - Nov Fri>=1 0:00 0 - - # Our brief summary: - # https://www.timeanddate.com/news/time/syria-dst-2012.html - --# From Arthur David Olson (2012-03-27): --# Assume last Friday in March going forward XXX. -+# From Steffen Thorsen (2022-10-05): -+# Syria is adopting year-round DST, starting this autumn.... -+# From https://www.enabbaladi.net/archives/607812 -+# "This [the decision] came after the weekly government meeting today, -+# Tuesday 4 October ..." -+# -+# From Paul Eggert (2022-10-05): -+# Like Jordan, model this as a transition from EEST +03 (DST) to plain +03 -+# (non-DST) at the point where DST would otherwise have ended. - - Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S - Rule Syria 2008 only - Nov 1 0:00 0 - - Rule Syria 2009 only - Mar lastFri 0:00 1:00 S - Rule Syria 2010 2011 - Apr Fri>=1 0:00 1:00 S --Rule Syria 2012 max - Mar lastFri 0:00 1:00 S --Rule Syria 2009 max - Oct lastFri 0:00 0 - -+Rule Syria 2012 2022 - Mar lastFri 0:00 1:00 S -+Rule Syria 2009 2022 - Oct lastFri 0:00 0 - - - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq -- 2:00 Syria EE%sT -+ 2:00 Syria EE%sT 2022 Oct 28 0:00 -+ 3:00 - +03 - - # Tajikistan - # From Shanks & Pottenger. -diff --git a/src/java.base/share/data/tzdata/europe b/src/java.base/share/data/tzdata/europe -index accc845dbaf..2832c4b9763 100644 ---- a/src/java.base/share/data/tzdata/europe -+++ b/src/java.base/share/data/tzdata/europe -@@ -3417,7 +3417,7 @@ Zone Europe/Madrid -0:14:44 - LMT 1901 Jan 1 0:00u - 0:00 Spain WE%sT 1940 Mar 16 23:00 - 1:00 Spain CE%sT 1979 - 1:00 EU CE%sT --Zone Africa/Ceuta -0:21:16 - LMT 1900 Dec 31 23:38:44 -+Zone Africa/Ceuta -0:21:16 - LMT 1901 Jan 1 0:00u - 0:00 - WET 1918 May 6 23:00 - 0:00 1:00 WEST 1918 Oct 7 23:00 - 0:00 - WET 1924 -diff --git a/src/java.base/share/data/tzdata/northamerica b/src/java.base/share/data/tzdata/northamerica -index 114cef14cce..ce4ee74582c 100644 ---- a/src/java.base/share/data/tzdata/northamerica -+++ b/src/java.base/share/data/tzdata/northamerica -@@ -462,7 +462,7 @@ Rule Chicago 1922 1966 - Apr lastSun 2:00 1:00 D - Rule Chicago 1922 1954 - Sep lastSun 2:00 0 S - Rule Chicago 1955 1966 - Oct lastSun 2:00 0 S - # Zone NAME STDOFF RULES FORMAT [UNTIL] --Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 12:09:24 -+Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 18:00u - -6:00 US C%sT 1920 - -6:00 Chicago C%sT 1936 Mar 1 2:00 - -5:00 - EST 1936 Nov 15 2:00 -@@ -471,7 +471,7 @@ Zone America/Chicago -5:50:36 - LMT 1883 Nov 18 12:09:24 - -6:00 Chicago C%sT 1967 - -6:00 US C%sT - # Oliver County, ND switched from mountain to central time on 1992-10-25. --Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 12:14:48 -+Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 19:00u - -7:00 US M%sT 1992 Oct 25 2:00 - -6:00 US C%sT - # Morton County, ND, switched from mountain to central time on -@@ -481,7 +481,7 @@ Zone America/North_Dakota/Center -6:45:12 - LMT 1883 Nov 18 12:14:48 - # Jones, Mellette, and Todd Counties in South Dakota; - # but in practice these other counties were already observing central time. - # See . --Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21 -+Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 19:00u - -7:00 US M%sT 2003 Oct 26 2:00 - -6:00 US C%sT - -@@ -498,7 +498,7 @@ Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21 - # largest city in Mercer County). Google Maps places Beulah's city hall - # at 47° 15' 51" N, 101° 46' 40" W, which yields an offset of 6h47'07". - --Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53 -+Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 19:00u - -7:00 US M%sT 2010 Nov 7 2:00 - -6:00 US C%sT - -@@ -530,7 +530,7 @@ Rule Denver 1921 only - May 22 2:00 0 S - Rule Denver 1965 1966 - Apr lastSun 2:00 1:00 D - Rule Denver 1965 1966 - Oct lastSun 2:00 0 S - # Zone NAME STDOFF RULES FORMAT [UNTIL] --Zone America/Denver -6:59:56 - LMT 1883 Nov 18 12:00:04 -+Zone America/Denver -6:59:56 - LMT 1883 Nov 18 19:00u - -7:00 US M%sT 1920 - -7:00 Denver M%sT 1942 - -7:00 US M%sT 1946 -@@ -583,7 +583,7 @@ Rule CA 1950 1966 - Apr lastSun 1:00 1:00 D - Rule CA 1950 1961 - Sep lastSun 2:00 0 S - Rule CA 1962 1966 - Oct lastSun 2:00 0 S - # Zone NAME STDOFF RULES FORMAT [UNTIL] --Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 12:07:02 -+Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 20:00u - -8:00 US P%sT 1946 - -8:00 CA P%sT 1967 - -8:00 US P%sT -@@ -845,7 +845,7 @@ Zone Pacific/Honolulu -10:31:26 - LMT 1896 Jan 13 12:00 - # Go with the Arizona State Library instead. - - # Zone NAME STDOFF RULES FORMAT [UNTIL] --Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 11:31:42 -+Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 19:00u - -7:00 US M%sT 1944 Jan 1 0:01 - -7:00 - MST 1944 Apr 1 0:01 - -7:00 US M%sT 1944 Oct 1 0:01 -@@ -873,7 +873,7 @@ Link America/Phoenix America/Creston - # switched four weeks late in 1974. - # - # Zone NAME STDOFF RULES FORMAT [UNTIL] --Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11 -+Zone America/Boise -7:44:49 - LMT 1883 Nov 18 20:00u - -8:00 US P%sT 1923 May 13 2:00 - -7:00 US M%sT 1974 - -7:00 - MST 1974 Feb 3 2:00 -@@ -945,7 +945,7 @@ Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D - Rule Indianapolis 1941 1954 - Sep lastSun 2:00 0 S - Rule Indianapolis 1946 1954 - Apr lastSun 2:00 1:00 D - # Zone NAME STDOFF RULES FORMAT [UNTIL] --Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 12:15:22 -+Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 18:00u - -6:00 US C%sT 1920 - -6:00 Indianapolis C%sT 1942 - -6:00 US C%sT 1946 -@@ -965,7 +965,7 @@ Rule Marengo 1951 only - Sep lastSun 2:00 0 S - Rule Marengo 1954 1960 - Apr lastSun 2:00 1:00 D - Rule Marengo 1954 1960 - Sep lastSun 2:00 0 S - # Zone NAME STDOFF RULES FORMAT [UNTIL] --Zone America/Indiana/Marengo -5:45:23 - LMT 1883 Nov 18 12:14:37 -+Zone America/Indiana/Marengo -5:45:23 - LMT 1883 Nov 18 18:00u - -6:00 US C%sT 1951 - -6:00 Marengo C%sT 1961 Apr 30 2:00 - -5:00 - EST 1969 -@@ -989,7 +989,7 @@ Rule Vincennes 1960 only - Oct lastSun 2:00 0 S - Rule Vincennes 1961 only - Sep lastSun 2:00 0 S - Rule Vincennes 1962 1963 - Oct lastSun 2:00 0 S - # Zone NAME STDOFF RULES FORMAT [UNTIL] --Zone America/Indiana/Vincennes -5:50:07 - LMT 1883 Nov 18 12:09:53 -+Zone America/Indiana/Vincennes -5:50:07 - LMT 1883 Nov 18 18:00u - -6:00 US C%sT 1946 - -6:00 Vincennes C%sT 1964 Apr 26 2:00 - -5:00 - EST 1969 -@@ -1009,7 +1009,7 @@ Rule Perry 1955 1960 - Sep lastSun 2:00 0 S - Rule Perry 1956 1963 - Apr lastSun 2:00 1:00 D - Rule Perry 1961 1963 - Oct lastSun 2:00 0 S - # Zone NAME STDOFF RULES FORMAT [UNTIL] --Zone America/Indiana/Tell_City -5:47:03 - LMT 1883 Nov 18 12:12:57 -+Zone America/Indiana/Tell_City -5:47:03 - LMT 1883 Nov 18 18:00u - -6:00 US C%sT 1946 - -6:00 Perry C%sT 1964 Apr 26 2:00 - -5:00 - EST 1967 Oct 29 2:00 -@@ -1026,7 +1026,7 @@ Rule Pike 1955 1960 - Sep lastSun 2:00 0 S - Rule Pike 1956 1964 - Apr lastSun 2:00 1:00 D - Rule Pike 1961 1964 - Oct lastSun 2:00 0 S - # Zone NAME STDOFF RULES FORMAT [UNTIL] --Zone America/Indiana/Petersburg -5:49:07 - LMT 1883 Nov 18 12:10:53 -+Zone America/Indiana/Petersburg -5:49:07 - LMT 1883 Nov 18 18:00u - -6:00 US C%sT 1955 - -6:00 Pike C%sT 1965 Apr 25 2:00 - -5:00 - EST 1966 Oct 30 2:00 -@@ -1048,7 +1048,7 @@ Rule Starke 1955 1956 - Oct lastSun 2:00 0 S - Rule Starke 1957 1958 - Sep lastSun 2:00 0 S - Rule Starke 1959 1961 - Oct lastSun 2:00 0 S - # Zone NAME STDOFF RULES FORMAT [UNTIL] --Zone America/Indiana/Knox -5:46:30 - LMT 1883 Nov 18 12:13:30 -+Zone America/Indiana/Knox -5:46:30 - LMT 1883 Nov 18 18:00u - -6:00 US C%sT 1947 - -6:00 Starke C%sT 1962 Apr 29 2:00 - -5:00 - EST 1963 Oct 27 2:00 -@@ -1064,7 +1064,7 @@ Rule Pulaski 1946 1954 - Sep lastSun 2:00 0 S - Rule Pulaski 1955 1956 - Oct lastSun 2:00 0 S - Rule Pulaski 1957 1960 - Sep lastSun 2:00 0 S - # Zone NAME STDOFF RULES FORMAT [UNTIL] --Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 12:13:35 -+Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 18:00u - -6:00 US C%sT 1946 - -6:00 Pulaski C%sT 1961 Apr 30 2:00 - -5:00 - EST 1969 -@@ -1075,7 +1075,7 @@ Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 12:13:35 - # - # Switzerland County, Indiana, did not observe DST from 1973 through 2005. - # Zone NAME STDOFF RULES FORMAT [UNTIL] --Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 12:19:44 -+Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 18:00u - -6:00 US C%sT 1954 Apr 25 2:00 - -5:00 - EST 1969 - -5:00 US E%sT 1973 -@@ -1111,7 +1111,7 @@ Rule Louisville 1950 1961 - Apr lastSun 2:00 1:00 D - Rule Louisville 1950 1955 - Sep lastSun 2:00 0 S - Rule Louisville 1956 1961 - Oct lastSun 2:00 0 S - # Zone NAME STDOFF RULES FORMAT [UNTIL] --Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 12:16:58 -+Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 18:00u - -6:00 US C%sT 1921 - -6:00 Louisville C%sT 1942 - -6:00 US C%sT 1946 -@@ -1145,7 +1145,7 @@ Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 12:16:58 - # Federal Register 65, 160 (2000-08-17), pp 50154-50158. - # https://www.gpo.gov/fdsys/pkg/FR-2000-08-17/html/00-20854.htm - # --Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 12:20:36 -+Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 18:00u - -6:00 US C%sT 1946 - -6:00 - CST 1968 - -6:00 US C%sT 2000 Oct 29 2:00 -@@ -2640,6 +2640,8 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20 - # longitude they are located at. - - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S -+Rule Mexico 1931 only - May 1 23:00 1:00 D -+Rule Mexico 1931 only - Oct 1 0:00 0 S - Rule Mexico 1939 only - Feb 5 0:00 1:00 D - Rule Mexico 1939 only - Jun 25 0:00 0 S - Rule Mexico 1940 only - Dec 9 0:00 1:00 D -@@ -2656,13 +2658,13 @@ Rule Mexico 2002 max - Apr Sun>=1 2:00 1:00 D - Rule Mexico 2002 max - Oct lastSun 2:00 0 S - # Zone NAME STDOFF RULES FORMAT [UNTIL] - # Quintana Roo; represented by Cancún --Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 0:12:56 -+Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 6:00u - -6:00 - CST 1981 Dec 23 - -5:00 Mexico E%sT 1998 Aug 2 2:00 - -6:00 Mexico C%sT 2015 Feb 1 2:00 - -5:00 - EST - # Campeche, Yucatán; represented by Mérida --Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32 -+Zone America/Merida -5:58:28 - LMT 1922 Jan 1 6:00u - -6:00 - CST 1981 Dec 23 - -5:00 - EST 1982 Dec 2 - -6:00 Mexico C%sT -@@ -2676,23 +2678,21 @@ Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32 - # See: Inicia mañana Horario de Verano en zona fronteriza, El Universal, - # 2016-03-12 - # http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza --Zone America/Matamoros -6:40:00 - LMT 1921 Dec 31 23:20:00 -+Zone America/Matamoros -6:30:00 - LMT 1922 Jan 1 6:00u - -6:00 - CST 1988 - -6:00 US C%sT 1989 - -6:00 Mexico C%sT 2010 - -6:00 US C%sT - # Durango; Coahuila, Nuevo León, Tamaulipas (away from US border) --Zone America/Monterrey -6:41:16 - LMT 1921 Dec 31 23:18:44 -+Zone America/Monterrey -6:41:16 - LMT 1922 Jan 1 6:00u - -6:00 - CST 1988 - -6:00 US C%sT 1989 - -6:00 Mexico C%sT - # Central Mexico --Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24 -+Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 7:00u - -7:00 - MST 1927 Jun 10 23:00 - -6:00 - CST 1930 Nov 15 -- -7:00 - MST 1931 May 1 23:00 -- -6:00 - CST 1931 Oct -- -7:00 - MST 1932 Apr 1 -+ -7:00 Mexico M%sT 1932 Apr 1 - -6:00 Mexico C%sT 2001 Sep 30 2:00 - -6:00 - CST 2002 Feb 20 - -6:00 Mexico C%sT -@@ -2700,35 +2700,29 @@ Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24 - # This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe, - # Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides. - # (See the 2016-03-12 El Universal source mentioned above.) --Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 0:02:20 -+Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 7:00u - -7:00 - MST 1927 Jun 10 23:00 - -6:00 - CST 1930 Nov 15 -- -7:00 - MST 1931 May 1 23:00 -- -6:00 - CST 1931 Oct -- -7:00 - MST 1932 Apr 1 -+ -7:00 Mexico M%sT 1932 Apr 1 - -6:00 - CST 1996 - -6:00 Mexico C%sT 1998 - -6:00 - CST 1998 Apr Sun>=1 3:00 - -7:00 Mexico M%sT 2010 - -7:00 US M%sT - # Chihuahua (away from US border) --Zone America/Chihuahua -7:04:20 - LMT 1921 Dec 31 23:55:40 -+Zone America/Chihuahua -7:04:20 - LMT 1922 Jan 1 7:00u - -7:00 - MST 1927 Jun 10 23:00 - -6:00 - CST 1930 Nov 15 -- -7:00 - MST 1931 May 1 23:00 -- -6:00 - CST 1931 Oct -- -7:00 - MST 1932 Apr 1 -+ -7:00 Mexico M%sT 1932 Apr 1 - -6:00 - CST 1996 - -6:00 Mexico C%sT 1998 - -6:00 - CST 1998 Apr Sun>=1 3:00 - -7:00 Mexico M%sT - # Sonora --Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08 -+Zone America/Hermosillo -7:23:52 - LMT 1922 Jan 1 7:00u - -7:00 - MST 1927 Jun 10 23:00 - -6:00 - CST 1930 Nov 15 -- -7:00 - MST 1931 May 1 23:00 -- -6:00 - CST 1931 Oct -- -7:00 - MST 1932 Apr 1 -+ -7:00 Mexico M%sT 1932 Apr 1 - -6:00 - CST 1942 Apr 24 - -7:00 - MST 1949 Jan 14 - -8:00 - PST 1970 -@@ -2763,24 +2757,20 @@ Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08 - # Use "Bahia_Banderas" to keep the name to fourteen characters. - - # Mazatlán --Zone America/Mazatlan -7:05:40 - LMT 1921 Dec 31 23:54:20 -+Zone America/Mazatlan -7:05:40 - LMT 1922 Jan 1 7:00u - -7:00 - MST 1927 Jun 10 23:00 - -6:00 - CST 1930 Nov 15 -- -7:00 - MST 1931 May 1 23:00 -- -6:00 - CST 1931 Oct -- -7:00 - MST 1932 Apr 1 -+ -7:00 Mexico M%sT 1932 Apr 1 - -6:00 - CST 1942 Apr 24 - -7:00 - MST 1949 Jan 14 - -8:00 - PST 1970 - -7:00 Mexico M%sT - - # Bahía de Banderas --Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00 -+Zone America/Bahia_Banderas -7:01:00 - LMT 1922 Jan 1 7:00u - -7:00 - MST 1927 Jun 10 23:00 - -6:00 - CST 1930 Nov 15 -- -7:00 - MST 1931 May 1 23:00 -- -6:00 - CST 1931 Oct -- -7:00 - MST 1932 Apr 1 -+ -7:00 Mexico M%sT 1932 Apr 1 - -6:00 - CST 1942 Apr 24 - -7:00 - MST 1949 Jan 14 - -8:00 - PST 1970 -@@ -2788,7 +2778,7 @@ Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00 - -6:00 Mexico C%sT - - # Baja California --Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56 -+Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 7:00u - -7:00 - MST 1924 - -8:00 - PST 1927 Jun 10 23:00 - -7:00 - MST 1930 Nov 15 -diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION -index 71470168456..0cad939008f 100644 ---- a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION -+++ b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION -@@ -1 +1 @@ --tzdata2022d -+tzdata2022e -diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt -index b3823958ae4..2f2786f1c69 100644 ---- a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt -+++ b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt -@@ -97,9 +97,7 @@ America/Winnipeg CST CDT - America/Yakutat AKST AKDT - America/Yellowknife MST MDT - Antarctica/Macquarie AEST AEDT --Asia/Amman EET EEST - Asia/Beirut EET EEST --Asia/Damascus EET EEST - Asia/Famagusta EET EEST - Asia/Gaza EET EEST - Asia/Hebron EET EEST diff --git a/jdk8295447-npe_in_constructor.patch b/jdk8295447-npe_in_constructor.patch new file mode 100644 index 0000000..180b343 --- /dev/null +++ b/jdk8295447-npe_in_constructor.patch @@ -0,0 +1,97 @@ +commit c9d485792b99233f381dcdfd69838e7b973909bd +Author: Victor Rudometov +Date: Thu Dec 1 10:57:43 2022 +0000 + + 8295447: NullPointerException with invalid pattern matching construct in constructor call + + Backport-of: 6c05771b9be3dd5cbcdb40d2e53cc53959926cdd + +diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java +index 21cc8e57e1f..46b076d3d03 100644 +--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java ++++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java +@@ -4145,6 +4145,10 @@ public class Attr extends JCTree.Visitor { + Type exprType, + Type pattType) { + Warner warner = new Warner(); ++ // if any type is erroneous, the problem is reported elsewhere ++ if (exprType.isErroneous() || pattType.isErroneous()) { ++ return false; ++ } + if (!types.isCastable(exprType, pattType, warner)) { + chk.basicHandler.report(pos, + diags.fragment(Fragments.InconvertibleTypes(exprType, pattType))); +@@ -4206,7 +4210,7 @@ public class Attr extends JCTree.Visitor { + tree.record = record; + } else { + log.error(tree.pos(), Errors.DeconstructionPatternOnlyRecords(site.tsym)); +- expectedRecordTypes = Stream.generate(() -> Type.noType) ++ expectedRecordTypes = Stream.generate(() -> types.createErrorType(tree.type)) + .limit(tree.nested.size()) + .collect(List.collector()); + } +diff --git a/test/langtools/tools/javac/T8295447.java b/test/langtools/tools/javac/T8295447.java +new file mode 100644 +index 00000000000..76fcaf10f8d +--- /dev/null ++++ b/test/langtools/tools/javac/T8295447.java +@@ -0,0 +1,46 @@ ++/* ++ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++/** ++ * @test ++ * @bug 8295447 ++ * @summary NullPointerException with invalid pattern matching construct in constructor call ++ * @modules jdk.compiler ++ * @compile/fail/ref=T8295447.out -XDrawDiagnostics --enable-preview -source ${jdk.version} T8295447.java ++ */ ++public class T8295447 { ++ class Foo { ++ void m(Object o) { ++ if(o instanceof Foo(int x)) {} ++ } ++ ++ Foo(Object o) { ++ m((o instanceof Foo(int x))? 0 : 1); ++ } ++ void m(int i) { } ++ } ++ ++ class Base { int i; Base(int j) { i = j; } } ++ class Sub extends Base { ++ Sub(Object o) { super(o instanceof java.awt.Point(int x, int y)? x + y: 0); } ++ } ++} +diff --git a/test/langtools/tools/javac/T8295447.out b/test/langtools/tools/javac/T8295447.out +new file mode 100644 +index 00000000000..7f6746f802f +--- /dev/null ++++ b/test/langtools/tools/javac/T8295447.out +@@ -0,0 +1,6 @@ ++T8295447.java:33:29: compiler.err.deconstruction.pattern.only.records: T8295447.Foo ++T8295447.java:37:29: compiler.err.deconstruction.pattern.only.records: T8295447.Foo ++T8295447.java:44:44: compiler.err.deconstruction.pattern.only.records: java.awt.Point ++- compiler.note.preview.filename: T8295447.java, DEFAULT ++- compiler.note.preview.recompile ++3 errors +\ No newline at end of file diff --git a/jdk8296108-tzdata2022f.patch b/jdk8296108-tzdata2022f.patch deleted file mode 100644 index 385f9af..0000000 --- a/jdk8296108-tzdata2022f.patch +++ /dev/null @@ -1,2621 +0,0 @@ -commit 045c1f64897dbd8c12795ba84396ef12598f70a0 -Author: Yoshiki Sato -Date: Tue Nov 15 06:49:58 2022 +0000 - - 8296108: (tz) Update Timezone Data to 2022f - - Reviewed-by: naoto - Backport-of: 9d3b4ef2ad658afb5379796b7224458c12c81f5d - -diff --git a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java -index 8759aab3995..db892dbb595 100644 ---- a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java -+++ b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -429,7 +429,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { - "French Guiana Summer Time", "GFST", - "French Guiana Time", "GFT"}}, - {"America/Cayman", EST}, -- {"America/Chihuahua", MST}, -+ {"America/Chihuahua", CST}, - {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, -@@ -518,7 +518,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle { - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Nuuk", WGT}, -- {"America/Ojinaga", MST}, -+ {"America/Ojinaga", CST}, - {"America/Panama", EST}, - {"America/Pangnirtung", EST}, - {"America/Paramaribo", new String[] {"Suriname Time", "SRT", -diff --git a/src/java.base/share/data/tzdata/VERSION b/src/java.base/share/data/tzdata/VERSION -index b8cb36e69f4..b8d9ae74fbd 100644 ---- a/src/java.base/share/data/tzdata/VERSION -+++ b/src/java.base/share/data/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2022e -+tzdata2022f -diff --git a/src/java.base/share/data/tzdata/africa b/src/java.base/share/data/tzdata/africa -index aed85d0b290..cbf6322c4ee 100644 ---- a/src/java.base/share/data/tzdata/africa -+++ b/src/java.base/share/data/tzdata/africa -@@ -120,22 +120,6 @@ Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 16 - 0:00 Algeria WE%sT 1981 May - 1:00 - CET - --# Angola --# Benin --# See Africa/Lagos. -- --# Botswana --# See Africa/Maputo. -- --# Burkina Faso --# See Africa/Abidjan. -- --# Burundi --# See Africa/Maputo. -- --# Cameroon --# See Africa/Lagos. -- - # Cape Verde / Cabo Verde - # - # From Paul Eggert (2018-02-16): -@@ -150,9 +134,6 @@ Zone Atlantic/Cape_Verde -1:34:04 - LMT 1912 Jan 01 2:00u # Praia - -2:00 - -02 1975 Nov 25 2:00 - -1:00 - -01 - --# Central African Republic --# See Africa/Lagos. -- - # Chad - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena -@@ -160,33 +141,29 @@ Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena - 1:00 1:00 WAST 1980 Mar 8 - 1:00 - WAT - --# Comoros --# See Africa/Nairobi. -- --# Democratic Republic of the Congo --# See Africa/Lagos for the western part and Africa/Maputo for the eastern. -+# Burkina Faso -+# Côte d'Ivoire (Ivory Coast) -+# The Gambia -+# Ghana -+# Guinea -+# Iceland -+# Mali -+# Mauritania -+# St Helena -+# Senegal -+# Sierra Leone -+# Togo - --# Republic of the Congo --# See Africa/Lagos. -+# The other parts of the St Helena territory are similar: -+# Tristan da Cunha: on GMT, say Whitman and the CIA -+# Ascension: on GMT, say the USNO (1995-12-21) and the CIA -+# Gough (scientific station since 1955; sealers wintered previously): -+# on GMT, says the CIA -+# Inaccessible, Nightingale: uninhabited - --# Côte d'Ivoire / Ivory Coast - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Africa/Abidjan -0:16:08 - LMT 1912 - 0:00 - GMT --Link Africa/Abidjan Africa/Accra # Ghana --Link Africa/Abidjan Africa/Bamako # Mali --Link Africa/Abidjan Africa/Banjul # The Gambia --Link Africa/Abidjan Africa/Conakry # Guinea --Link Africa/Abidjan Africa/Dakar # Senegal --Link Africa/Abidjan Africa/Freetown # Sierra Leone --Link Africa/Abidjan Africa/Lome # Togo --Link Africa/Abidjan Africa/Nouakchott # Mauritania --Link Africa/Abidjan Africa/Ouagadougou # Burkina Faso --Link Africa/Abidjan Atlantic/Reykjavik # Iceland --Link Africa/Abidjan Atlantic/St_Helena # St Helena -- --# Djibouti --# See Africa/Nairobi. - - ############################################################################### - -@@ -382,33 +359,6 @@ Rule Egypt 2014 only - Sep lastThu 24:00 0 - - Zone Africa/Cairo 2:05:09 - LMT 1900 Oct - 2:00 Egypt EE%sT - --# Equatorial Guinea --# See Africa/Lagos. -- --# Eritrea --# See Africa/Nairobi. -- --# Eswatini (formerly Swaziland) --# See Africa/Johannesburg. -- --# Ethiopia --# See Africa/Nairobi. --# --# Unfortunately tzdb records only Western clock time in use in Ethiopia, --# as the tzdb format is not up to properly recording a common Ethiopian --# timekeeping practice that is based on solar time. See: --# Mortada D. If you have a meeting in Ethiopia, you'd better double --# check the time. PRI's The World. 2015-01-30 15:15 -05. --# https://www.pri.org/stories/2015-01-30/if-you-have-meeting-ethiopia-you-better-double-check-time -- --# Gabon --# See Africa/Lagos. -- --# The Gambia --# Ghana --# Guinea --# See Africa/Abidjan. -- - # Guinea-Bissau - # - # From Paul Eggert (2018-02-16): -@@ -421,7 +371,16 @@ Zone Africa/Bissau -1:02:20 - LMT 1912 Jan 1 1:00u - -1:00 - -01 1975 - 0:00 - GMT - -+# Comoros -+# Djibouti -+# Eritrea -+# Ethiopia - # Kenya -+# Madagascar -+# Mayotte -+# Somalia -+# Tanzania -+# Uganda - - # From P Chan (2020-10-24): - # -@@ -464,6 +423,14 @@ Zone Africa/Bissau -1:02:20 - LMT 1912 Jan 1 1:00u - # The 1908-05-01 announcement does not give an effective date, - # so just say "1908 May". - -+# From Paul Eggert (2018-09-11): -+# Unfortunately tzdb records only Western clock time in use in Ethiopia, -+# as the tzdb format is not up to properly recording a common Ethiopian -+# timekeeping practice that is based on solar time. See: -+# Mortada D. If you have a meeting in Ethiopia, you'd better double -+# check the time. PRI's The World. 2015-01-30 15:15 -05. -+# https://www.pri.org/stories/2015-01-30/if-you-have-meeting-ethiopia-you-better-double-check-time -+ - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Africa/Nairobi 2:27:16 - LMT 1908 May - 2:30 - +0230 1928 Jun 30 24:00 -@@ -471,18 +438,6 @@ Zone Africa/Nairobi 2:27:16 - LMT 1908 May - 2:30 - +0230 1936 Dec 31 24:00 - 2:45 - +0245 1942 Jul 31 24:00 - 3:00 - EAT --Link Africa/Nairobi Africa/Addis_Ababa # Ethiopia --Link Africa/Nairobi Africa/Asmara # Eritrea --Link Africa/Nairobi Africa/Dar_es_Salaam # Tanzania --Link Africa/Nairobi Africa/Djibouti --Link Africa/Nairobi Africa/Kampala # Uganda --Link Africa/Nairobi Africa/Mogadishu # Somalia --Link Africa/Nairobi Indian/Antananarivo # Madagascar --Link Africa/Nairobi Indian/Comoro --Link Africa/Nairobi Indian/Mayotte -- --# Lesotho --# See Africa/Johannesburg. - - # Liberia - # -@@ -563,16 +518,6 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 - 1:00 Libya CE%sT 2013 Oct 25 2:00 - 2:00 - EET - --# Madagascar --# See Africa/Nairobi. -- --# Malawi --# See Africa/Maputo. -- --# Mali --# Mauritania --# See Africa/Abidjan. -- - # Mauritius - - # From Steffen Thorsen (2008-06-25): -@@ -666,12 +611,6 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis - # Agalega Is, Rodriguez - # no information; probably like Indian/Mauritius - --# Mayotte --# See Africa/Nairobi. -- --# Morocco --# See Africa/Ceuta for Spanish Morocco. -- - # From Alex Krivenyshev (2008-05-09): - # Here is an article that Morocco plan to introduce Daylight Saving Time between - # 1 June, 2008 and 27 September, 2008. -@@ -1160,7 +1099,14 @@ Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún - 0:00 Morocco +00/+01 2018 Oct 28 3:00 - 1:00 Morocco +01/+00 - -+# Botswana -+# Burundi -+# Democratic Republic of the Congo (eastern) -+# Malawi - # Mozambique -+# Rwanda -+# Zambia -+# Zimbabwe - # - # Shanks gives 1903-03-01 for the transition to CAT. - # Perhaps the 1911-05-26 Portuguese decree -@@ -1170,14 +1116,6 @@ Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Africa/Maputo 2:10:20 - LMT 1903 Mar - 2:00 - CAT --Link Africa/Maputo Africa/Blantyre # Malawi --Link Africa/Maputo Africa/Bujumbura # Burundi --Link Africa/Maputo Africa/Gaborone # Botswana --Link Africa/Maputo Africa/Harare # Zimbabwe --Link Africa/Maputo Africa/Kigali # Rwanda --Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo --Link Africa/Maputo Africa/Lusaka # Zambia -- - - # Namibia - -@@ -1256,9 +1194,16 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 - # 2:00 - CAT - # End of rearguard section. - --# Niger --# See Africa/Lagos. - -+# Angola -+# Benin -+# Cameroon -+# Central African Republic -+# Democratic Republic of the Congo (western) -+# Republic of the Congo -+# Equatorial Guinea -+# Gabon -+# Niger - # Nigeria - - # From P Chan (2020-12-03): -@@ -1324,32 +1269,6 @@ Zone Africa/Lagos 0:13:35 - LMT 1905 Jul 1 - 0:13:35 - LMT 1914 Jan 1 - 0:30 - +0030 1919 Sep 1 - 1:00 - WAT --Link Africa/Lagos Africa/Bangui # Central African Republic --Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo --Link Africa/Lagos Africa/Douala # Cameroon --Link Africa/Lagos Africa/Kinshasa # Dem. Rep. of the Congo (west) --Link Africa/Lagos Africa/Libreville # Gabon --Link Africa/Lagos Africa/Luanda # Angola --Link Africa/Lagos Africa/Malabo # Equatorial Guinea --Link Africa/Lagos Africa/Niamey # Niger --Link Africa/Lagos Africa/Porto-Novo # Benin -- --# Réunion --# See Asia/Dubai. --# --# The Crozet Islands also observe Réunion time; see the 'antarctica' file. -- --# Rwanda --# See Africa/Maputo. -- --# St Helena --# See Africa/Abidjan. --# The other parts of the St Helena territory are similar: --# Tristan da Cunha: on GMT, say Whitman and the CIA --# Ascension: on GMT, say the USNO (1995-12-21) and the CIA --# Gough (scientific station since 1955; sealers wintered previously): --# on GMT, says the CIA --# Inaccessible, Nightingale: uninhabited - - # São Tomé and Príncipe - -@@ -1378,19 +1297,10 @@ Zone Africa/Sao_Tome 0:26:56 - LMT 1884 - 1:00 - WAT 2019 Jan 1 02:00 - 0:00 - GMT - --# Senegal --# See Africa/Abidjan. -- --# Seychelles --# See Asia/Dubai. -- --# Sierra Leone --# See Africa/Abidjan. -- --# Somalia --# See Africa/Nairobi. -- -+# Eswatini (Swaziland) -+# Lesotho - # South Africa -+ - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S - Rule SA 1942 1943 - Sep Sun>=15 2:00 1:00 - - Rule SA 1943 1944 - Mar Sun>=15 2:00 0 - -@@ -1398,8 +1308,6 @@ Rule SA 1943 1944 - Mar Sun>=15 2:00 0 - - Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8 - 1:30 - SAST 1903 Mar - 2:00 SA SAST --Link Africa/Johannesburg Africa/Maseru # Lesotho --Link Africa/Johannesburg Africa/Mbabane # Eswatini - # - # Marion and Prince Edward Is - # scientific station since 1947 -@@ -1448,12 +1356,6 @@ Zone Africa/Juba 2:06:28 - LMT 1931 - 3:00 - EAT 2021 Feb 1 00:00 - 2:00 - CAT - --# Tanzania --# See Africa/Nairobi. -- --# Togo --# See Africa/Abidjan. -- - # Tunisia - - # From Gwillim Law (2005-04-30): -@@ -1551,10 +1453,3 @@ Rule Tunisia 2006 2008 - Oct lastSun 2:00s 0 - - Zone Africa/Tunis 0:40:44 - LMT 1881 May 12 - 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time - 1:00 Tunisia CE%sT -- --# Uganda --# See Africa/Nairobi. -- --# Zambia --# Zimbabwe --# See Africa/Maputo. -diff --git a/src/java.base/share/data/tzdata/antarctica b/src/java.base/share/data/tzdata/antarctica -index 34c302eefc4..792542b9224 100644 ---- a/src/java.base/share/data/tzdata/antarctica -+++ b/src/java.base/share/data/tzdata/antarctica -@@ -329,4 +329,4 @@ Zone Antarctica/Rothera 0 - -00 1976 Dec 1 - # we have to go around and set them back 5 minutes or so. - # Maybe if we let them run fast all of the time, we'd get to leave here sooner!! - # --# See 'australasia' for Antarctica/McMurdo. -+# See Pacific/Auckland. -diff --git a/src/java.base/share/data/tzdata/asia b/src/java.base/share/data/tzdata/asia -index 5b2337fd0b6..89784bf4c33 100644 ---- a/src/java.base/share/data/tzdata/asia -+++ b/src/java.base/share/data/tzdata/asia -@@ -172,9 +172,6 @@ Zone Asia/Baku 3:19:24 - LMT 1924 May 2 - 4:00 EUAsia +04/+05 1997 - 4:00 Azer +04/+05 - --# Bahrain --# See Asia/Qatar. -- - # Bangladesh - # From Alexander Krivenyshev (2009-05-13): - # According to newspaper Asian Tribune (May 6, 2009) Bangladesh may introduce -@@ -277,10 +274,8 @@ Zone Indian/Chagos 4:49:40 - LMT 1907 - 5:00 - +05 1996 - 6:00 - +06 - --# Brunei --# See Asia/Kuching. -- --# Burma / Myanmar -+# Cocos (Keeling) Islands -+# Myanmar (Burma) - - # Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon. - -@@ -296,11 +291,6 @@ Zone Asia/Yangon 6:24:47 - LMT 1880 # or Rangoon - 6:30 - +0630 1942 May - 9:00 - +09 1945 May 3 - 6:30 - +0630 --Link Asia/Yangon Indian/Cocos -- --# Cambodia --# See Asia/Bangkok. -- - - # China - -@@ -688,10 +678,9 @@ Zone Asia/Shanghai 8:05:43 - LMT 1901 - 8:00 PRC C%sT - # Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi - # / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.) -+# Vostok base in Antarctica matches this since 1970. - Zone Asia/Urumqi 5:50:20 - LMT 1928 - 6:00 - +06 --Link Asia/Urumqi Antarctica/Vostok -- - - # Hong Kong - -@@ -1195,10 +1184,6 @@ Zone Asia/Famagusta 2:15:48 - LMT 1921 Nov 14 - 3:00 - +03 2017 Oct 29 1:00u - 2:00 EUAsia EE%sT - --# Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72. --# However, for various reasons many users expect to find it under Europe. --Link Asia/Nicosia Europe/Nicosia -- - # Georgia - # From Paul Eggert (1994-11-19): - # Today's _Economist_ (p 60) reports that Georgia moved its clocks forward -@@ -2727,14 +2712,6 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1 - 8:30 - KST 2018 May 4 23:30 - 9:00 - KST - --############################################################################### -- --# Kuwait --# See Asia/Riyadh. -- --# Laos --# See Asia/Bangkok. -- - - # Lebanon - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S -@@ -2766,7 +2743,9 @@ Rule Lebanon 1999 max - Oct lastSun 0:00 0 - - Zone Asia/Beirut 2:22:00 - LMT 1880 - 2:00 Lebanon EE%sT - --# Malaysia -+# Brunei -+# Malaysia (eastern) -+# - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S - Rule NBorneo 1935 1941 - Sep 14 0:00 0:20 - - Rule NBorneo 1935 1941 - Dec 14 0:00 0 - -@@ -2783,14 +2762,12 @@ Zone Asia/Kuching 7:21:20 - LMT 1926 Mar - 8:00 NBorneo +08/+0820 1942 Feb 16 - 9:00 - +09 1945 Sep 12 - 8:00 - +08 --Link Asia/Kuching Asia/Brunei - - # Maldives - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Indian/Maldives 4:54:00 - LMT 1880 # Malé - 4:54:00 - MMT 1960 # Malé Mean Time - 5:00 - +05 --Link Indian/Maldives Indian/Kerguelen - - # Mongolia - -@@ -2953,9 +2930,6 @@ Zone Asia/Kathmandu 5:41:16 - LMT 1920 - 5:30 - +0530 1986 - 5:45 - +0545 - --# Oman --# See Asia/Dubai. -- - # Pakistan - - # From Rives McDow (2002-03-13): -@@ -3566,14 +3540,18 @@ Zone Asia/Manila -15:56:00 - LMT 1844 Dec 31 - 9:00 - JST 1944 Nov - 8:00 Phil P%sT - -+# Bahrain - # Qatar - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Asia/Qatar 3:26:08 - LMT 1920 # Al Dawhah / Doha - 4:00 - +04 1972 Jun - 3:00 - +03 --Link Asia/Qatar Asia/Bahrain - -+# Kuwait - # Saudi Arabia -+# Yemen -+# -+# Japan's year-round bases in Antarctica match this since 1970. - # - # From Paul Eggert (2018-08-29): - # Time in Saudi Arabia and other countries in the Arabian peninsula was not -@@ -3618,9 +3596,6 @@ Link Asia/Qatar Asia/Bahrain - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Asia/Riyadh 3:06:52 - LMT 1947 Mar 14 - 3:00 - +03 --Link Asia/Riyadh Antarctica/Syowa --Link Asia/Riyadh Asia/Aden # Yemen --Link Asia/Riyadh Asia/Kuwait - - # Singapore - # taken from Mok Ly Yng (2003-10-30) -@@ -3635,7 +3610,6 @@ Zone Asia/Singapore 6:55:25 - LMT 1901 Jan 1 - 9:00 - +09 1945 Sep 12 - 7:30 - +0730 1982 Jan 1 - 8:00 - +08 --Link Asia/Singapore Asia/Kuala_Lumpur - - # Spratly Is - # no information -@@ -3881,14 +3855,15 @@ Zone Asia/Dushanbe 4:35:12 - LMT 1924 May 2 - 5:00 1:00 +06 1991 Sep 9 2:00s - 5:00 - +05 - -+# Cambodia -+# Christmas I -+# Laos - # Thailand -+# Vietnam (northern) - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Asia/Bangkok 6:42:04 - LMT 1880 - 6:42:04 - BMT 1920 Apr # Bangkok Mean Time - 7:00 - +07 --Link Asia/Bangkok Asia/Phnom_Penh # Cambodia --Link Asia/Bangkok Asia/Vientiane # Laos --Link Asia/Bangkok Indian/Christmas - - # Turkmenistan - # From Shanks & Pottenger. -@@ -3899,13 +3874,15 @@ Zone Asia/Ashgabat 3:53:32 - LMT 1924 May 2 # or Ashkhabad - 4:00 RussiaAsia +04/+05 1992 Jan 19 2:00 - 5:00 - +05 - -+# Oman -+# Réunion -+# Seychelles - # United Arab Emirates -+# -+# The Crozet Is also observe Réunion time; see the 'antarctica' file. - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Asia/Dubai 3:41:12 - LMT 1920 - 4:00 - +04 --Link Asia/Dubai Asia/Muscat # Oman --Link Asia/Dubai Indian/Mahe --Link Asia/Dubai Indian/Reunion - - # Uzbekistan - # Byalokoz 1919 says Uzbekistan was 4:27:53. -@@ -3925,7 +3902,7 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2 - 5:00 RussiaAsia +05/+06 1992 - 5:00 - +05 - --# Vietnam -+# Vietnam (southern) - - # From Paul Eggert (2014-10-04): - # Milne gives 7:16:56 for the meridian of Saigon in 1899, as being -@@ -3999,7 +3976,3 @@ Zone Asia/Ho_Chi_Minh 7:06:30 - LMT 1906 Jul 1 - # For timestamps in north Vietnam back to 1970 (the tzdb cutoff), - # use Asia/Bangkok; see the VN entries in the file zone1970.tab. - # For timestamps before 1970, see Asia/Hanoi in the file 'backzone'. -- -- --# Yemen --# See Asia/Riyadh. -diff --git a/src/java.base/share/data/tzdata/australasia b/src/java.base/share/data/tzdata/australasia -index 019cd778d30..fbe3b8a6d72 100644 ---- a/src/java.base/share/data/tzdata/australasia -+++ b/src/java.base/share/data/tzdata/australasia -@@ -274,13 +274,6 @@ Zone Antarctica/Macquarie 0 - -00 1899 Nov - 10:00 1:00 AEDT 2011 - 10:00 AT AE%sT - --# Christmas --# See Asia/Bangkok. -- --# Cocos (Keeling) Is --# See Asia/Yangon. -- -- - # Fiji - - # Milne gives 11:55:44 for Suva. -@@ -416,8 +409,14 @@ Zone Antarctica/Macquarie 0 - -00 1899 Nov - # concerned shifting arrival and departure times, which may look like a simple - # thing but requires some significant logistical adjustments domestically and - # internationally." --# Assume for now that DST will resume with the recent pre-2020 rules for the --# 2022/2023 season. -+ -+# From Shalvin Narayan (2022-10-27): -+# Please note that there will not be any daylight savings time change -+# in Fiji for 2022-2023.... -+# https://www.facebook.com/FijianGovernment/posts/pfbid0mmWVTYmTibn66ybpFda75pDcf34SSpoSaskJW5gXwaKo5Sgc7273Q4fXWc6kQV6Hl -+# -+# From Paul Eggert (2022-10-27): -+# For now, assume DST is suspended indefinitely. - - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S - Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 - -@@ -432,8 +431,6 @@ Rule Fiji 2014 2018 - Nov Sun>=1 2:00 1:00 - - Rule Fiji 2015 2021 - Jan Sun>=12 3:00 0 - - Rule Fiji 2019 only - Nov Sun>=8 2:00 1:00 - - Rule Fiji 2020 only - Dec 20 2:00 1:00 - --Rule Fiji 2022 max - Nov Sun>=8 2:00 1:00 - --Rule Fiji 2023 max - Jan Sun>=12 3:00 0 - - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva - 12:00 Fiji +12/+13 -@@ -449,7 +446,9 @@ Zone Pacific/Tahiti -9:58:16 - LMT 1912 Oct # Papeete - # Clipperton (near North America) is administered from French Polynesia; - # it is uninhabited. - -+ - # Guam -+# N Mariana Is - - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S - # http://guamlegislature.com/Public_Laws_5th/PL05-025.pdf -@@ -489,17 +488,20 @@ Zone Pacific/Guam -14:21:00 - LMT 1844 Dec 31 - 9:00 - +09 1944 Jul 31 - 10:00 Guam G%sT 2000 Dec 23 - 10:00 - ChST # Chamorro Standard Time --Link Pacific/Guam Pacific/Saipan # N Mariana Is - --# Kiribati -+ -+# Kiribati (Gilbert Is) -+# Marshall Is -+# Tuvalu -+# Wake -+# Wallis & Futuna - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Pacific/Tarawa 11:32:04 - LMT 1901 # Bairiki - 12:00 - +12 --Link Pacific/Tarawa Pacific/Funafuti --Link Pacific/Tarawa Pacific/Majuro --Link Pacific/Tarawa Pacific/Wake --Link Pacific/Tarawa Pacific/Wallis - -+# Kiribati (except Gilbert Is) -+# See Pacific/Tarawa for the Gilbert Is. -+# Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Pacific/Kanton 0 - -00 1937 Aug 31 - -12:00 - -12 1979 Oct - -11:00 - -11 1994 Dec 31 -@@ -509,9 +511,6 @@ Zone Pacific/Kiritimati -10:29:20 - LMT 1901 - -10:00 - -10 1994 Dec 31 - 14:00 - +14 - --# N Mariana Is --# See Pacific/Guam. -- - # Marshall Is - # See Pacific/Tarawa for most locations. - # Zone NAME STDOFF RULES FORMAT [UNTIL] -@@ -561,6 +560,7 @@ Zone Pacific/Noumea 11:05:48 - LMT 1912 Jan 13 # Nouméa - ############################################################################### - - # New Zealand -+# McMurdo Station and Scott Base in Antarctica use Auckland time. - - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S - Rule NZ 1927 only - Nov 6 2:00 1:00 S -@@ -596,7 +596,6 @@ Rule Chatham 2008 max - Apr Sun>=1 2:45s 0 - - Zone Pacific/Auckland 11:39:04 - LMT 1868 Nov 2 - 11:30 NZ NZ%sT 1946 Jan 1 - 12:00 NZ NZ%sT --Link Pacific/Auckland Antarctica/McMurdo - - Zone Pacific/Chatham 12:13:48 - LMT 1868 Nov 2 - 12:15 - +1215 1946 Jan 1 -@@ -695,8 +694,6 @@ Zone Pacific/Palau -15:02:04 - LMT 1844 Dec 31 # Koror - Zone Pacific/Port_Moresby 9:48:40 - LMT 1880 - 9:48:32 - PMMT 1895 # Port Moresby Mean Time - 10:00 - +10 --Link Pacific/Port_Moresby Antarctica/DumontDUrville --Link Pacific/Port_Moresby Pacific/Chuuk - # - # From Paul Eggert (2014-10-13): - # Base the Bougainville entry on the Arawa-Kieta region, which appears to have -@@ -729,10 +726,10 @@ Zone Pacific/Pitcairn -8:40:20 - LMT 1901 # Adamstown - -8:00 - -08 - - # American Samoa -+# Midway - Zone Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5 - -11:22:48 - LMT 1911 - -11:00 - SST # S=Samoa --Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands - - # Samoa (formerly and also known as Western Samoa) - -@@ -824,7 +821,6 @@ Zone Pacific/Apia 12:33:04 - LMT 1892 Jul 5 - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Pacific/Guadalcanal 10:39:48 - LMT 1912 Oct # Honiara - 11:00 - +11 --Link Pacific/Guadalcanal Pacific/Pohnpei - - # Tokelau - # -@@ -864,9 +860,6 @@ Zone Pacific/Tongatapu 12:19:12 - LMT 1945 Sep 10 - 13:00 - +13 1999 - 13:00 Tonga +13/+14 - --# Tuvalu --# See Pacific/Tarawa. -- - - # US minor outlying islands - -@@ -917,15 +910,9 @@ Zone Pacific/Tongatapu 12:19:12 - LMT 1945 Sep 10 - # Kingman - # uninhabited - --# Midway --# See Pacific/Pago_Pago. -- - # Palmyra - # uninhabited since World War II; was probably like Pacific/Kiritimati - --# Wake --# See Pacific/Tarawa. -- - - # Vanuatu - -@@ -962,9 +949,6 @@ Rule Vanuatu 1992 only - Oct Sat>=22 24:00 1:00 - - Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila - 11:00 Vanuatu +11/+12 - --# Wallis and Futuna --# See Pacific/Tarawa. -- - ############################################################################### - - # NOTES -diff --git a/src/java.base/share/data/tzdata/backward b/src/java.base/share/data/tzdata/backward -index 7765d99aedf..1fb087a6d87 100644 ---- a/src/java.base/share/data/tzdata/backward -+++ b/src/java.base/share/data/tzdata/backward -@@ -27,7 +27,7 @@ - # 2009-05-17 by Arthur David Olson. - - # This file provides links from old or merged timezone names to current ones. --# Many names changed in late 1993, and many merged names moved here -+# Many names changed in 1993 and in 1995, and many merged names moved here - # in the period from 2013 through 2022. Several of these names are - # also present in the file 'backzone', which has data important only - # for pre-1970 timestamps and so is out of scope for tzdb proper. -@@ -36,50 +36,24 @@ - # building with 'make BACKWARD=', in practice downstream users - # typically use this file for backward compatibility. - --# Link TARGET LINK-NAME --Link Africa/Nairobi Africa/Asmera --Link Africa/Abidjan Africa/Timbuktu --Link America/Argentina/Catamarca America/Argentina/ComodRivadavia --Link America/Adak America/Atka --Link America/Argentina/Buenos_Aires America/Buenos_Aires --Link America/Argentina/Catamarca America/Catamarca --Link America/Panama America/Coral_Harbour --Link America/Argentina/Cordoba America/Cordoba --Link America/Tijuana America/Ensenada --Link America/Indiana/Indianapolis America/Fort_Wayne --Link America/Nuuk America/Godthab --Link America/Indiana/Indianapolis America/Indianapolis --Link America/Argentina/Jujuy America/Jujuy --Link America/Indiana/Knox America/Knox_IN --Link America/Kentucky/Louisville America/Louisville --Link America/Argentina/Mendoza America/Mendoza --Link America/Toronto America/Montreal --Link America/Rio_Branco America/Porto_Acre --Link America/Argentina/Cordoba America/Rosario --Link America/Tijuana America/Santa_Isabel --Link America/Denver America/Shiprock --Link America/Puerto_Rico America/Virgin --Link Pacific/Auckland Antarctica/South_Pole --Link Asia/Ashgabat Asia/Ashkhabad --Link Asia/Kolkata Asia/Calcutta --Link Asia/Shanghai Asia/Chongqing --Link Asia/Shanghai Asia/Chungking --Link Asia/Dhaka Asia/Dacca --Link Asia/Shanghai Asia/Harbin --Link Asia/Urumqi Asia/Kashgar --Link Asia/Kathmandu Asia/Katmandu --Link Asia/Macau Asia/Macao --Link Asia/Yangon Asia/Rangoon --Link Asia/Ho_Chi_Minh Asia/Saigon --Link Asia/Jerusalem Asia/Tel_Aviv --Link Asia/Thimphu Asia/Thimbu --Link Asia/Makassar Asia/Ujung_Pandang --Link Asia/Ulaanbaatar Asia/Ulan_Bator --Link Atlantic/Faroe Atlantic/Faeroe --Link Europe/Berlin Atlantic/Jan_Mayen --Link Australia/Sydney Australia/ACT --Link Australia/Sydney Australia/Canberra --Link Australia/Hobart Australia/Currie -+# This file is divided into sections, one for each major reason for a -+# backward compatibility link. Each section is sorted by link name. -+ -+# A "#= TARGET1" comment labels each link inserted only because some -+# .zi parsers (including tzcode through 2022e) mishandle links to links. -+# The comment says what the target would be if these parsers were fixed -+# so that data could contain links to links. For example, the line -+# "Link Australia/Sydney Australia/ACT #= Australia/Canberra" would be -+# "Link Australia/Canberra Australia/ACT" were it not that data lines -+# refrain from linking to links like Australia/Canberra, which means -+# the Australia/ACT line links instead to Australia/Sydney, -+# Australia/Canberra's target. -+ -+ -+# Pre-1993 naming conventions -+ -+# Link TARGET LINK-NAME #= TARGET1 -+Link Australia/Sydney Australia/ACT #= Australia/Canberra - Link Australia/Lord_Howe Australia/LHI - Link Australia/Sydney Australia/NSW - Link Australia/Darwin Australia/North -@@ -89,7 +63,7 @@ Link Australia/Hobart Australia/Tasmania - Link Australia/Melbourne Australia/Victoria - Link Australia/Perth Australia/West - Link Australia/Broken_Hill Australia/Yancowinna --Link America/Rio_Branco Brazil/Acre -+Link America/Rio_Branco Brazil/Acre #= America/Porto_Acre - Link America/Noronha Brazil/DeNoronha - Link America/Sao_Paulo Brazil/East - Link America/Manaus Brazil/West -@@ -109,20 +83,36 @@ Link Pacific/Easter Chile/EasterIsland - Link America/Havana Cuba - Link Africa/Cairo Egypt - Link Europe/Dublin Eire -+# Vanguard section, for most .zi parsers. -+#Link GMT Etc/GMT -+#Link GMT Etc/GMT+0 -+#Link GMT Etc/GMT-0 -+#Link GMT Etc/GMT0 -+#Link GMT Etc/Greenwich -+# Rearguard section, for TZUpdater 2.3.2 and earlier. -+Link Etc/GMT Etc/GMT+0 -+Link Etc/GMT Etc/GMT-0 -+Link Etc/GMT Etc/GMT0 -+Link Etc/GMT Etc/Greenwich -+# End of rearguard section. - Link Etc/UTC Etc/UCT --Link Europe/London Europe/Belfast --Link Europe/Kyiv Europe/Kiev --Link Europe/Chisinau Europe/Tiraspol --Link Europe/Kyiv Europe/Uzhgorod --Link Europe/Kyiv Europe/Zaporozhye -+Link Etc/UTC Etc/Universal -+Link Etc/UTC Etc/Zulu - Link Europe/London GB - Link Europe/London GB-Eire -+# Vanguard section, for most .zi parsers. -+#Link GMT GMT+0 -+#Link GMT GMT-0 -+#Link GMT GMT0 -+#Link GMT Greenwich -+# Rearguard section, for TZUpdater 2.3.2 and earlier. - Link Etc/GMT GMT+0 - Link Etc/GMT GMT-0 - Link Etc/GMT GMT0 - Link Etc/GMT Greenwich -+# End of rearguard section. - Link Asia/Hong_Kong Hongkong --Link Africa/Abidjan Iceland -+Link Africa/Abidjan Iceland #= Atlantic/Reykjavik - Link Asia/Tehran Iran - Link Asia/Jerusalem Israel - Link America/Jamaica Jamaica -@@ -134,14 +124,8 @@ Link America/Mazatlan Mexico/BajaSur - Link America/Mexico_City Mexico/General - Link Pacific/Auckland NZ - Link Pacific/Chatham NZ-CHAT --Link America/Denver Navajo -+Link America/Denver Navajo #= America/Shiprock - Link Asia/Shanghai PRC --Link Pacific/Kanton Pacific/Enderbury --Link Pacific/Honolulu Pacific/Johnston --Link Pacific/Guadalcanal Pacific/Ponape --Link Pacific/Pago_Pago Pacific/Samoa --Link Pacific/Port_Moresby Pacific/Truk --Link Pacific/Port_Moresby Pacific/Yap - Link Europe/Warsaw Poland - Link Europe/Lisbon Portugal - Link Asia/Taipei ROC -@@ -165,3 +149,192 @@ Link Etc/UTC UTC - Link Etc/UTC Universal - Link Europe/Moscow W-SU - Link Etc/UTC Zulu -+ -+ -+# Two-part names that were renamed mostly to three-part names in 1995 -+ -+# Link TARGET LINK-NAME #= TARGET1 -+Link America/Argentina/Buenos_Aires America/Buenos_Aires -+Link America/Argentina/Catamarca America/Catamarca -+Link America/Argentina/Cordoba America/Cordoba -+Link America/Indiana/Indianapolis America/Indianapolis -+Link America/Argentina/Jujuy America/Jujuy -+Link America/Indiana/Knox America/Knox_IN -+Link America/Kentucky/Louisville America/Louisville -+Link America/Argentina/Mendoza America/Mendoza -+Link America/Puerto_Rico America/Virgin #= America/St_Thomas -+Link Pacific/Pago_Pago Pacific/Samoa -+ -+ -+# Pre-2013 practice, which typically had a Zone per zone.tab line -+ -+# Link TARGET LINK-NAME -+Link Africa/Abidjan Africa/Accra -+Link Africa/Nairobi Africa/Addis_Ababa -+Link Africa/Nairobi Africa/Asmara -+Link Africa/Abidjan Africa/Bamako -+Link Africa/Lagos Africa/Bangui -+Link Africa/Abidjan Africa/Banjul -+Link Africa/Maputo Africa/Blantyre -+Link Africa/Lagos Africa/Brazzaville -+Link Africa/Maputo Africa/Bujumbura -+Link Africa/Abidjan Africa/Conakry -+Link Africa/Abidjan Africa/Dakar -+Link Africa/Nairobi Africa/Dar_es_Salaam -+Link Africa/Nairobi Africa/Djibouti -+Link Africa/Lagos Africa/Douala -+Link Africa/Abidjan Africa/Freetown -+Link Africa/Maputo Africa/Gaborone -+Link Africa/Maputo Africa/Harare -+Link Africa/Nairobi Africa/Kampala -+Link Africa/Maputo Africa/Kigali -+Link Africa/Lagos Africa/Kinshasa -+Link Africa/Lagos Africa/Libreville -+Link Africa/Abidjan Africa/Lome -+Link Africa/Lagos Africa/Luanda -+Link Africa/Maputo Africa/Lubumbashi -+Link Africa/Maputo Africa/Lusaka -+Link Africa/Lagos Africa/Malabo -+Link Africa/Johannesburg Africa/Maseru -+Link Africa/Johannesburg Africa/Mbabane -+Link Africa/Nairobi Africa/Mogadishu -+Link Africa/Lagos Africa/Niamey -+Link Africa/Abidjan Africa/Nouakchott -+Link Africa/Abidjan Africa/Ouagadougou -+Link Africa/Lagos Africa/Porto-Novo -+Link America/Puerto_Rico America/Anguilla -+Link America/Puerto_Rico America/Antigua -+Link America/Puerto_Rico America/Aruba -+Link America/Panama America/Atikokan -+Link America/Puerto_Rico America/Blanc-Sablon -+Link America/Panama America/Cayman -+Link America/Phoenix America/Creston -+Link America/Puerto_Rico America/Curacao -+Link America/Puerto_Rico America/Dominica -+Link America/Puerto_Rico America/Grenada -+Link America/Puerto_Rico America/Guadeloupe -+Link America/Puerto_Rico America/Kralendijk -+Link America/Puerto_Rico America/Lower_Princes -+Link America/Puerto_Rico America/Marigot -+Link America/Puerto_Rico America/Montserrat -+Link America/Toronto America/Nassau -+Link America/Puerto_Rico America/Port_of_Spain -+Link America/Puerto_Rico America/St_Barthelemy -+Link America/Puerto_Rico America/St_Kitts -+Link America/Puerto_Rico America/St_Lucia -+Link America/Puerto_Rico America/St_Thomas -+Link America/Puerto_Rico America/St_Vincent -+Link America/Puerto_Rico America/Tortola -+Link Pacific/Port_Moresby Antarctica/DumontDUrville -+Link Pacific/Auckland Antarctica/McMurdo -+Link Asia/Riyadh Antarctica/Syowa -+Link Asia/Urumqi Antarctica/Vostok -+Link Europe/Berlin Arctic/Longyearbyen -+Link Asia/Riyadh Asia/Aden -+Link Asia/Qatar Asia/Bahrain -+Link Asia/Kuching Asia/Brunei -+Link Asia/Singapore Asia/Kuala_Lumpur -+Link Asia/Riyadh Asia/Kuwait -+Link Asia/Dubai Asia/Muscat -+Link Asia/Bangkok Asia/Phnom_Penh -+Link Asia/Bangkok Asia/Vientiane -+Link Africa/Abidjan Atlantic/Reykjavik -+Link Africa/Abidjan Atlantic/St_Helena -+Link Europe/Brussels Europe/Amsterdam -+Link Europe/Prague Europe/Bratislava -+Link Europe/Zurich Europe/Busingen -+Link Europe/Berlin Europe/Copenhagen -+Link Europe/London Europe/Guernsey -+Link Europe/London Europe/Isle_of_Man -+Link Europe/London Europe/Jersey -+Link Europe/Belgrade Europe/Ljubljana -+Link Europe/Brussels Europe/Luxembourg -+Link Europe/Helsinki Europe/Mariehamn -+Link Europe/Paris Europe/Monaco -+Link Europe/Berlin Europe/Oslo -+Link Europe/Belgrade Europe/Podgorica -+Link Europe/Rome Europe/San_Marino -+Link Europe/Belgrade Europe/Sarajevo -+Link Europe/Belgrade Europe/Skopje -+Link Europe/Berlin Europe/Stockholm -+Link Europe/Zurich Europe/Vaduz -+Link Europe/Rome Europe/Vatican -+Link Europe/Belgrade Europe/Zagreb -+Link Africa/Nairobi Indian/Antananarivo -+Link Asia/Bangkok Indian/Christmas -+Link Asia/Yangon Indian/Cocos -+Link Africa/Nairobi Indian/Comoro -+Link Indian/Maldives Indian/Kerguelen -+Link Asia/Dubai Indian/Mahe -+Link Africa/Nairobi Indian/Mayotte -+Link Asia/Dubai Indian/Reunion -+Link Pacific/Port_Moresby Pacific/Chuuk -+Link Pacific/Tarawa Pacific/Funafuti -+Link Pacific/Tarawa Pacific/Majuro -+Link Pacific/Pago_Pago Pacific/Midway -+Link Pacific/Guadalcanal Pacific/Pohnpei -+Link Pacific/Guam Pacific/Saipan -+Link Pacific/Tarawa Pacific/Wake -+Link Pacific/Tarawa Pacific/Wallis -+ -+ -+# Non-zone.tab locations with timestamps since 1970 that duplicate -+# those of an existing location -+ -+# Link TARGET LINK-NAME -+Link Africa/Abidjan Africa/Timbuktu -+Link America/Argentina/Catamarca America/Argentina/ComodRivadavia -+Link America/Adak America/Atka -+Link America/Panama America/Coral_Harbour -+Link America/Tijuana America/Ensenada -+Link America/Indiana/Indianapolis America/Fort_Wayne -+Link America/Toronto America/Montreal -+Link America/Toronto America/Nipigon -+Link America/Rio_Branco America/Porto_Acre -+Link America/Winnipeg America/Rainy_River -+Link America/Argentina/Cordoba America/Rosario -+Link America/Tijuana America/Santa_Isabel -+Link America/Denver America/Shiprock -+Link America/Toronto America/Thunder_Bay -+Link Pacific/Auckland Antarctica/South_Pole -+Link Asia/Shanghai Asia/Chongqing -+Link Asia/Shanghai Asia/Harbin -+Link Asia/Urumqi Asia/Kashgar -+Link Asia/Jerusalem Asia/Tel_Aviv -+Link Europe/Berlin Atlantic/Jan_Mayen -+Link Australia/Sydney Australia/Canberra -+Link Australia/Hobart Australia/Currie -+Link Europe/London Europe/Belfast -+Link Europe/Chisinau Europe/Tiraspol -+Link Europe/Kyiv Europe/Uzhgorod -+Link Europe/Kyiv Europe/Zaporozhye -+Link Pacific/Kanton Pacific/Enderbury -+Link Pacific/Honolulu Pacific/Johnston -+Link Pacific/Port_Moresby Pacific/Yap -+ -+ -+# Alternate names for the same location -+ -+# Link TARGET LINK-NAME #= TARGET1 -+Link Africa/Nairobi Africa/Asmera #= Africa/Asmara -+Link America/Nuuk America/Godthab -+Link Asia/Ashgabat Asia/Ashkhabad -+Link Asia/Kolkata Asia/Calcutta -+Link Asia/Shanghai Asia/Chungking #= Asia/Chongqing -+Link Asia/Dhaka Asia/Dacca -+# Istanbul is in both continents. -+Link Europe/Istanbul Asia/Istanbul -+Link Asia/Kathmandu Asia/Katmandu -+Link Asia/Macau Asia/Macao -+Link Asia/Yangon Asia/Rangoon -+Link Asia/Ho_Chi_Minh Asia/Saigon -+Link Asia/Thimphu Asia/Thimbu -+Link Asia/Makassar Asia/Ujung_Pandang -+Link Asia/Ulaanbaatar Asia/Ulan_Bator -+Link Atlantic/Faroe Atlantic/Faeroe -+Link Europe/Kyiv Europe/Kiev -+# Classically, Cyprus is in Asia; e.g. see Herodotus, Histories, I.72. -+# However, for various reasons many users expect to find it under Europe. -+Link Asia/Nicosia Europe/Nicosia -+Link Pacific/Guadalcanal Pacific/Ponape #= Pacific/Pohnpei -+Link Pacific/Port_Moresby Pacific/Truk #= Pacific/Chuuk -diff --git a/src/java.base/share/data/tzdata/etcetera b/src/java.base/share/data/tzdata/etcetera -index 82ff6b4a624..8ae294f524a 100644 ---- a/src/java.base/share/data/tzdata/etcetera -+++ b/src/java.base/share/data/tzdata/etcetera -@@ -39,26 +39,23 @@ - # Do not use a POSIX TZ setting like TZ='GMT+4', which is four hours - # behind GMT but uses the completely misleading abbreviation "GMT". - --Zone Etc/GMT 0 - GMT -- - # The following zone is used by tzcode functions like gmtime, - # which load the "UTC" file to handle seconds properly. - Zone Etc/UTC 0 - UTC - -+# Functions like gmtime load the "GMT" file to handle leap seconds properly. -+# Vanguard section, which works with most .zi parsers. -+#Zone GMT 0 - GMT -+# Rearguard section, for TZUpdater 2.3.2 and earlier. -+Zone Etc/GMT 0 - GMT -+ - # The following link uses older naming conventions, - # but it belongs here, not in the file 'backward', - # as it is needed for tzcode releases through 2022a, - # where functions like gmtime load "GMT" instead of the "Etc/UTC". - # We want this to work even on installations that omit 'backward'. - Link Etc/GMT GMT -- --Link Etc/UTC Etc/Universal --Link Etc/UTC Etc/Zulu -- --Link Etc/GMT Etc/Greenwich --Link Etc/GMT Etc/GMT-0 --Link Etc/GMT Etc/GMT+0 --Link Etc/GMT Etc/GMT0 -+# End of rearguard section. - - # Be consistent with POSIX TZ settings in the Zone names, - # even though this is the opposite of what many people expect. -diff --git a/src/java.base/share/data/tzdata/europe b/src/java.base/share/data/tzdata/europe -index 2832c4b9763..f88730002ca 100644 ---- a/src/java.base/share/data/tzdata/europe -+++ b/src/java.base/share/data/tzdata/europe -@@ -527,9 +527,6 @@ Zone Europe/London -0:01:15 - LMT 1847 Dec 1 - 1:00 - BST 1971 Oct 31 2:00u - 0:00 GB-Eire %s 1996 - 0:00 EU GMT/BST --Link Europe/London Europe/Jersey --Link Europe/London Europe/Guernsey --Link Europe/London Europe/Isle_of_Man - - # From Paul Eggert (2018-02-15): - # In January 2018 we discovered that the negative SAVE values in the -@@ -902,6 +899,8 @@ Zone Europe/Minsk 1:50:16 - LMT 1880 - 3:00 - +03 - - # Belgium -+# Luxembourg -+# Netherlands - # - # From Michael Deckers (2019-08-25): - # The exposition in the web page -@@ -984,11 +983,6 @@ Zone Europe/Brussels 0:17:30 - LMT 1880 - 1:00 C-Eur CE%sT 1944 Sep 3 - 1:00 Belgium CE%sT 1977 - 1:00 EU CE%sT --Link Europe/Brussels Europe/Amsterdam --Link Europe/Brussels Europe/Luxembourg -- --# Bosnia and Herzegovina --# See Europe/Belgrade. - - # Bulgaria - # -@@ -1015,13 +1009,11 @@ Zone Europe/Sofia 1:33:16 - LMT 1880 - 2:00 E-Eur EE%sT 1997 - 2:00 EU EE%sT - --# Croatia --# See Europe/Belgrade. -- - # Cyprus - # Please see the 'asia' file for Asia/Nicosia. - --# Czech Republic / Czechia -+# Czech Republic (Czechia) -+# Slovakia - # - # From Paul Eggert (2018-04-15): - # The source for Czech data is: Kdy začíná a končí letní čas. 2018-04-15. -@@ -1048,15 +1040,14 @@ Zone Europe/Prague 0:57:44 - LMT 1850 - # End of rearguard section. - 1:00 Czech CE%sT 1979 - 1:00 EU CE%sT --Link Europe/Prague Europe/Bratislava -- -- --# Denmark, Faroe Islands, and Greenland --# For Denmark see Europe/Berlin. - -+# Faroe Is -+# Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn - 0:00 - WET 1981 - 0:00 EU WE%sT -+ -+# Greenland - # - # From Paul Eggert (2004-10-31): - # During World War II, Germany maintained secret manned weather stations in -@@ -1282,11 +1273,8 @@ Zone Europe/Helsinki 1:39:49 - LMT 1878 May 31 - 2:00 Finland EE%sT 1983 - 2:00 EU EE%sT - --# Åland Is --Link Europe/Helsinki Europe/Mariehamn -- -- - # France -+# Monaco - - # From Ciro Discepolo (2000-12-20): - # -@@ -1423,9 +1411,11 @@ Zone Europe/Paris 0:09:21 - LMT 1891 Mar 16 - 0:00 France WE%sT 1945 Sep 16 3:00 - 1:00 France CE%sT 1977 - 1:00 EU CE%sT --Link Europe/Paris Europe/Monaco - -+# Denmark - # Germany -+# Norway -+# Sweden - - # From Markus Kuhn (1998-09-29): - # The German time zone web site by the Physikalisch-Technische -@@ -1443,6 +1433,53 @@ Link Europe/Paris Europe/Monaco - # However, Moscow did not observe daylight saving in 1945, so - # this was equivalent to UT +03, not +04. - -+# Svalbard & Jan Mayen -+ -+# From Steffen Thorsen (2001-05-01): -+# Although I could not find it explicitly, it seems that Jan Mayen and -+# Svalbard have been using the same time as Norway at least since the -+# time they were declared as parts of Norway. Svalbard was declared -+# as a part of Norway by law of 1925-07-17 no 11, section 4 and Jan -+# Mayen by law of 1930-02-27 no 2, section 2. (From -+# and -+# ). The law/regulation -+# for normal/standard time in Norway is from 1894-06-29 no 1 (came -+# into operation on 1895-01-01) and Svalbard/Jan Mayen seem to be a -+# part of this law since 1925/1930. (From -+# ) I have not been -+# able to find if Jan Mayen used a different time zone (e.g. -0100) -+# before 1930. Jan Mayen has only been "inhabited" since 1921 by -+# Norwegian meteorologists and maybe used the same time as Norway ever -+# since 1921. Svalbard (Arctic/Longyearbyen) has been inhabited since -+# before 1895, and therefore probably changed the local time somewhere -+# between 1895 and 1925 (inclusive). -+ -+# From Paul Eggert (2013-09-04): -+# -+# Actually, Jan Mayen was never occupied by Germany during World War II, -+# so it must have diverged from Oslo time during the war, as Oslo was -+# keeping Berlin time. -+# -+# says that the meteorologists -+# burned down their station in 1940 and left the island, but returned in -+# 1941 with a small Norwegian garrison and continued operations despite -+# frequent air attacks from Germans. In 1943 the Americans established a -+# radiolocating station on the island, called "Atlantic City". Possibly -+# the UT offset changed during the war, but I think it unlikely that -+# Jan Mayen used German daylight-saving rules. -+# -+# Svalbard is more complicated, as it was raided in August 1941 by an -+# Allied party that evacuated the civilian population to England (says -+# ). The Svalbard FAQ -+# says that the Germans were -+# expelled on 1942-05-14. However, small parties of Germans did return, -+# and according to Wilhelm Dege's book "War North of 80" (1954) -+# http://www.ucalgary.ca/UofC/departments/UP/1-55238/1-55238-110-2.html -+# the German armed forces at the Svalbard weather station code-named -+# Haudegen did not surrender to the Allies until September 1945. -+# -+# All these events predate our cutoff date of 1970, so use Europe/Berlin -+# for these regions. - - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S - Rule Germany 1946 only - Apr 14 2:00s 1:00 S -@@ -1467,11 +1504,6 @@ Zone Europe/Berlin 0:53:28 - LMT 1893 Apr - 1:00 SovietZone CE%sT 1946 - 1:00 Germany CE%sT 1980 - 1:00 EU CE%sT --Link Europe/Berlin Arctic/Longyearbyen --Link Europe/Berlin Europe/Copenhagen --Link Europe/Berlin Europe/Oslo --Link Europe/Berlin Europe/Stockholm -- - - # Georgia - # Please see the "asia" file for Asia/Tbilisi. -@@ -1590,10 +1622,9 @@ Zone Europe/Budapest 1:16:20 - LMT 1890 Nov 1 - 1:00 Hungary CE%sT 1984 - 1:00 EU CE%sT - --# Iceland --# See Africa/Abidjan. -- - # Italy -+# San Marino -+# Vatican City - # - # From Paul Eggert (2001-03-06): - # Sicily and Sardinia each had their own time zones from 1866 to 1893, -@@ -1712,13 +1743,6 @@ Zone Europe/Rome 0:49:56 - LMT 1866 Dec 12 - 1:00 C-Eur CE%sT 1944 Jun 4 - 1:00 Italy CE%sT 1980 - 1:00 EU CE%sT --Link Europe/Rome Europe/Vatican --Link Europe/Rome Europe/San_Marino -- -- --# Kosovo --# See Europe/Belgrade. -- - - # Latvia - -@@ -1802,10 +1826,6 @@ Zone Europe/Riga 1:36:34 - LMT 1880 - 2:00 - EET 2001 Jan 2 - 2:00 EU EE%sT - --# Liechtenstein --# See Europe/Zurich. -- -- - # Lithuania - - # From Paul Eggert (2016-03-18): -@@ -1858,12 +1878,6 @@ Zone Europe/Vilnius 1:41:16 - LMT 1880 - 2:00 - EET 2003 Jan 1 - 2:00 EU EE%sT - --# Luxembourg --# See Europe/Brussels. -- --# North Macedonia --# See Europe/Belgrade. -- - # Malta - # - # From Paul Eggert (2016-10-21): -@@ -1959,67 +1973,6 @@ Zone Europe/Chisinau 1:55:20 - LMT 1880 - # See Romania commentary for the guessed 1997 transition to EU rules. - 2:00 Moldova EE%sT - --# Monaco --# See Europe/Paris. -- --# Montenegro --# See Europe/Belgrade. -- --# Netherlands --# See Europe/Brussels. -- --# Norway --# See Europe/Berlin. -- --# Svalbard & Jan Mayen -- --# From Steffen Thorsen (2001-05-01): --# Although I could not find it explicitly, it seems that Jan Mayen and --# Svalbard have been using the same time as Norway at least since the --# time they were declared as parts of Norway. Svalbard was declared --# as a part of Norway by law of 1925-07-17 no 11, section 4 and Jan --# Mayen by law of 1930-02-27 no 2, section 2. (From --# and --# ). The law/regulation --# for normal/standard time in Norway is from 1894-06-29 no 1 (came --# into operation on 1895-01-01) and Svalbard/Jan Mayen seem to be a --# part of this law since 1925/1930. (From --# ) I have not been --# able to find if Jan Mayen used a different time zone (e.g. -0100) --# before 1930. Jan Mayen has only been "inhabited" since 1921 by --# Norwegian meteorologists and maybe used the same time as Norway ever --# since 1921. Svalbard (Arctic/Longyearbyen) has been inhabited since --# before 1895, and therefore probably changed the local time somewhere --# between 1895 and 1925 (inclusive). -- --# From Paul Eggert (2013-09-04): --# --# Actually, Jan Mayen was never occupied by Germany during World War II, --# so it must have diverged from Oslo time during the war, as Oslo was --# keeping Berlin time. --# --# says that the meteorologists --# burned down their station in 1940 and left the island, but returned in --# 1941 with a small Norwegian garrison and continued operations despite --# frequent air attacks from Germans. In 1943 the Americans established a --# radiolocating station on the island, called "Atlantic City". Possibly --# the UT offset changed during the war, but I think it unlikely that --# Jan Mayen used German daylight-saving rules. --# --# Svalbard is more complicated, as it was raided in August 1941 by an --# Allied party that evacuated the civilian population to England (says --# ). The Svalbard FAQ --# says that the Germans were --# expelled on 1942-05-14. However, small parties of Germans did return, --# and according to Wilhelm Dege's book "War North of 80" (1954) --# http://www.ucalgary.ca/UofC/departments/UP/1-55238/1-55238-110-2.html --# the German armed forces at the Svalbard weather station code-named --# Haudegen did not surrender to the Allies until September 1945. --# --# All these events predate our cutoff date of 1970, so use Europe/Berlin --# for these regions. -- -- - # Poland - - # The 1919 dates and times can be found in Tygodnik Urzędowy nr 1 (1919-03-20), -@@ -3301,11 +3254,13 @@ Zone Asia/Anadyr 11:49:56 - LMT 1924 May 2 - 11:00 Russia +11/+12 2011 Mar 27 2:00s - 12:00 - +12 - -- --# San Marino --# See Europe/Rome. -- -+# Bosnia & Herzegovina -+# Croatia -+# Kosovo -+# Montenegro -+# North Macedonia - # Serbia -+# Slovenia - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Europe/Belgrade 1:22:00 - LMT 1884 - 1:00 - CET 1941 Apr 18 23:00 -@@ -3317,17 +3272,6 @@ Zone Europe/Belgrade 1:22:00 - LMT 1884 - # Shanks & Pottenger don't give as much detail, so go with Koželj. - 1:00 - CET 1982 Nov 27 - 1:00 EU CE%sT --Link Europe/Belgrade Europe/Ljubljana # Slovenia --Link Europe/Belgrade Europe/Podgorica # Montenegro --Link Europe/Belgrade Europe/Sarajevo # Bosnia and Herzegovina --Link Europe/Belgrade Europe/Skopje # North Macedonia --Link Europe/Belgrade Europe/Zagreb # Croatia -- --# Slovakia --# See Europe/Prague. -- --# Slovenia --# See Europe/Belgrade. - - # Spain - # -@@ -3434,10 +3378,11 @@ Zone Atlantic/Canary -1:01:36 - LMT 1922 Mar # Las Palmas de Gran C. - # IATA SSIM (1996-09) says the Canaries switch at 2:00u, not 1:00u. - # Ignore this for now, as the Canaries are part of the EU. - --# Sweden --# See Europe/Berlin. - -+# Germany (Busingen enclave) -+# Liechtenstein - # Switzerland -+# - # From Howse: - # By the end of the 18th century clocks and watches became commonplace - # and their performance improved enormously. Communities began to keep -@@ -3550,9 +3495,6 @@ Zone Europe/Zurich 0:34:08 - LMT 1853 Jul 16 # See above comment. - 0:29:46 - BMT 1894 Jun # Bern Mean Time - 1:00 Swiss CE%sT 1981 - 1:00 EU CE%sT --Link Europe/Zurich Europe/Busingen --Link Europe/Zurich Europe/Vaduz -- - - # Turkey - -@@ -3757,7 +3699,6 @@ Zone Europe/Istanbul 1:55:52 - LMT 1880 - 2:00 1:00 EEST 2015 Nov 8 1:00u - 2:00 EU EE%sT 2016 Sep 7 - 3:00 - +03 --Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. - - # Ukraine - # -@@ -3860,9 +3801,6 @@ Zone Europe/Kyiv 2:02:04 - LMT 1880 - 2:00 C-Eur EE%sT 1996 May 13 - 2:00 EU EE%sT - --# Vatican City --# See Europe/Rome. -- - ############################################################################### - - # One source shows that Bulgaria, Cyprus, Finland, and Greece observe DST from -diff --git a/src/java.base/share/data/tzdata/northamerica b/src/java.base/share/data/tzdata/northamerica -index ce4ee74582c..465e8c234ed 100644 ---- a/src/java.base/share/data/tzdata/northamerica -+++ b/src/java.base/share/data/tzdata/northamerica -@@ -852,7 +852,6 @@ Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 19:00u - -7:00 - MST 1967 - -7:00 US M%sT 1968 Mar 21 - -7:00 - MST --Link America/Phoenix America/Creston - - # From Arthur David Olson (1988-02-13): - # A writer from the Inter Tribal Council of Arizona, Inc., -@@ -1626,23 +1625,6 @@ Zone America/Moncton -4:19:08 - LMT 1883 Dec 9 - - # Ontario - --# From Paul Eggert (2006-07-09): --# Shanks & Pottenger write that since 1970 most of Ontario has been like --# Toronto. --# Thunder Bay skipped DST in 1973. --# Many smaller locales did not observe peacetime DST until 1974; --# Nipigon (EST) and Rainy River (CST) are the largest that we know of. --# Far west Ontario is like Winnipeg; far east Quebec is like Halifax. -- --# From Jeffery Nichols (2020-02-06): --# According to the [Shanks] atlas, those western Ontario zones are huge, --# covering most of Ontario northwest of Sault Ste Marie and Timmins. --# The zones seem to include towns bigger than the ones they're named after, --# like Dryden in America/Rainy_River and Wawa (and maybe Attawapiskat) in --# America/Nipigon. I assume it's too much trouble to change the name of the --# zone (like when you found out that America/Glace_Bay includes Sydney, Nova --# Scotia).... -- - # From Mark Brader (2003-07-26): - # [According to the Toronto Star] Orillia, Ontario, adopted DST - # effective Saturday, 1912-06-22, 22:00; the article mentions that -@@ -1663,17 +1645,6 @@ Zone America/Moncton -4:19:08 - LMT 1883 Dec 9 - - # From Mark Brader (2010-03-06): - # --# Currently the database has: --# --# # Ontario --# --# # From Paul Eggert (2006-07-09): --# # Shanks & Pottenger write that since 1970 most of Ontario has been like --# # Toronto. --# # Thunder Bay skipped DST in 1973. --# # Many smaller locales did not observe peacetime DST until 1974; --# # Nipigon (EST) and Rainy River (CST) are the largest that we know of. --# - # In the (Toronto) Globe and Mail for Saturday, 1955-09-24, in the bottom - # right corner of page 1, it says that Toronto will return to standard - # time at 2 am Sunday morning (which agrees with the database), and that: -@@ -1681,10 +1652,8 @@ Zone America/Moncton -4:19:08 - LMT 1883 Dec 9 - # The one-hour setback will go into effect throughout most of Ontario, - # except in areas like Windsor which remains on standard time all year. - # --# Windsor is, of course, a lot larger than Nipigon. --# --# I only came across this incidentally. I don't know if Windsor began --# observing DST when Detroit did, or in 1974, or on some other date. -+# ... I don't know if Windsor began observing DST when Detroit did, -+# or in 1974, or on some other date. - # - # By the way, the article continues by noting that: - # -@@ -1766,23 +1735,7 @@ Rule Toronto 1951 1956 - Sep lastSun 2:00 0 S - # Toronto Star, which said that DST was ending 1971-10-31 as usual. - Rule Toronto 1957 1973 - Oct lastSun 2:00 0 S - --# From Paul Eggert (2003-07-27): --# Willett (1914-03) writes (p. 17) "In the Cities of Fort William, and --# Port Arthur, Ontario, the principle of the Bill has been in --# operation for the past three years, and in the City of Moose Jaw, --# Saskatchewan, for one year." -- --# From David Bryan via Tory Tronrud, Director/Curator, --# Thunder Bay Museum (2003-11-12): --# There is some suggestion, however, that, by-law or not, daylight --# savings time was being practiced in Fort William and Port Arthur --# before 1909.... [I]n 1910, the line between the Eastern and Central --# Time Zones was permanently moved about two hundred miles west to --# include the Thunder Bay area.... When Canada adopted daylight --# savings time in 1916, Fort William and Port Arthur, having done so --# already, did not change their clocks.... During the Second World --# War,... [t]he cities agreed to implement DST during the summer --# months for the remainder of the war years. -+# The Bahamas match Toronto since 1970. - - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone America/Toronto -5:17:32 - LMT 1895 -@@ -1791,22 +1744,6 @@ Zone America/Toronto -5:17:32 - LMT 1895 - -5:00 Canada E%sT 1946 - -5:00 Toronto E%sT 1974 - -5:00 Canada E%sT --Link America/Toronto America/Nassau --Zone America/Thunder_Bay -5:57:00 - LMT 1895 -- -6:00 - CST 1910 -- -5:00 - EST 1942 -- -5:00 Canada E%sT 1970 -- -5:00 Toronto E%sT 1973 -- -5:00 - EST 1974 -- -5:00 Canada E%sT --Zone America/Nipigon -5:53:04 - LMT 1895 -- -5:00 Canada E%sT 1940 Sep 29 -- -5:00 1:00 EDT 1942 Feb 9 2:00s -- -5:00 Canada E%sT --Zone America/Rainy_River -6:18:16 - LMT 1895 -- -6:00 Canada C%sT 1940 Sep 29 -- -6:00 1:00 CDT 1942 Feb 9 2:00s -- -6:00 Canada C%sT - # For Atikokan see America/Panama. - - -@@ -2639,6 +2576,12 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20 - # 5- The islands, reefs and keys shall take their timezone from the - # longitude they are located at. - -+# From Paul Eggert (2022-10-28): -+# The new Mexican law was published today: -+# https://www.dof.gob.mx/nota_detalle.php?codigo=5670045&fecha=28/10/2022 -+# This abolishes DST except where US DST rules are observed, -+# and in addition changes all of Chihuahua to -06 with no DST. -+ - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S - Rule Mexico 1931 only - May 1 23:00 1:00 D - Rule Mexico 1931 only - Oct 1 0:00 0 S -@@ -2654,8 +2597,8 @@ Rule Mexico 1996 2000 - Apr Sun>=1 2:00 1:00 D - Rule Mexico 1996 2000 - Oct lastSun 2:00 0 S - Rule Mexico 2001 only - May Sun>=1 2:00 1:00 D - Rule Mexico 2001 only - Sep lastSun 2:00 0 S --Rule Mexico 2002 max - Apr Sun>=1 2:00 1:00 D --Rule Mexico 2002 max - Oct lastSun 2:00 0 S -+Rule Mexico 2002 2022 - Apr Sun>=1 2:00 1:00 D -+Rule Mexico 2002 2022 - Oct lastSun 2:00 0 S - # Zone NAME STDOFF RULES FORMAT [UNTIL] - # Quintana Roo; represented by Cancún - Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 6:00u -@@ -2708,7 +2651,8 @@ Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 7:00u - -6:00 Mexico C%sT 1998 - -6:00 - CST 1998 Apr Sun>=1 3:00 - -7:00 Mexico M%sT 2010 -- -7:00 US M%sT -+ -7:00 US M%sT 2022 Oct 30 2:00 -+ -6:00 - CST - # Chihuahua (away from US border) - Zone America/Chihuahua -7:04:20 - LMT 1922 Jan 1 7:00u - -7:00 - MST 1927 Jun 10 23:00 -@@ -2717,7 +2661,8 @@ Zone America/Chihuahua -7:04:20 - LMT 1922 Jan 1 7:00u - -6:00 - CST 1996 - -6:00 Mexico C%sT 1998 - -6:00 - CST 1998 Apr Sun>=1 3:00 -- -7:00 Mexico M%sT -+ -7:00 Mexico M%sT 2022 Oct 30 2:00 -+ -6:00 - CST - # Sonora - Zone America/Hermosillo -7:23:52 - LMT 1922 Jan 1 7:00u - -7:00 - MST 1927 Jun 10 23:00 -@@ -2815,20 +2760,16 @@ Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 7:00u - # http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010 - # It has been moved to the 'backward' file. - # -+# From Paul Eggert (2022-10-28): -+# Today's new law states that the entire state of Baja California -+# follows US DST rules, which agrees with simplifications noted above. -+# - # - # Revillagigedo Is - # no information - - ############################################################################### - --# Anguilla --# Antigua and Barbuda --# See America/Puerto_Rico. -- --# The Bahamas --# See America/Toronto. -- -- - # Barbados - - # For 1899 Milne gives -3:58:29.2. -@@ -3041,12 +2982,6 @@ Zone Atlantic/Bermuda -4:19:18 - LMT 1890 # Hamilton - -4:00 Canada A%sT 1976 - -4:00 US A%sT - --# Caribbean Netherlands --# See America/Puerto_Rico. -- --# Cayman Is --# See America/Panama. -- - # Costa Rica - - # Milne gives -5:36:13.3 as San José mean time. -@@ -3272,9 +3207,6 @@ Zone America/Havana -5:29:28 - LMT 1890 - -5:29:36 - HMT 1925 Jul 19 12:00 # Havana MT - -5:00 Cuba C%sT - --# Dominica --# See America/Puerto_Rico. -- - # Dominican Republic - - # From Steffen Thorsen (2000-10-30): -@@ -3321,12 +3253,6 @@ Rule Salv 1987 1988 - Sep lastSun 0:00 0 S - Zone America/El_Salvador -5:56:48 - LMT 1921 # San Salvador - -6:00 Salv C%sT - --# Grenada --# Guadeloupe --# St Barthélemy --# St Martin (French part) --# See America/Puerto_Rico. -- - # Guatemala - # - # From Gwillim Law (2006-04-22), after a heads-up from Oscar van Vlijmen: -@@ -3512,9 +3438,6 @@ Zone America/Martinique -4:04:20 - LMT 1890 # Fort-de-France - -4:00 1:00 ADT 1980 Sep 28 - -4:00 - AST - --# Montserrat --# See America/Puerto_Rico. -- - # Nicaragua - # - # This uses Shanks & Pottenger for times before 2005. -@@ -3580,44 +3503,39 @@ Zone America/Managua -5:45:08 - LMT 1890 - -5:00 - EST 1997 - -6:00 Nic C%sT - -+# Cayman Is - # Panama -+# -+# Atikokan and Coral Harbour, Canada, match Panama since 1970. - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone America/Panama -5:18:08 - LMT 1890 - -5:19:36 - CMT 1908 Apr 22 # Colón Mean Time - -5:00 - EST --Link America/Panama America/Atikokan --Link America/Panama America/Cayman - -+# Anguilla -+# Antigua & Barbuda -+# Aruba -+# Caribbean Netherlands -+# Curaçao -+# Dominica -+# Grenada -+# Guadeloupe -+# Montserrat - # Puerto Rico -+# St Barthélemy -+# St Kitts-Nevis -+# Sint Maarten / St Martin -+# St Lucia -+# St Vincent & the Grenadines -+# Trinidad & Tobago -+# Virgin Is (UK & US) -+# - # There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'. - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12:00 # San Juan - -4:00 - AST 1942 May 3 - -4:00 US A%sT 1946 - -4:00 - AST --Link America/Puerto_Rico America/Anguilla --Link America/Puerto_Rico America/Antigua --Link America/Puerto_Rico America/Aruba --Link America/Puerto_Rico America/Curacao --Link America/Puerto_Rico America/Blanc-Sablon # Quebec (Lower North Shore) --Link America/Puerto_Rico America/Dominica --Link America/Puerto_Rico America/Grenada --Link America/Puerto_Rico America/Guadeloupe --Link America/Puerto_Rico America/Kralendijk # Caribbean Netherlands --Link America/Puerto_Rico America/Lower_Princes # Sint Maarten --Link America/Puerto_Rico America/Marigot # St Martin (French part) --Link America/Puerto_Rico America/Montserrat --Link America/Puerto_Rico America/Port_of_Spain # Trinidad & Tobago --Link America/Puerto_Rico America/St_Barthelemy # St Barthélemy --Link America/Puerto_Rico America/St_Kitts # St Kitts & Nevis --Link America/Puerto_Rico America/St_Lucia --Link America/Puerto_Rico America/St_Thomas # Virgin Islands (US) --Link America/Puerto_Rico America/St_Vincent --Link America/Puerto_Rico America/Tortola # Virgin Islands (UK) -- --# St Kitts-Nevis --# St Lucia --# See America/Puerto_Rico. - - # St Pierre and Miquelon - # There are too many St Pierres elsewhere, so we'll use 'Miquelon'. -@@ -3627,12 +3545,6 @@ Zone America/Miquelon -3:44:40 - LMT 1911 May 15 # St Pierre - -3:00 - -03 1987 - -3:00 Canada -03/-02 - --# St Vincent and the Grenadines --# See America/Puerto_Rico. -- --# Sint Maarten --# See America/Puerto_Rico. -- - # Turks and Caicos - # - # From Chris Dunn in -@@ -3702,11 +3614,6 @@ Zone America/Grand_Turk -4:44:32 - LMT 1890 - -4:00 - AST 2018 Mar 11 3:00 - -5:00 US E%sT - --# British Virgin Is --# US Virgin Is --# See America/Puerto_Rico. -- -- - # Local Variables: - # coding: utf-8 - # End: -diff --git a/src/java.base/share/data/tzdata/southamerica b/src/java.base/share/data/tzdata/southamerica -index 3c0e0e2061c..982ad09c408 100644 ---- a/src/java.base/share/data/tzdata/southamerica -+++ b/src/java.base/share/data/tzdata/southamerica -@@ -608,9 +608,6 @@ Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31 - -3:00 Arg -03/-02 2008 Oct 18 - -3:00 - -03 - --# Aruba --# See America/Puerto_Rico. -- - # Bolivia - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone America/La_Paz -4:32:36 - LMT 1890 -@@ -1455,15 +1452,6 @@ Zone America/Bogota -4:56:16 - LMT 1884 Mar 13 - # Malpelo, Providencia, San Andres - # no information; probably like America/Bogota - --# Curaçao --# See America/Puerto_Rico. --# --# From Arthur David Olson (2011-06-15): --# use links for places with new iso3166 codes. --# The name "Lower Prince's Quarter" is both longer than fourteen characters --# and contains an apostrophe; use "Lower_Princes".... --# From Paul Eggert (2021-09-29): --# These backward-compatibility links now are in the 'northamerica' file. - - # Ecuador - # -@@ -1779,9 +1767,6 @@ Zone America/Paramaribo -3:40:40 - LMT 1911 - -3:30 - -0330 1984 Oct - -3:00 - -03 - --# Trinidad and Tobago --# See America/Puerto_Rico. -- - # Uruguay - # From Paul Eggert (1993-11-18): - # Uruguay wins the prize for the strangest peacetime manipulation of the rules. -diff --git a/src/java.base/share/data/tzdata/zone.tab b/src/java.base/share/data/tzdata/zone.tab -index ee025196e50..535d1c94af1 100644 ---- a/src/java.base/share/data/tzdata/zone.tab -+++ b/src/java.base/share/data/tzdata/zone.tab -@@ -137,13 +137,10 @@ CA +4606-06447 America/Moncton Atlantic - New Brunswick - CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most areas) - CA +5125-05707 America/Blanc-Sablon AST - QC (Lower North Shore) - CA +4339-07923 America/Toronto Eastern - ON, QC (most areas) --CA +4901-08816 America/Nipigon Eastern - ON, QC (no DST 1967-73) --CA +4823-08915 America/Thunder_Bay Eastern - ON (Thunder Bay) - CA +6344-06828 America/Iqaluit Eastern - NU (most east areas) - CA +6608-06544 America/Pangnirtung Eastern - NU (Pangnirtung) - CA +484531-0913718 America/Atikokan EST - ON (Atikokan); NU (Coral H) - CA +4953-09709 America/Winnipeg Central - ON (west); Manitoba --CA +4843-09434 America/Rainy_River Central - ON (Rainy R, Ft Frances) - CA +744144-0944945 America/Resolute Central - NU (Resolute) - CA +624900-0920459 America/Rankin_Inlet Central - NU (central) - CA +5024-10439 America/Regina CST - SK (most areas) -diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java -index f007c1a8d3b..08550acd037 100644 ---- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java -+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -427,7 +427,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle { - "Franz\u00f6sisch-Guiana Sommerzeit", "GFST", - "Franz\u00F6sisch-Guiana Zeit", "GFT"}}, - {"America/Cayman", EST}, -- {"America/Chihuahua", MST}, -+ {"America/Chihuahua", CST}, - {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, -@@ -516,7 +516,7 @@ public final class TimeZoneNames_de extends TimeZoneNamesBundle { - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Nuuk", WGT}, -- {"America/Ojinaga", MST}, -+ {"America/Ojinaga", CST}, - {"America/Panama", EST}, - {"America/Pangnirtung", EST}, - {"America/Paramaribo", new String[] {"Suriname Zeit", "SRT", -diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java -index 386414e16e6..a12dedb94e9 100644 ---- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java -+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -427,7 +427,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle { - "Hora de verano de la Guayana Francesa", "GFST", - "Hora de la Guayana Francesa", "GFT"}}, - {"America/Cayman", EST}, -- {"America/Chihuahua", MST}, -+ {"America/Chihuahua", CST}, - {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, -@@ -516,7 +516,7 @@ public final class TimeZoneNames_es extends TimeZoneNamesBundle { - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Nuuk", WGT}, -- {"America/Ojinaga", MST}, -+ {"America/Ojinaga", CST}, - {"America/Panama", EST}, - {"America/Pangnirtung", EST}, - {"America/Paramaribo", new String[] {"Hora de Surinam", "SRT", -diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java -index d23f5fd49e6..f2064397e5e 100644 ---- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java -+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -427,7 +427,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle { - "Heure d'\u00e9t\u00e9 de Guyane fran\u00e7aise", "GFST", - "Heure de Guyane fran\u00E7aise", "GFT"}}, - {"America/Cayman", EST}, -- {"America/Chihuahua", MST}, -+ {"America/Chihuahua", CST}, - {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, -@@ -516,7 +516,7 @@ public final class TimeZoneNames_fr extends TimeZoneNamesBundle { - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Nuuk", WGT}, -- {"America/Ojinaga", MST}, -+ {"America/Ojinaga", CST}, - {"America/Panama", EST}, - {"America/Pangnirtung", EST}, - {"America/Paramaribo", new String[] {"Heure du Surinam", "SRT", -diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java -index b4f57d4568c..b7fb55286f7 100644 ---- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java -+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -427,7 +427,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle { - "Ora estiva della Guyana Francese", "GFST", - "Ora della Guyana Francese", "GFT"}}, - {"America/Cayman", EST}, -- {"America/Chihuahua", MST}, -+ {"America/Chihuahua", CST}, - {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, -@@ -516,7 +516,7 @@ public final class TimeZoneNames_it extends TimeZoneNamesBundle { - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Nuuk", WGT}, -- {"America/Ojinaga", MST}, -+ {"America/Ojinaga", CST}, - {"America/Panama", EST}, - {"America/Pangnirtung", EST}, - {"America/Paramaribo", new String[] {"Ora di Suriname", "SRT", -diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java -index 1a10a9f96dc..3ccf8c2514c 100644 ---- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java -+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -427,7 +427,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle { - "\u4ecf\u9818\u30ae\u30a2\u30ca\u590f\u6642\u9593", "GFST", - "\u30D5\u30E9\u30F3\u30B9\u9818\u30AE\u30A2\u30CA\u6642\u9593", "GFT"}}, - {"America/Cayman", EST}, -- {"America/Chihuahua", MST}, -+ {"America/Chihuahua", CST}, - {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, -@@ -516,7 +516,7 @@ public final class TimeZoneNames_ja extends TimeZoneNamesBundle { - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Nuuk", WGT}, -- {"America/Ojinaga", MST}, -+ {"America/Ojinaga", CST}, - {"America/Panama", EST}, - {"America/Pangnirtung", EST}, - {"America/Paramaribo", new String[] {"\u30b9\u30ea\u30ca\u30e0\u6642\u9593", "SRT", -diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java -index 9a2d9e5c57c..9bf7c119d52 100644 ---- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java -+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -427,7 +427,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle { - "\ud504\ub791\uc2a4\ub839 \uae30\uc544\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GFST", - "\uD504\uB791\uC2A4\uB839 \uAE30\uC544\uB098 \uD45C\uC900\uC2DC", "GFT"}}, - {"America/Cayman", EST}, -- {"America/Chihuahua", MST}, -+ {"America/Chihuahua", CST}, - {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, -@@ -516,7 +516,7 @@ public final class TimeZoneNames_ko extends TimeZoneNamesBundle { - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Nuuk", WGT}, -- {"America/Ojinaga", MST}, -+ {"America/Ojinaga", CST}, - {"America/Panama", EST}, - {"America/Pangnirtung", EST}, - {"America/Paramaribo", new String[] {"\uc218\ub9ac\ub0a8 \uc2dc\uac04", "SRT", -diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java -index de5e5c82daa..c0cae47bd97 100644 ---- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java -+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -427,7 +427,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle { - "Fuso hor\u00e1rio de ver\u00e3o da Guiana Francesa", "GFST", - "Hor\u00E1rio da Guiana Francesa", "GFT"}}, - {"America/Cayman", EST}, -- {"America/Chihuahua", MST}, -+ {"America/Chihuahua", CST}, - {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, -@@ -516,7 +516,7 @@ public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle { - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Nuuk", WGT}, -- {"America/Ojinaga", MST}, -+ {"America/Ojinaga", CST}, - {"America/Panama", EST}, - {"America/Pangnirtung", EST}, - {"America/Paramaribo", new String[] {"Fuso hor\u00e1rio do Suriname", "SRT", -diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java -index b53de4d8c89..afcdcd348bf 100644 ---- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java -+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -427,7 +427,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle { - "Franska Guyana, sommartid", "GFST", - "Franska Guyana-tid", "GFT"}}, - {"America/Cayman", EST}, -- {"America/Chihuahua", MST}, -+ {"America/Chihuahua", CST}, - {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, -@@ -516,7 +516,7 @@ public final class TimeZoneNames_sv extends TimeZoneNamesBundle { - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Nuuk", WGT}, -- {"America/Ojinaga", MST}, -+ {"America/Ojinaga", CST}, - {"America/Panama", EST}, - {"America/Pangnirtung", EST}, - {"America/Paramaribo", new String[] {"Surinam, normaltid", "SRT", -diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java -index 7797cda19d5..e6328ee8347 100644 ---- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java -+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -427,7 +427,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle { - "\u6cd5\u5c5e\u572d\u4e9a\u90a3\u590f\u4ee4\u65f6", "GFST", - "\u6CD5\u5C5E\u572D\u4E9A\u90A3\u65F6\u95F4", "GFT"}}, - {"America/Cayman", EST}, -- {"America/Chihuahua", MST}, -+ {"America/Chihuahua", CST}, - {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, -@@ -516,7 +516,7 @@ public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle { - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Nuuk", WGT}, -- {"America/Ojinaga", MST}, -+ {"America/Ojinaga", CST}, - {"America/Panama", EST}, - {"America/Pangnirtung", EST}, - {"America/Paramaribo", new String[] {"\u82cf\u5229\u5357\u65f6\u95f4", "SRT", -diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java -index 2cd10554853..236959b8a69 100644 ---- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java -+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -427,7 +427,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle { - "\u6cd5\u5c6c\u572d\u4e9e\u90a3\u590f\u4ee4\u6642\u9593", "GFST", - "\u6CD5\u5C6C\u572D\u4E9E\u90A3\u6642\u9593", "GFT"}}, - {"America/Cayman", EST}, -- {"America/Chihuahua", MST}, -+ {"America/Chihuahua", CST}, - {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, -@@ -516,7 +516,7 @@ public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle { - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Nuuk", WGT}, -- {"America/Ojinaga", MST}, -+ {"America/Ojinaga", CST}, - {"America/Panama", EST}, - {"America/Pangnirtung", EST}, - {"America/Paramaribo", new String[] {"\u8607\u5229\u5357\u6642\u9593", "SRT", -diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION -index 0cad939008f..f29d2d938b1 100644 ---- a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION -+++ b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION -@@ -1 +1 @@ --tzdata2022e -+tzdata2022f -diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt b/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt -index e3ce742f887..24cec5af700 100644 ---- a/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt -+++ b/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt -@@ -1,158 +1,7 @@ --Link Africa/Abidjan Africa/Accra # Ghana --Link Africa/Abidjan Africa/Bamako # Mali --Link Africa/Abidjan Africa/Banjul # The Gambia --Link Africa/Abidjan Africa/Conakry # Guinea --Link Africa/Abidjan Africa/Dakar # Senegal --Link Africa/Abidjan Africa/Freetown # Sierra Leone --Link Africa/Abidjan Africa/Lome # Togo --Link Africa/Abidjan Africa/Nouakchott # Mauritania --Link Africa/Abidjan Africa/Ouagadougou # Burkina Faso --Link Africa/Abidjan Atlantic/Reykjavik # Iceland --Link Africa/Abidjan Atlantic/St_Helena # St Helena --Link Africa/Nairobi Africa/Addis_Ababa # Ethiopia --Link Africa/Nairobi Africa/Asmara # Eritrea --Link Africa/Nairobi Africa/Dar_es_Salaam # Tanzania --Link Africa/Nairobi Africa/Djibouti --Link Africa/Nairobi Africa/Kampala # Uganda --Link Africa/Nairobi Africa/Mogadishu # Somalia --Link Africa/Nairobi Indian/Antananarivo # Madagascar --Link Africa/Nairobi Indian/Comoro --Link Africa/Nairobi Indian/Mayotte --Link Africa/Maputo Africa/Blantyre # Malawi --Link Africa/Maputo Africa/Bujumbura # Burundi --Link Africa/Maputo Africa/Gaborone # Botswana --Link Africa/Maputo Africa/Harare # Zimbabwe --Link Africa/Maputo Africa/Kigali # Rwanda --Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo --Link Africa/Maputo Africa/Lusaka # Zambia --Link Africa/Lagos Africa/Bangui # Central African Republic --Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo --Link Africa/Lagos Africa/Douala # Cameroon --Link Africa/Lagos Africa/Kinshasa # Dem. Rep. of the Congo (west) --Link Africa/Lagos Africa/Libreville # Gabon --Link Africa/Lagos Africa/Luanda # Angola --Link Africa/Lagos Africa/Malabo # Equatorial Guinea --Link Africa/Lagos Africa/Niamey # Niger --Link Africa/Lagos Africa/Porto-Novo # Benin --Link Africa/Johannesburg Africa/Maseru # Lesotho --Link Africa/Johannesburg Africa/Mbabane # Eswatini --Link Asia/Yangon Indian/Cocos --Link Asia/Urumqi Antarctica/Vostok --Link Asia/Nicosia Europe/Nicosia --Link Asia/Kuching Asia/Brunei --Link Indian/Maldives Indian/Kerguelen --Link Asia/Qatar Asia/Bahrain --Link Asia/Riyadh Antarctica/Syowa --Link Asia/Riyadh Asia/Aden # Yemen --Link Asia/Riyadh Asia/Kuwait --Link Asia/Singapore Asia/Kuala_Lumpur --Link Asia/Bangkok Asia/Phnom_Penh # Cambodia --Link Asia/Bangkok Asia/Vientiane # Laos --Link Asia/Bangkok Indian/Christmas --Link Asia/Dubai Asia/Muscat # Oman --Link Asia/Dubai Indian/Mahe --Link Asia/Dubai Indian/Reunion --Link Pacific/Guam Pacific/Saipan # N Mariana Is --Link Pacific/Tarawa Pacific/Funafuti --Link Pacific/Tarawa Pacific/Majuro --Link Pacific/Tarawa Pacific/Wake --Link Pacific/Tarawa Pacific/Wallis --Link Pacific/Auckland Antarctica/McMurdo --Link Pacific/Port_Moresby Antarctica/DumontDUrville --Link Pacific/Port_Moresby Pacific/Chuuk --Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands --Link Pacific/Guadalcanal Pacific/Pohnpei --Link Europe/London Europe/Jersey --Link Europe/London Europe/Guernsey --Link Europe/London Europe/Isle_of_Man --Link Europe/Brussels Europe/Amsterdam --Link Europe/Brussels Europe/Luxembourg --Link Europe/Prague Europe/Bratislava --Link Europe/Helsinki Europe/Mariehamn --Link Europe/Paris Europe/Monaco --Link Europe/Berlin Arctic/Longyearbyen --Link Europe/Berlin Europe/Copenhagen --Link Europe/Berlin Europe/Oslo --Link Europe/Berlin Europe/Stockholm --Link Europe/Rome Europe/Vatican --Link Europe/Rome Europe/San_Marino --Link Europe/Belgrade Europe/Ljubljana # Slovenia --Link Europe/Belgrade Europe/Podgorica # Montenegro --Link Europe/Belgrade Europe/Sarajevo # Bosnia and Herzegovina --Link Europe/Belgrade Europe/Skopje # North Macedonia --Link Europe/Belgrade Europe/Zagreb # Croatia --Link Europe/Zurich Europe/Busingen --Link Europe/Zurich Europe/Vaduz --Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. --Link America/Phoenix America/Creston --Link America/Toronto America/Nassau --Link America/Panama America/Atikokan --Link America/Panama America/Cayman --Link America/Puerto_Rico America/Anguilla --Link America/Puerto_Rico America/Antigua --Link America/Puerto_Rico America/Aruba --Link America/Puerto_Rico America/Curacao --Link America/Puerto_Rico America/Blanc-Sablon # Quebec (Lower North Shore) --Link America/Puerto_Rico America/Dominica --Link America/Puerto_Rico America/Grenada --Link America/Puerto_Rico America/Guadeloupe --Link America/Puerto_Rico America/Kralendijk # Caribbean Netherlands --Link America/Puerto_Rico America/Lower_Princes # Sint Maarten --Link America/Puerto_Rico America/Marigot # St Martin (French part) --Link America/Puerto_Rico America/Montserrat --Link America/Puerto_Rico America/Port_of_Spain # Trinidad & Tobago --Link America/Puerto_Rico America/St_Barthelemy # St Barthélemy --Link America/Puerto_Rico America/St_Kitts # St Kitts & Nevis --Link America/Puerto_Rico America/St_Lucia --Link America/Puerto_Rico America/St_Thomas # Virgin Islands (US) --Link America/Puerto_Rico America/St_Vincent --Link America/Puerto_Rico America/Tortola # Virgin Islands (UK) - Link Asia/Riyadh87 Mideast/Riyadh87 - Link Asia/Riyadh88 Mideast/Riyadh88 - Link Asia/Riyadh89 Mideast/Riyadh89 --Link Africa/Nairobi Africa/Asmera --Link Africa/Abidjan Africa/Timbuktu --Link America/Argentina/Catamarca America/Argentina/ComodRivadavia --Link America/Adak America/Atka --Link America/Argentina/Buenos_Aires America/Buenos_Aires --Link America/Argentina/Catamarca America/Catamarca --Link America/Panama America/Coral_Harbour --Link America/Argentina/Cordoba America/Cordoba --Link America/Tijuana America/Ensenada --Link America/Indiana/Indianapolis America/Fort_Wayne --Link America/Nuuk America/Godthab --Link America/Indiana/Indianapolis America/Indianapolis --Link America/Argentina/Jujuy America/Jujuy --Link America/Indiana/Knox America/Knox_IN --Link America/Kentucky/Louisville America/Louisville --Link America/Argentina/Mendoza America/Mendoza --Link America/Toronto America/Montreal --Link America/Rio_Branco America/Porto_Acre --Link America/Argentina/Cordoba America/Rosario --Link America/Tijuana America/Santa_Isabel --Link America/Denver America/Shiprock --Link America/Puerto_Rico America/Virgin --Link Pacific/Auckland Antarctica/South_Pole --Link Asia/Ashgabat Asia/Ashkhabad --Link Asia/Kolkata Asia/Calcutta --Link Asia/Shanghai Asia/Chongqing --Link Asia/Shanghai Asia/Chungking --Link Asia/Dhaka Asia/Dacca --Link Asia/Shanghai Asia/Harbin --Link Asia/Urumqi Asia/Kashgar --Link Asia/Kathmandu Asia/Katmandu --Link Asia/Macau Asia/Macao --Link Asia/Yangon Asia/Rangoon --Link Asia/Ho_Chi_Minh Asia/Saigon --Link Asia/Jerusalem Asia/Tel_Aviv --Link Asia/Thimphu Asia/Thimbu --Link Asia/Makassar Asia/Ujung_Pandang --Link Asia/Ulaanbaatar Asia/Ulan_Bator --Link Atlantic/Faroe Atlantic/Faeroe --Link Europe/Berlin Atlantic/Jan_Mayen --Link Australia/Sydney Australia/ACT --Link Australia/Sydney Australia/Canberra --Link Australia/Hobart Australia/Currie -+Link Australia/Sydney Australia/ACT #= Australia/Canberra - Link Australia/Lord_Howe Australia/LHI - Link Australia/Sydney Australia/NSW - Link Australia/Darwin Australia/North -@@ -162,7 +11,7 @@ Link Australia/Hobart Australia/Tasmania - Link Australia/Melbourne Australia/Victoria - Link Australia/Perth Australia/West - Link Australia/Broken_Hill Australia/Yancowinna --Link America/Rio_Branco Brazil/Acre -+Link America/Rio_Branco Brazil/Acre #= America/Porto_Acre - Link America/Noronha Brazil/DeNoronha - Link America/Sao_Paulo Brazil/East - Link America/Manaus Brazil/West -@@ -179,12 +28,13 @@ Link Pacific/Easter Chile/EasterIsland - Link America/Havana Cuba - Link Africa/Cairo Egypt - Link Europe/Dublin Eire -+Link Etc/GMT Etc/GMT+0 -+Link Etc/GMT Etc/GMT-0 -+Link Etc/GMT Etc/GMT0 -+Link Etc/GMT Etc/Greenwich - Link Etc/UTC Etc/UCT --Link Europe/London Europe/Belfast --Link Europe/Kyiv Europe/Kiev --Link Europe/Chisinau Europe/Tiraspol --Link Europe/Kyiv Europe/Uzhgorod --Link Europe/Kyiv Europe/Zaporozhye -+Link Etc/UTC Etc/Universal -+Link Etc/UTC Etc/Zulu - Link Europe/London GB - Link Europe/London GB-Eire - Link Etc/GMT GMT+0 -@@ -192,7 +42,7 @@ Link Etc/GMT GMT-0 - Link Etc/GMT GMT0 - Link Etc/GMT Greenwich - Link Asia/Hong_Kong Hongkong --Link Africa/Abidjan Iceland -+Link Africa/Abidjan Iceland #= Atlantic/Reykjavik - Link Asia/Tehran Iran - Link Asia/Jerusalem Israel - Link America/Jamaica Jamaica -@@ -204,14 +54,8 @@ Link America/Mazatlan Mexico/BajaSur - Link America/Mexico_City Mexico/General - Link Pacific/Auckland NZ - Link Pacific/Chatham NZ-CHAT --Link America/Denver Navajo -+Link America/Denver Navajo #= America/Shiprock - Link Asia/Shanghai PRC --Link Pacific/Kanton Pacific/Enderbury --Link Pacific/Honolulu Pacific/Johnston --Link Pacific/Guadalcanal Pacific/Ponape --Link Pacific/Pago_Pago Pacific/Samoa --Link Pacific/Port_Moresby Pacific/Truk --Link Pacific/Port_Moresby Pacific/Yap - Link Europe/Warsaw Poland - Link Europe/Lisbon Portugal - Link Asia/Taipei ROC -@@ -235,3 +79,168 @@ Link Etc/UTC UTC - Link Etc/UTC Universal - Link Europe/Moscow W-SU - Link Etc/UTC Zulu -+Link America/Argentina/Buenos_Aires America/Buenos_Aires -+Link America/Argentina/Catamarca America/Catamarca -+Link America/Argentina/Cordoba America/Cordoba -+Link America/Indiana/Indianapolis America/Indianapolis -+Link America/Argentina/Jujuy America/Jujuy -+Link America/Indiana/Knox America/Knox_IN -+Link America/Kentucky/Louisville America/Louisville -+Link America/Argentina/Mendoza America/Mendoza -+Link America/Puerto_Rico America/Virgin #= America/St_Thomas -+Link Pacific/Pago_Pago Pacific/Samoa -+Link Africa/Abidjan Africa/Accra -+Link Africa/Nairobi Africa/Addis_Ababa -+Link Africa/Nairobi Africa/Asmara -+Link Africa/Abidjan Africa/Bamako -+Link Africa/Lagos Africa/Bangui -+Link Africa/Abidjan Africa/Banjul -+Link Africa/Maputo Africa/Blantyre -+Link Africa/Lagos Africa/Brazzaville -+Link Africa/Maputo Africa/Bujumbura -+Link Africa/Abidjan Africa/Conakry -+Link Africa/Abidjan Africa/Dakar -+Link Africa/Nairobi Africa/Dar_es_Salaam -+Link Africa/Nairobi Africa/Djibouti -+Link Africa/Lagos Africa/Douala -+Link Africa/Abidjan Africa/Freetown -+Link Africa/Maputo Africa/Gaborone -+Link Africa/Maputo Africa/Harare -+Link Africa/Nairobi Africa/Kampala -+Link Africa/Maputo Africa/Kigali -+Link Africa/Lagos Africa/Kinshasa -+Link Africa/Lagos Africa/Libreville -+Link Africa/Abidjan Africa/Lome -+Link Africa/Lagos Africa/Luanda -+Link Africa/Maputo Africa/Lubumbashi -+Link Africa/Maputo Africa/Lusaka -+Link Africa/Lagos Africa/Malabo -+Link Africa/Johannesburg Africa/Maseru -+Link Africa/Johannesburg Africa/Mbabane -+Link Africa/Nairobi Africa/Mogadishu -+Link Africa/Lagos Africa/Niamey -+Link Africa/Abidjan Africa/Nouakchott -+Link Africa/Abidjan Africa/Ouagadougou -+Link Africa/Lagos Africa/Porto-Novo -+Link America/Puerto_Rico America/Anguilla -+Link America/Puerto_Rico America/Antigua -+Link America/Puerto_Rico America/Aruba -+Link America/Panama America/Atikokan -+Link America/Puerto_Rico America/Blanc-Sablon -+Link America/Panama America/Cayman -+Link America/Phoenix America/Creston -+Link America/Puerto_Rico America/Curacao -+Link America/Puerto_Rico America/Dominica -+Link America/Puerto_Rico America/Grenada -+Link America/Puerto_Rico America/Guadeloupe -+Link America/Puerto_Rico America/Kralendijk -+Link America/Puerto_Rico America/Lower_Princes -+Link America/Puerto_Rico America/Marigot -+Link America/Puerto_Rico America/Montserrat -+Link America/Toronto America/Nassau -+Link America/Puerto_Rico America/Port_of_Spain -+Link America/Puerto_Rico America/St_Barthelemy -+Link America/Puerto_Rico America/St_Kitts -+Link America/Puerto_Rico America/St_Lucia -+Link America/Puerto_Rico America/St_Thomas -+Link America/Puerto_Rico America/St_Vincent -+Link America/Puerto_Rico America/Tortola -+Link Pacific/Port_Moresby Antarctica/DumontDUrville -+Link Pacific/Auckland Antarctica/McMurdo -+Link Asia/Riyadh Antarctica/Syowa -+Link Asia/Urumqi Antarctica/Vostok -+Link Europe/Berlin Arctic/Longyearbyen -+Link Asia/Riyadh Asia/Aden -+Link Asia/Qatar Asia/Bahrain -+Link Asia/Kuching Asia/Brunei -+Link Asia/Singapore Asia/Kuala_Lumpur -+Link Asia/Riyadh Asia/Kuwait -+Link Asia/Dubai Asia/Muscat -+Link Asia/Bangkok Asia/Phnom_Penh -+Link Asia/Bangkok Asia/Vientiane -+Link Africa/Abidjan Atlantic/Reykjavik -+Link Africa/Abidjan Atlantic/St_Helena -+Link Europe/Brussels Europe/Amsterdam -+Link Europe/Prague Europe/Bratislava -+Link Europe/Zurich Europe/Busingen -+Link Europe/Berlin Europe/Copenhagen -+Link Europe/London Europe/Guernsey -+Link Europe/London Europe/Isle_of_Man -+Link Europe/London Europe/Jersey -+Link Europe/Belgrade Europe/Ljubljana -+Link Europe/Brussels Europe/Luxembourg -+Link Europe/Helsinki Europe/Mariehamn -+Link Europe/Paris Europe/Monaco -+Link Europe/Berlin Europe/Oslo -+Link Europe/Belgrade Europe/Podgorica -+Link Europe/Rome Europe/San_Marino -+Link Europe/Belgrade Europe/Sarajevo -+Link Europe/Belgrade Europe/Skopje -+Link Europe/Berlin Europe/Stockholm -+Link Europe/Zurich Europe/Vaduz -+Link Europe/Rome Europe/Vatican -+Link Europe/Belgrade Europe/Zagreb -+Link Africa/Nairobi Indian/Antananarivo -+Link Asia/Bangkok Indian/Christmas -+Link Asia/Yangon Indian/Cocos -+Link Africa/Nairobi Indian/Comoro -+Link Indian/Maldives Indian/Kerguelen -+Link Asia/Dubai Indian/Mahe -+Link Africa/Nairobi Indian/Mayotte -+Link Asia/Dubai Indian/Reunion -+Link Pacific/Port_Moresby Pacific/Chuuk -+Link Pacific/Tarawa Pacific/Funafuti -+Link Pacific/Tarawa Pacific/Majuro -+Link Pacific/Pago_Pago Pacific/Midway -+Link Pacific/Guadalcanal Pacific/Pohnpei -+Link Pacific/Guam Pacific/Saipan -+Link Pacific/Tarawa Pacific/Wake -+Link Pacific/Tarawa Pacific/Wallis -+Link Africa/Abidjan Africa/Timbuktu -+Link America/Argentina/Catamarca America/Argentina/ComodRivadavia -+Link America/Adak America/Atka -+Link America/Panama America/Coral_Harbour -+Link America/Tijuana America/Ensenada -+Link America/Indiana/Indianapolis America/Fort_Wayne -+Link America/Toronto America/Montreal -+Link America/Toronto America/Nipigon -+Link America/Rio_Branco America/Porto_Acre -+Link America/Winnipeg America/Rainy_River -+Link America/Argentina/Cordoba America/Rosario -+Link America/Tijuana America/Santa_Isabel -+Link America/Denver America/Shiprock -+Link America/Toronto America/Thunder_Bay -+Link Pacific/Auckland Antarctica/South_Pole -+Link Asia/Shanghai Asia/Chongqing -+Link Asia/Shanghai Asia/Harbin -+Link Asia/Urumqi Asia/Kashgar -+Link Asia/Jerusalem Asia/Tel_Aviv -+Link Europe/Berlin Atlantic/Jan_Mayen -+Link Australia/Sydney Australia/Canberra -+Link Australia/Hobart Australia/Currie -+Link Europe/London Europe/Belfast -+Link Europe/Chisinau Europe/Tiraspol -+Link Europe/Kyiv Europe/Uzhgorod -+Link Europe/Kyiv Europe/Zaporozhye -+Link Pacific/Kanton Pacific/Enderbury -+Link Pacific/Honolulu Pacific/Johnston -+Link Pacific/Port_Moresby Pacific/Yap -+Link Africa/Nairobi Africa/Asmera #= Africa/Asmara -+Link America/Nuuk America/Godthab -+Link Asia/Ashgabat Asia/Ashkhabad -+Link Asia/Kolkata Asia/Calcutta -+Link Asia/Shanghai Asia/Chungking #= Asia/Chongqing -+Link Asia/Dhaka Asia/Dacca -+Link Europe/Istanbul Asia/Istanbul -+Link Asia/Kathmandu Asia/Katmandu -+Link Asia/Macau Asia/Macao -+Link Asia/Yangon Asia/Rangoon -+Link Asia/Ho_Chi_Minh Asia/Saigon -+Link Asia/Thimphu Asia/Thimbu -+Link Asia/Makassar Asia/Ujung_Pandang -+Link Asia/Ulaanbaatar Asia/Ulan_Bator -+Link Atlantic/Faroe Atlantic/Faeroe -+Link Europe/Kyiv Europe/Kiev -+Link Asia/Nicosia Europe/Nicosia -+Link Pacific/Guadalcanal Pacific/Ponape #= Pacific/Pohnpei -+Link Pacific/Port_Moresby Pacific/Truk #= Pacific/Chuuk -diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt -index 2f2786f1c69..a1cd41d283d 100644 ---- a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt -+++ b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt -@@ -24,7 +24,7 @@ America/Boise MST MDT - America/Cambridge_Bay MST MDT - America/Cancun EST - America/Chicago CST CDT --America/Chihuahua MST MDT -+America/Chihuahua CST - America/Costa_Rica CST CDT - America/Danmarkshavn GMT - America/Dawson MST -@@ -67,18 +67,16 @@ America/Mexico_City CST CDT - America/Moncton AST ADT - America/Monterrey CST CDT - America/New_York EST EDT --America/Nipigon EST EDT - America/Nome AKST AKDT - America/North_Dakota/Beulah CST CDT - America/North_Dakota/Center CST CDT - America/North_Dakota/New_Salem CST CDT --America/Ojinaga MST MDT -+America/Ojinaga CST - America/Panama EST - America/Pangnirtung EST EDT - America/Phoenix MST - America/Port-au-Prince EST EDT - America/Puerto_Rico AST --America/Rainy_River CST CDT - America/Rankin_Inlet CST CDT - America/Regina CST - America/Resolute CST CDT -@@ -88,7 +86,6 @@ America/St_Johns NST NDT - America/Swift_Current CST - America/Tegucigalpa CST CDT - America/Thule AST ADT --America/Thunder_Bay EST EDT - America/Tijuana PST PDT - America/Toronto EST EDT - America/Vancouver PST PDT diff --git a/jdk8296239-iso4217_up174.patch b/jdk8296239-iso4217_up174.patch new file mode 100644 index 0000000..00f6d7c --- /dev/null +++ b/jdk8296239-iso4217_up174.patch @@ -0,0 +1,79 @@ +commit bf899de7aa8cc862ed123865b9aa26e06d96a7de +Author: duke +Date: Thu Jan 26 00:55:32 2023 +0000 + + Backport fd837649811c866c144c9133d211fb5ad8f994a7 + +diff --git a/src/java.base/share/data/currency/CurrencyData.properties b/src/java.base/share/data/currency/CurrencyData.properties +index 688de592c7b..d234c96c476 100644 +--- a/src/java.base/share/data/currency/CurrencyData.properties ++++ b/src/java.base/share/data/currency/CurrencyData.properties +@@ -32,7 +32,7 @@ formatVersion=3 + # Version of the currency code information in this class. + # It is a serial number that accompanies with each amendment. + +-dataVersion=173 ++dataVersion=174 + + # List of all valid ISO 4217 currency codes. + # To ensure compatibility, do not remove codes. +@@ -189,7 +189,7 @@ CR=CRC + # COTE D'IVOIRE + CI=XOF + # CROATIA +-HR=HRK ++HR=HRK;2022-12-31-23-00-00;EUR + # CUBA + CU=CUP + # Cura\u00e7ao +diff --git a/test/jdk/java/util/Currency/ValidateISO4217.java b/test/jdk/java/util/Currency/ValidateISO4217.java +index b7e64f318b1..b6a91835b19 100644 +--- a/test/jdk/java/util/Currency/ValidateISO4217.java ++++ b/test/jdk/java/util/Currency/ValidateISO4217.java +@@ -24,7 +24,7 @@ + * @test + * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759 + * 8039317 8074350 8074351 8145952 8187946 8193552 8202026 8204269 +- * 8208746 8209775 8264792 8274658 8283277 ++ * 8208746 8209775 8264792 8274658 8283277 8296239 + * @summary Validate ISO 4217 data for Currency class. + * @modules java.base/java.util:open + * jdk.localedata +@@ -34,7 +34,7 @@ + * ############################################################################ + * + * ValidateISO4217 is a tool to detect differences between the latest ISO 4217 +- * data and and Java's currency data which is based on ISO 4217. ++ * data and Java's currency data which is based on ISO 4217. + * If there is a difference, the following file which includes currency data + * may need to be updated. + * src/share/classes/java/util/CurrencyData.properties +diff --git a/test/jdk/java/util/Currency/tablea1.txt b/test/jdk/java/util/Currency/tablea1.txt +index 3e107823042..3eef0eba00e 100644 +--- a/test/jdk/java/util/Currency/tablea1.txt ++++ b/test/jdk/java/util/Currency/tablea1.txt +@@ -1,12 +1,12 @@ + # + # +-# Amendments up until ISO 4217 AMENDMENT NUMBER 173 +-# (As of 23 September 2022) ++# Amendments up until ISO 4217 AMENDMENT NUMBER 174 ++# (As of 2 November 2022) + # + + # Version + FILEVERSION=3 +-DATAVERSION=173 ++DATAVERSION=174 + + # ISO 4217 currency data + AF AFN 971 2 +@@ -67,7 +67,7 @@ CD CDF 976 2 + CK NZD 554 2 + CR CRC 188 2 + CI XOF 952 0 +-HR HRK 191 2 ++HR HRK 191 2 2022-12-31-23-00-00 EUR 978 2 + CU CUP 192 2 + CW ANG 532 2 + CY EUR 978 2 diff --git a/jdk8296715-cldr2022f.patch b/jdk8296715-cldr2022f.patch deleted file mode 100644 index c654def..0000000 --- a/jdk8296715-cldr2022f.patch +++ /dev/null @@ -1,89 +0,0 @@ -commit 55dd90222e2cef11ebca39a2998d8f799aadbb9a -Author: Yoshiki Sato -Date: Tue Nov 15 00:51:21 2022 +0000 - - 8296715: CLDR v42 update for tzdata 2022f - - Reviewed-by: naoto - -diff --git a/make/data/cldr/common/main/es_419.xml b/make/data/cldr/common/main/es_419.xml -index eeef247d3d0..73f8b7f4edf 100644 ---- a/make/data/cldr/common/main/es_419.xml -+++ b/make/data/cldr/common/main/es_419.xml -@@ -1019,11 +1019,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ - - - -- 0 billón - 0 billón -- 00 billones - 00 billones -- 000 billones - 000 billones - - -diff --git a/make/data/cldr/common/main/es_MX.xml b/make/data/cldr/common/main/es_MX.xml -index 6632c099084..816996b30c3 100644 ---- a/make/data/cldr/common/main/es_MX.xml -+++ b/make/data/cldr/common/main/es_MX.xml -@@ -707,11 +707,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic - - - -- 0 billón - 0 billones -- 00 billones - 00 billones -- 000 billones - 000 billones - - -diff --git a/make/data/cldr/common/supplemental/metaZones.xml b/make/data/cldr/common/supplemental/metaZones.xml -index a3c76520554..bfdadad6ba2 100644 ---- a/make/data/cldr/common/supplemental/metaZones.xml -+++ b/make/data/cldr/common/supplemental/metaZones.xml -@@ -330,7 +330,8 @@ For terms of use, see http://www.unicode.org/copyright.html - - - -- -+ -+ - - - -@@ -613,7 +614,8 @@ For terms of use, see http://www.unicode.org/copyright.html - - - -- -+ -+ - - - -diff --git a/test/jdk/sun/text/resources/LocaleData.cldr b/test/jdk/sun/text/resources/LocaleData.cldr -index 1282c42288f..3783061d487 100644 ---- a/test/jdk/sun/text/resources/LocaleData.cldr -+++ b/test/jdk/sun/text/resources/LocaleData.cldr -@@ -8394,3 +8394,7 @@ FormatData/de/latn.NumberElements/12= - FormatData/de_AT/latn.NumberElements/12=. - FormatData/fr/latn.NumberElements/11= - FormatData/fr_CH/latn.NumberElements/11=. -+ -+# tzdata2022f -+TimeZoneNames/en/America\/Ojinaga/1=Central Standard Time -+TimeZoneNames/en/America\/Chihuahua/1=Central Standard Time -diff --git a/test/jdk/sun/text/resources/LocaleDataTest.java b/test/jdk/sun/text/resources/LocaleDataTest.java -index a959796e079..605fa74ca6c 100644 ---- a/test/jdk/sun/text/resources/LocaleDataTest.java -+++ b/test/jdk/sun/text/resources/LocaleDataTest.java -@@ -40,7 +40,7 @@ - * 8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918 - * 8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746 - * 8209775 8221432 8227127 8230284 8231273 8233579 8234288 8250665 8255086 -- * 8251317 8274658 8283277 8283805 8265315 -+ * 8251317 8274658 8283277 8283805 8265315 8296715 - * @summary Verify locale data - * @modules java.base/sun.util.resources - * @modules jdk.localedata diff --git a/jdk8299439-test_for_hr.patch b/jdk8299439-test_for_hr.patch new file mode 100644 index 0000000..8dd1ed5 --- /dev/null +++ b/jdk8299439-test_for_hr.patch @@ -0,0 +1,63 @@ +commit cf262d7441d797942d33ed2a79540230fc5c97fa +Author: Christoph Langer +Date: Thu Jan 12 08:02:58 2023 +0000 + + 8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR + + Reviewed-by: naoto + Backport-of: 3b374c0153950ab193f3a188b57d3404b4ce2fe2 + +diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties +index 70f210e2da6..56e61953a8c 100644 +--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties ++++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties +@@ -1,5 +1,5 @@ + # +-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + # + # This code is free software; you can redistribute it and/or modify it +@@ -35,4 +35,5 @@ + # This notice and attribution to Taligent may not be removed. + # Taligent is a registered trademark of Taligent, Inc. + ++EUR=\u20AC + HRK=Kn +diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt +index dc167492272..a806ebe778a 100644 +--- a/test/jdk/ProblemList.txt ++++ b/test/jdk/ProblemList.txt +@@ -1,6 +1,6 @@ + ########################################################################### + # +-# Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + # + # This code is free software; you can redistribute it and/or modify it +diff --git a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties +index cf73a9c7e31..665dd3b290a 100644 +--- a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties ++++ b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties +@@ -79,7 +79,7 @@ fr_FR=\u20AC + fr_LU=\u20AC + hi_IN=\u0930\u0942 + hr=\u00A4 +-hr_HR=Kn ++hr_HR=\u20AC + hu=\u00A4 + hu_HU=Ft + is=\u00A4 +@@ -94,9 +94,9 @@ ja_JP=\uFFE5 + ko=\u00A4 + ko_KR=\uFFE6 + lt=\u00A4 +-lt_LT=Lt;2014-12-31-22-00-00;\u20AC ++lt_LT=\u20AC + lv=\u00A4 +-lv_LV=Ls;2013-12-31-22-00-00;\u20AC ++lv_LV=\u20AC + mk=\u00A4 + mk_MK=Den + nl=\u00A4 diff --git a/sources b/sources index 4a6fdfa..e8cdef6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30 -SHA512 (openjdk-jdk19u-jdk-19.0.1+10.tar.xz) = c39a6b2919247f69ce8b66766101ebf7b81714043e961ca6b5303e9cb0ffeddb3ceab826b168757f6b4db6b558f0ede59ffdc758ed273d98f19559d965dd2080 +SHA512 (openjdk-jdk19u-jdk-19.0.2+7.tar.xz) = f9b54ae43074caa53773000ed8000ff5592cda44b2bef8fafa2c38cf623048722c34a111aacfd1831050525804230b29cc20fd95ad2162c43412b957190cc7b0