diff --git a/6858051-Create-GC-worker-threads-dynamically.patch b/6858051-Create-GC-worker-threads-dynamically.patch index 98397a3fc3955fd47f6a6c956578d0e8f3e2c0b0..a66bf607fd77cb4e0b8a538e0d9e36e1ccb771b0 100644 --- a/6858051-Create-GC-worker-threads-dynamically.patch +++ b/6858051-Create-GC-worker-threads-dynamically.patch @@ -293,7 +293,7 @@ index 4454cd18d..e9813d7c1 100644 guarantee(index < GCTaskTimeStampEntries, "increase GCTaskTimeStampEntries"); diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp -index 7f8aff2bd..b4e69025f 100644 +index 0c17989a7d..c4c43a0fe3 100644 --- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp @@ -1,5 +1,5 @@ @@ -303,10 +303,10 @@ index 7f8aff2bd..b4e69025f 100644 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it -@@ -48,13 +48,13 @@ private: - +@@ -48,13 +48,14 @@ private: + bool _is_working; // True if participating in GC tasks - + - public: // Factory create and destroy methods. static GCTaskThread* create(GCTaskManager* manager, @@ -314,19 +314,20 @@ index 7f8aff2bd..b4e69025f 100644 uint processor_id) { return new GCTaskThread(manager, which, processor_id); } -+ public: ++ ++public: static void destroy(GCTaskThread* manager) { if (manager != NULL) { delete manager; -@@ -65,8 +65,6 @@ private: +@@ -65,8 +66,6 @@ private: return true; } virtual void run(); - // Methods. - void start(); - + void print_task_time_stamps(); - void print_on(outputStream* st) const; + diff --git a/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp b/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp index 3bfbddcb5..1e99e73e4 100644 --- a/hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp diff --git a/7092821-java.security.Provider.getService-is-synchro.patch b/7092821-java.security.Provider.getService-is-synchro.patch index a20593fbc510c7cb8dab00f7d108500458b18b73..93c209b41ae4b8daca15c1a0d37ace07a594699e 100644 --- a/7092821-java.security.Provider.getService-is-synchro.patch +++ b/7092821-java.security.Provider.getService-is-synchro.patch @@ -2895,7 +2895,7 @@ new file mode 100644 index 000000000..510529baa --- /dev/null +++ b/jdk/test/java/security/Provider/BaseProviderValidator.java -@@ -0,0 +1,76 @@ +@@ -0,0 +1,75 @@ +/* + * Copyright (c) 2022, Huawei Technologies Co., Ltd. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -2921,7 +2921,6 @@ index 000000000..510529baa + */ + +/* -+ * @test + * @bug 7092821 + * @library ../testlibrary + * @summary make sure that Sun providers do not miss any algorithms after @@ -3174,7 +3173,7 @@ new file mode 100644 index 000000000..8c4ef89c7 --- /dev/null +++ b/jdk/test/java/security/Provider/ProviderValidationUtil.java -@@ -0,0 +1,270 @@ +@@ -0,0 +1,269 @@ +/* + * Copyright (c) 2022, Huawei Technologies Co., Ltd. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -3200,7 +3199,6 @@ index 000000000..8c4ef89c7 + */ + +/* -+ * @test + * @bug 7092821 + * @library ../testlibrary + * @summary make sure that Sun providers do not miss any algorithms after diff --git a/8067941-TESTBUG-Fix-tests-for-OS-with-64K-page-size.patch b/8067941-TESTBUG-Fix-tests-for-OS-with-64K-page-size.patch deleted file mode 100644 index 3f428476463513b57725151b82347dda7ed036e3..0000000000000000000000000000000000000000 --- a/8067941-TESTBUG-Fix-tests-for-OS-with-64K-page-size.patch +++ /dev/null @@ -1,170 +0,0 @@ -From c97998519552b7d8287125e46a3db2f29293784f Mon Sep 17 00:00:00 2001 -From: xiezhaokun -Date: Wed, 8 Jun 2022 10:32:52 +0800 -Subject: [PATCH 08/10] 8067941: [TESTBUG] Fix tests for OS with 64K page size - ---- - hotspot/src/share/vm/memory/metaspace.cpp | 8 +++++--- - hotspot/test/compiler/6865265/StackOverflowBug.java | 2 +- - hotspot/test/compiler/8009761/Test8009761.java | 2 +- - .../exceptions/TestRecursiveReplacedException.java | 2 +- - .../compiler/uncommontrap/StackOverflowGuardPagesOff.java | 2 +- - .../compiler/uncommontrap/TestStackBangMonitorOwned.java | 2 +- - hotspot/test/compiler/uncommontrap/TestStackBangRbp.java | 2 +- - hotspot/test/gc/arguments/TestMaxHeapSizeTools.java | 2 +- - hotspot/test/gc/g1/TestHumongousAllocInitialMark.java | 4 +++- - 9 files changed, 15 insertions(+), 11 deletions(-) - -diff --git a/hotspot/src/share/vm/memory/metaspace.cpp b/hotspot/src/share/vm/memory/metaspace.cpp -index 600bcfd1..2912f41b 100644 ---- a/hotspot/src/share/vm/memory/metaspace.cpp -+++ b/hotspot/src/share/vm/memory/metaspace.cpp -@@ -3937,11 +3937,13 @@ class TestVirtualSpaceNodeTest { - assert(cm.sum_free_chunks() == 2*MediumChunk, "sizes should add up"); - } - -- { // 4 pages of VSN is committed, some is used by chunks -+ const size_t page_chunks = 4 * (size_t)os::vm_page_size() / BytesPerWord; -+ // This doesn't work for systems with vm_page_size >= 16K. -+ if (page_chunks < MediumChunk) { -+ // 4 pages of VSN is committed, some is used by chunks - ChunkManager cm(SpecializedChunk, SmallChunk, MediumChunk); - VirtualSpaceNode vsn(vsn_test_size_bytes); -- const size_t page_chunks = 4 * (size_t)os::vm_page_size() / BytesPerWord; -- assert(page_chunks < MediumChunk, "Test expects medium chunks to be at least 4*page_size"); -+ - vsn.initialize(); - vsn.expand_by(page_chunks, page_chunks); - vsn.get_chunk_vs(SmallChunk); -diff --git a/hotspot/test/compiler/6865265/StackOverflowBug.java b/hotspot/test/compiler/6865265/StackOverflowBug.java -index 295a6b41..c5d0f3b6 100644 ---- a/hotspot/test/compiler/6865265/StackOverflowBug.java -+++ b/hotspot/test/compiler/6865265/StackOverflowBug.java -@@ -28,7 +28,7 @@ - * @summary JVM crashes with "missing exception handler" error - * @author volker.simonis@sap.com - * -- * @run main/othervm -XX:CompileThreshold=100 -Xbatch -Xss248k StackOverflowBug -+ * @run main/othervm -XX:CompileThreshold=100 -Xbatch -Xss512k StackOverflowBug - */ - - -diff --git a/hotspot/test/compiler/8009761/Test8009761.java b/hotspot/test/compiler/8009761/Test8009761.java -index 401458b6..b41f49fd 100644 ---- a/hotspot/test/compiler/8009761/Test8009761.java -+++ b/hotspot/test/compiler/8009761/Test8009761.java -@@ -25,7 +25,7 @@ - * @test - * @bug 8009761 - * @summary Deoptimization on sparc doesn't set Llast_SP correctly in the interpreter frames it creates -- * @run main/othervm -XX:CompileCommand=exclude,Test8009761::m2 -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -Xss256K Test8009761 -+ * @run main/othervm -XX:CompileCommand=exclude,Test8009761::m2 -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -Xss512K Test8009761 - * - */ - -diff --git a/hotspot/test/compiler/exceptions/TestRecursiveReplacedException.java b/hotspot/test/compiler/exceptions/TestRecursiveReplacedException.java -index 996d82a0..950ed18c 100644 ---- a/hotspot/test/compiler/exceptions/TestRecursiveReplacedException.java -+++ b/hotspot/test/compiler/exceptions/TestRecursiveReplacedException.java -@@ -25,7 +25,7 @@ - * @test - * @bug 8054224 - * @summary Recursive method compiled by C1 is unable to catch StackOverflowError -- * @run main/othervm -Xcomp -XX:CompileOnly=Test.run -XX:+TieredCompilation -XX:TieredStopAtLevel=2 -Xss256K TestRecursiveReplacedException -+ * @run main/othervm -Xcomp -XX:CompileOnly=Test.run -XX:+TieredCompilation -XX:TieredStopAtLevel=2 -Xss512K TestRecursiveReplacedException - * - */ - -diff --git a/hotspot/test/compiler/uncommontrap/StackOverflowGuardPagesOff.java b/hotspot/test/compiler/uncommontrap/StackOverflowGuardPagesOff.java -index 4ad409bb..835283c0 100644 ---- a/hotspot/test/compiler/uncommontrap/StackOverflowGuardPagesOff.java -+++ b/hotspot/test/compiler/uncommontrap/StackOverflowGuardPagesOff.java -@@ -25,7 +25,7 @@ - * @test - * @bug 8029383 - * @summary stack overflow if callee is marked for deoptimization causes crash -- * @run main/othervm -XX:TieredStopAtLevel=1 -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,StackOverflowGuardPagesOff::m1 -XX:CompileCommand=exclude,StackOverflowGuardPagesOff::m2 -Xss256K -XX:-UseOnStackReplacement StackOverflowGuardPagesOff -+ * @run main/othervm -XX:TieredStopAtLevel=1 -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,StackOverflowGuardPagesOff::m1 -XX:CompileCommand=exclude,StackOverflowGuardPagesOff::m2 -Xss512K -XX:-UseOnStackReplacement StackOverflowGuardPagesOff - * - */ - -diff --git a/hotspot/test/compiler/uncommontrap/TestStackBangMonitorOwned.java b/hotspot/test/compiler/uncommontrap/TestStackBangMonitorOwned.java -index 3d93d7d5..c07a995d 100644 ---- a/hotspot/test/compiler/uncommontrap/TestStackBangMonitorOwned.java -+++ b/hotspot/test/compiler/uncommontrap/TestStackBangMonitorOwned.java -@@ -25,7 +25,7 @@ - * @test - * @bug 8032410 - * @summary Stack overflow at deoptimization doesn't release owned monitors -- * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestStackBangMonitorOwned::m1 -XX:CompileCommand=exclude,TestStackBangMonitorOwned::m2 -Xss256K -XX:-UseOnStackReplacement TestStackBangMonitorOwned -+ * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestStackBangMonitorOwned::m1 -XX:CompileCommand=exclude,TestStackBangMonitorOwned::m2 -Xss512K -XX:-UseOnStackReplacement TestStackBangMonitorOwned - * - */ - public class TestStackBangMonitorOwned { -diff --git a/hotspot/test/compiler/uncommontrap/TestStackBangRbp.java b/hotspot/test/compiler/uncommontrap/TestStackBangRbp.java -index 38d4e206..9b96951a 100644 ---- a/hotspot/test/compiler/uncommontrap/TestStackBangRbp.java -+++ b/hotspot/test/compiler/uncommontrap/TestStackBangRbp.java -@@ -25,7 +25,7 @@ - * @test - * @bug 8028308 - * @summary rbp not restored when stack overflow is thrown from deopt/uncommon trap blobs -- * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestStackBangRbp::m1 -XX:CompileCommand=exclude,TestStackBangRbp::m2 -Xss256K -XX:-UseOnStackReplacement TestStackBangRbp -+ * @run main/othervm -XX:-BackgroundCompilation -XX:CompileCommand=dontinline,TestStackBangRbp::m1 -XX:CompileCommand=exclude,TestStackBangRbp::m2 -Xss512K -XX:-UseOnStackReplacement TestStackBangRbp - * - */ - public class TestStackBangRbp { -diff --git a/hotspot/test/gc/arguments/TestMaxHeapSizeTools.java b/hotspot/test/gc/arguments/TestMaxHeapSizeTools.java -index b5859b5c..99ed508d 100644 ---- a/hotspot/test/gc/arguments/TestMaxHeapSizeTools.java -+++ b/hotspot/test/gc/arguments/TestMaxHeapSizeTools.java -@@ -112,7 +112,7 @@ class TestMaxHeapSizeTools { - } - - private static void checkInvalidMinInitialHeapCombinations(String gcflag) throws Exception { -- expectError(new String[] { gcflag, "-Xms8M", "-XX:InitialHeapSize=4M", "-version" }); -+ expectError(new String[] { gcflag, "-Xms64M", "-XX:InitialHeapSize=32M", "-version" }); - } - - private static void checkValidMinInitialHeapCombinations(String gcflag) throws Exception { -diff --git a/hotspot/test/gc/g1/TestHumongousAllocInitialMark.java b/hotspot/test/gc/g1/TestHumongousAllocInitialMark.java -index 473ce666..b6e5c3d6 100644 ---- a/hotspot/test/gc/g1/TestHumongousAllocInitialMark.java -+++ b/hotspot/test/gc/g1/TestHumongousAllocInitialMark.java -@@ -31,7 +31,9 @@ - import com.oracle.java.testlibrary.*; - - public class TestHumongousAllocInitialMark { -- private static final int heapSize = 200; // MB -+ // Heap sizes < 224 MB are increased to 224 MB if vm_page_size == 64K to -+ // fulfill alignment constraints. -+ private static final int heapSize = 224; // MB - private static final int heapRegionSize = 1; // MB - private static final int initiatingHeapOccupancyPercent = 50; // % - -diff --git a/hotspot/test/runtime/6929067/invoke.c b/hotspot/test/runtime/6929067/invoke.c -index 8dde2cd6..cf8014be 100644 ---- a/hotspot/test/runtime/6929067/invoke.c -+++ b/hotspot/test/runtime/6929067/invoke.c -@@ -68,7 +68,7 @@ floobydust (void *p) - int - main (int argc, const char** argv) - { -- options[0].optionString = "-Xss320k"; -+ options[0].optionString = "-Xss512k"; - - vm_args.version = JNI_VERSION_1_2; - vm_args.ignoreUnrecognized = JNI_TRUE; -diff --git a/hotspot/test/runtime/InitialThreadOverflow/invoke.cxx b/hotspot/test/runtime/InitialThreadOverflow/invoke.cxx -index 55213c0f..2bca88f1 100644 ---- a/hotspot/test/runtime/InitialThreadOverflow/invoke.cxx -+++ b/hotspot/test/runtime/InitialThreadOverflow/invoke.cxx -@@ -48,7 +48,7 @@ floobydust (void *p) { - int - main (int argc, const char** argv) { - JavaVMOption options[1]; -- options[0].optionString = (char*) "-Xss320k"; -+ options[0].optionString = (char*) "-Xss512k"; - - JavaVMInitArgs vm_args; - vm_args.version = JNI_VERSION_1_2; diff --git a/8159720-Failure-of-C2-compilation-with-tiered-preven.patch b/8159720-Failure-of-C2-compilation-with-tiered-preven.patch deleted file mode 100644 index a52d0c90a81ef183ecc162b86487ce0d0e75d5b2..0000000000000000000000000000000000000000 --- a/8159720-Failure-of-C2-compilation-with-tiered-preven.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 717ae5f43045b1e2d6f95c52fbd81c54ebf50977 Mon Sep 17 00:00:00 2001 -Date: Fri, 16 Sep 2022 01:12:20 +0000 -Subject: 8159720: Failure of C2 compilation with tiered prevents some - C1 compilations. - ---- - hotspot/src/share/vm/opto/compile.cpp | 2 +- - hotspot/src/share/vm/opto/compile.hpp | 10 +++------- - hotspot/src/share/vm/opto/matcher.cpp | 8 ++++---- - hotspot/src/share/vm/opto/parse1.cpp | 4 ++-- - 4 files changed, 10 insertions(+), 14 deletions(-) - -diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp -index 5a42422e1..4a32e8a9f 100644 ---- a/hotspot/src/share/vm/opto/compile.cpp -+++ b/hotspot/src/share/vm/opto/compile.cpp -@@ -791,7 +791,7 @@ Compile::Compile( ciEnv* ci_env, C2Compiler* compiler, ciMethod* target, int osr - } - if (failing()) return; - if (cg == NULL) { -- record_method_not_compilable_all_tiers("cannot parse method"); -+ record_method_not_compilable("cannot parse method"); - return; - } - JVMState* jvms = build_start_state(start(), tf()); -diff --git a/hotspot/src/share/vm/opto/compile.hpp b/hotspot/src/share/vm/opto/compile.hpp -index 1150fd549..fb12b6874 100644 ---- a/hotspot/src/share/vm/opto/compile.hpp -+++ b/hotspot/src/share/vm/opto/compile.hpp -@@ -742,16 +742,12 @@ class Compile : public Phase { - bool failure_reason_is(const char* r) { return (r==_failure_reason) || (r!=NULL && _failure_reason!=NULL && strcmp(r, _failure_reason)==0); } - - void record_failure(const char* reason); -- void record_method_not_compilable(const char* reason, bool all_tiers = false) { -- // All bailouts cover "all_tiers" when TieredCompilation is off. -- if (!TieredCompilation) all_tiers = true; -- env()->record_method_not_compilable(reason, all_tiers); -+ void record_method_not_compilable(const char* reason) { -+ // Bailouts cover "all_tiers" when TieredCompilation is off. -+ env()->record_method_not_compilable(reason, !TieredCompilation); - // Record failure reason. - record_failure(reason); - } -- void record_method_not_compilable_all_tiers(const char* reason) { -- record_method_not_compilable(reason, true); -- } - bool check_node_count(uint margin, const char* reason) { - if (live_nodes() + margin > max_node_limit()) { - record_method_not_compilable(reason); -diff --git a/hotspot/src/share/vm/opto/matcher.cpp b/hotspot/src/share/vm/opto/matcher.cpp -index 07b8ee4c6..b26015ce6 100644 ---- a/hotspot/src/share/vm/opto/matcher.cpp -+++ b/hotspot/src/share/vm/opto/matcher.cpp -@@ -137,7 +137,7 @@ OptoReg::Name Matcher::warp_incoming_stk_arg( VMReg reg ) { - _in_arg_limit = OptoReg::add(warped, 1); // Bump max stack slot seen - if (!RegMask::can_represent_arg(warped)) { - // the compiler cannot represent this method's calling sequence -- C->record_method_not_compilable_all_tiers("unsupported incoming calling sequence"); -+ C->record_method_not_compilable("unsupported incoming calling sequence"); - return OptoReg::Bad; - } - return warped; -@@ -1148,7 +1148,7 @@ OptoReg::Name Matcher::warp_outgoing_stk_arg( VMReg reg, OptoReg::Name begin_out - if( warped >= out_arg_limit_per_call ) - out_arg_limit_per_call = OptoReg::add(warped,1); - if (!RegMask::can_represent_arg(warped)) { -- C->record_method_not_compilable_all_tiers("unsupported calling sequence"); -+ C->record_method_not_compilable("unsupported calling sequence"); - return OptoReg::Bad; - } - return warped; -@@ -1327,7 +1327,7 @@ MachNode *Matcher::match_sfpt( SafePointNode *sfpt ) { - uint r_cnt = mcall->tf()->range()->cnt(); - MachProjNode *proj = new (C) MachProjNode( mcall, r_cnt+10000, RegMask::Empty, MachProjNode::fat_proj ); - if (!RegMask::can_represent_arg(OptoReg::Name(out_arg_limit_per_call-1))) { -- C->record_method_not_compilable_all_tiers("unsupported outgoing calling sequence"); -+ C->record_method_not_compilable("unsupported outgoing calling sequence"); - } else { - for (int i = begin_out_arg_area; i < out_arg_limit_per_call; i++) - proj->_rout.Insert(OptoReg::Name(i)); -@@ -1515,7 +1515,7 @@ Node *Matcher::Label_Root( const Node *n, State *svec, Node *control, const Node - // out of stack space. See bugs 6272980 & 6227033 for more info. - LabelRootDepth++; - if (LabelRootDepth > MaxLabelRootDepth) { -- C->record_method_not_compilable_all_tiers("Out of stack space, increase MaxLabelRootDepth"); -+ C->record_method_not_compilable("Out of stack space, increase MaxLabelRootDepth"); - return NULL; - } - uint care = 0; // Edges matcher cares about -diff --git a/hotspot/src/share/vm/opto/parse1.cpp b/hotspot/src/share/vm/opto/parse1.cpp -index a9ef4f910..4fcd58cb4 100644 ---- a/hotspot/src/share/vm/opto/parse1.cpp -+++ b/hotspot/src/share/vm/opto/parse1.cpp -@@ -415,7 +415,7 @@ Parse::Parse(JVMState* caller, ciMethod* parse_method, float expected_uses) - _iter.reset_to_method(method()); - _flow = method()->get_flow_analysis(); - if (_flow->failing()) { -- C->record_method_not_compilable_all_tiers(_flow->failure_reason()); -+ C->record_method_not_compilable(_flow->failure_reason()); - } - - #ifndef PRODUCT -@@ -1088,7 +1088,7 @@ SafePointNode* Parse::create_entry_map() { - // Check for really stupid bail-out cases. - uint len = TypeFunc::Parms + method()->max_locals() + method()->max_stack(); - if (len >= 32760) { -- C->record_method_not_compilable_all_tiers("too many local variables"); -+ C->record_method_not_compilable("too many local variables"); - return NULL; - } - --- -2.18.0.huawei.25 - diff --git a/8166253.patch b/8166253.patch index 3722813ec271cb8ad08f9f916f3b3477cea75bad..ba4915b499997e4c6925a5dd81cb0a6cddbc66c2 100644 --- a/8166253.patch +++ b/8166253.patch @@ -117,14 +117,14 @@ index 000000000..fb6618688 +import java.nio.channels.OverlappingFileLockException; +import java.nio.file.Files; +import java.nio.file.Path; -+import jdk.test.lib.util.FileUtils; ++import jdk.testlibrary.FileUtils; + +/* + * @test + * @bug 8166253 + * @summary Verify that OverlappingFileLockException is thrown when expected. -+ * @library .. /test/lib -+ * @build jdk.test.lib.util.FileUtils ++ * @library /lib/testlibrary ++ * @build jdk.testlibrary.Utils + * @run main/othervm FileLockGC + */ +public class FileLockGC { diff --git a/8178968-AArch64-Remove-non-standard-code-cache-size.patch b/8178968-AArch64-Remove-non-standard-code-cache-size.patch new file mode 100644 index 0000000000000000000000000000000000000000..82295a8ea92874ed36a35d6988d42f4b144c5dbe --- /dev/null +++ b/8178968-AArch64-Remove-non-standard-code-cache-size.patch @@ -0,0 +1,25 @@ +From bf0ddc70f543a1847d8822bc01537322aa5bbe6d Mon Sep 17 00:00:00 2001 +From: hedongbo +Date: Thu, 5 Jan 2023 19:40:11 +0000 +Subject: 8178968: AArch64: Remove non-standard code cache size + +--- + hotspot/src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/hotspot/src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp b/hotspot/src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp +index f15ed99fb..ed623c435 100644 +--- a/hotspot/src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp ++++ b/hotspot/src/cpu/aarch64/vm/globalDefinitions_aarch64.hpp +@@ -37,8 +37,4 @@ const bool CCallingConventionRequiresIntsAsLongs = false; + + #define SUPPORTS_NATIVE_CX8 + +-// The maximum B/BL offset range on AArch64 is 128MB. +-#undef CODE_CACHE_DEFAULT_LIMIT +-#define CODE_CACHE_DEFAULT_LIMIT (128*M) +- + #endif // CPU_AARCH64_VM_GLOBALDEFINITIONS_AARCH64_HPP +-- +2.12.3 + diff --git a/8185736-missing-default-exception-handler-in-calls-t.patch b/8185736-missing-default-exception-handler-in-calls-t.patch new file mode 100644 index 0000000000000000000000000000000000000000..2984d722ad2a13865361dd1f082df7d768217cfd --- /dev/null +++ b/8185736-missing-default-exception-handler-in-calls-t.patch @@ -0,0 +1,53 @@ +From da7a2005a2c181737b163f60dd705acc00002463 Mon Sep 17 00:00:00 2001 +From: hedongbo +Date: Thu, 5 Jan 2023 10:22:15 +0000 +Subject: 8185736: missing default exception handler in calls to + rethrow_Stub + +--- + hotspot/src/share/vm/opto/doCall.cpp | 9 +++++++++ + hotspot/src/share/vm/opto/output.cpp | 1 + + 2 files changed, 10 insertions(+) + +diff --git a/hotspot/src/share/vm/opto/doCall.cpp b/hotspot/src/share/vm/opto/doCall.cpp +index 366769356..1b2b77c71 100644 +--- a/hotspot/src/share/vm/opto/doCall.cpp ++++ b/hotspot/src/share/vm/opto/doCall.cpp +@@ -702,6 +702,7 @@ void Parse::catch_call_exceptions(ciExceptionHandlerStream& handlers) { + GrowableArray* extypes = new (C->node_arena()) GrowableArray(C->node_arena(), 8, 0, NULL); + GrowableArray* saw_unloaded = new (C->node_arena()) GrowableArray(C->node_arena(), 8, 0, 0); + ++ bool default_handler = false; + for (; !handlers.is_done(); handlers.next()) { + ciExceptionHandler* h = handlers.handler(); + int h_bci = h->handler_bci(); +@@ -724,6 +725,14 @@ void Parse::catch_call_exceptions(ciExceptionHandlerStream& handlers) { + // Note: It's OK if the BCIs repeat themselves. + bcis->append(h_bci); + extypes->append(h_extype); ++ if (h_bci == -1) { ++ default_handler = true; ++ } ++ } ++ ++ if (!default_handler) { ++ bcis->append(-1); ++ extypes->append(TypeOopPtr::make_from_klass(env()->Throwable_klass())->is_instptr()); + } + + int len = bcis->length(); +diff --git a/hotspot/src/share/vm/opto/output.cpp b/hotspot/src/share/vm/opto/output.cpp +index 5c9566e1e..6032b72a9 100644 +--- a/hotspot/src/share/vm/opto/output.cpp ++++ b/hotspot/src/share/vm/opto/output.cpp +@@ -1761,6 +1761,7 @@ void Compile::FillExceptionTables(uint cnt, uint *call_returns, uint *inct_start + } + + // Set the offset of the return from the call ++ assert(handler_bcis.find(-1) != -1, "must have default handler"); + _handler_table.add_subtable(call_return, &handler_bcis, NULL, &handler_pcos); + continue; + } +-- +2.12.3 + diff --git a/8196485.patch b/8196485.patch index 96cfb5534f2e795433493594582efc7a62094261..9784b060a9d94e7578f976c6ad8a5352eacfde0e 100644 --- a/8196485.patch +++ b/8196485.patch @@ -153,21 +153,18 @@ new file mode 100644 index 000000000..92950cf68 --- /dev/null +++ b/hotspot/test/gc/g1/TestFromCardCacheIndex.java -@@ -0,0 +1,119 @@ +@@ -0,0 +1,116 @@ +/* + * @test TestFromCardCacheIndex.java + * @bug 8196485 + * @summary Ensure that G1 does not miss a remembered set entry due to from card cache default value indices. + * @key gc -+ * @requires vm.gc.G1 -+ * @requires vm.debug + * @requires vm.bits != "32" -+ * @library /test/lib -+ * @modules java.base/jdk.internal.misc -+ * java.management ++ * @library /testlibrary/whitebox /testlibrary ++ * @modules java.base/jdk.internal.misc java.management + * @build sun.hotspot.WhiteBox + * @run driver ClassFileInstaller sun.hotspot.WhiteBox -+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. -Xms20M -Xmx20M -XX:+UseCompressedOops -XX:G1HeapRegionSize=1M -XX:HeapBaseMinAddress=2199011721216 -XX:+UseG1GC -verbose:gc TestFromCardCacheIndex ++ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. -Xms20M -Xmx20M -XX:+UseCompressedOops -XX:G1HeapRegionSize=1M -XX:HeapBaseMinAddress=2199011721216 -XX:+UseG1GC -verbose:gc TestFromCardCacheIndex + */ + +import sun.hotspot.WhiteBox; diff --git a/8200720-Print-additional-information-in-thread-dump-.patch b/8200720-Print-additional-information-in-thread-dump-.patch index 12c1b59cac2fbfa08db35f96db2a7bed4fe748de..b355c7945b1b0d3e3b51093786df017d1dfc9cdc 100644 --- a/8200720-Print-additional-information-in-thread-dump-.patch +++ b/8200720-Print-additional-information-in-thread-dump-.patch @@ -129,7 +129,7 @@ index 61627e4..bd35e95 100644 if (internal_format) { p->trace_stack(); diff --git a/hotspot/src/share/vm/runtime/thread.hpp b/hotspot/src/share/vm/runtime/thread.hpp -index fcd4814..be53498 100644 +index 7d80daba..0e126964 100644 --- a/hotspot/src/share/vm/runtime/thread.hpp +++ b/hotspot/src/share/vm/runtime/thread.hpp @@ -41,6 +41,7 @@ @@ -162,22 +162,22 @@ index fcd4814..be53498 100644 void set_lgrp_id(int value) { _lgrp_id = value; } // Printing -- void print_on(outputStream* st) const; +- virtual void print_on(outputStream* st) const; + void print_on(outputStream* st, bool print_extended_info) const; + void print_on(outputStream* st) const { print_on(st, false); } void print() const { print_on(tty); } virtual void print_on_error(outputStream* st, char* buf, int buflen) const; -@@ -1463,7 +1469,8 @@ class JavaThread: public Thread { +@@ -1464,7 +1470,8 @@ class JavaThread: public Thread { // Misc. operations char* name() const { return (char*)get_thread_name(); } - void print_on(outputStream* st) const; + void print_on(outputStream* st, bool print_extended_info) const; + void print_on(outputStream* st) const { print_on(st, false); } - void print() const { print_on(tty); } void print_value(); void print_thread_state_on(outputStream* ) const PRODUCT_RETURN; + void print_thread_state() const PRODUCT_RETURN; @@ -1975,10 +1982,10 @@ class Threads: AllStatic { // Verification @@ -190,7 +190,7 @@ index fcd4814..be53498 100644 + print_on(tty, print_stacks, internal_format, false /* no concurrent lock printed */, false /* simple format */); } static void print_on_error(outputStream* st, Thread* current, char* buf, int buflen); - + diff --git a/hotspot/src/share/vm/runtime/threadStatisticalInfo.hpp b/hotspot/src/share/vm/runtime/threadStatisticalInfo.hpp new file mode 100644 index 0000000..9dbe62d diff --git a/8293114-GC-should-trim-the-native-heap-and-bug-fix.patch b/8293114-GC-should-trim-the-native-heap-and-bug-fix.patch index 1cc4fed773da81eaaa1e0408ca82f59be53c225b..eb0b7ef82a3279df571b9e033de5832d40e5fd08 100644 --- a/8293114-GC-should-trim-the-native-heap-and-bug-fix.patch +++ b/8293114-GC-should-trim-the-native-heap-and-bug-fix.patch @@ -503,7 +503,7 @@ index e39fd7a..024499a 100644 +++ b/hotspot/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp @@ -1,5 +1,5 @@ /* -- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. +- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * diff --git a/8294357-tz-Update-Timezone-Data-to-2022d.patch b/8294357-tz-Update-Timezone-Data-to-2022d.patch deleted file mode 100644 index 2e10ad41cd93d36f5e14464c36bbc4cbcb6cce88..0000000000000000000000000000000000000000 --- a/8294357-tz-Update-Timezone-Data-to-2022d.patch +++ /dev/null @@ -1,526 +0,0 @@ -From 78c19b03f00f61f673311cf3c70a21ce25933eec Mon Sep 17 00:00:00 2001 -From: eapen -Date: Wed, 30 Nov 2022 11:39:58 +0000 -Subject: [PATCH 07/33] I68TO2: 8294357: (tz) Update Timezone Data to 2022d ---- - jdk/make/data/tzdata/VERSION | 2 +- - jdk/make/data/tzdata/asia | 30 +++++++---- - jdk/make/data/tzdata/backward | 2 + - jdk/make/data/tzdata/europe | 58 ++++------------------ - jdk/make/data/tzdata/southamerica | 10 +++- - jdk/make/data/tzdata/zone.tab | 2 - - .../classes/sun/util/calendar/ZoneInfoFile.java | 9 +--- - jdk/test/java/util/TimeZone/TimeZoneData/VERSION | 2 +- - .../java/util/TimeZone/TimeZoneData/aliases.txt | 2 + - .../util/TimeZone/TimeZoneData/displaynames.txt | 2 - - jdk/test/sun/util/calendar/zi/TestZoneInfo310.java | 15 ++++-- - jdk/test/sun/util/calendar/zi/tzdata/VERSION | 2 +- - jdk/test/sun/util/calendar/zi/tzdata/asia | 30 +++++++---- - jdk/test/sun/util/calendar/zi/tzdata/backward | 2 + - jdk/test/sun/util/calendar/zi/tzdata/europe | 58 ++++------------------ - jdk/test/sun/util/calendar/zi/tzdata/southamerica | 10 +++- - jdk/test/sun/util/calendar/zi/tzdata/zone.tab | 2 - - 17 files changed, 99 insertions(+), 139 deletions(-) - -diff --git a/jdk/make/data/tzdata/VERSION b/jdk/make/data/tzdata/VERSION -index decb871..889d0e6 100644 ---- a/jdk/make/data/tzdata/VERSION -+++ b/jdk/make/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/jdk/make/data/tzdata/asia b/jdk/make/data/tzdata/asia -index 6cb6d2c..1dc7d34 100644 ---- a/jdk/make/data/tzdata/asia -+++ b/jdk/make/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/jdk/make/data/tzdata/backward b/jdk/make/data/tzdata/backward -index d4a29e8..7765d99 100644 ---- a/jdk/make/data/tzdata/backward -+++ b/jdk/make/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/jdk/make/data/tzdata/europe b/jdk/make/data/tzdata/europe -index f7eb7a3..9e0a538 100644 ---- a/jdk/make/data/tzdata/europe -+++ b/jdk/make/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/jdk/make/data/tzdata/southamerica b/jdk/make/data/tzdata/southamerica -index 13ec081..3c0e0e2 100644 ---- a/jdk/make/data/tzdata/southamerica -+++ b/jdk/make/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/jdk/make/data/tzdata/zone.tab b/jdk/make/data/tzdata/zone.tab -index 51b65fa..ee02519 100644 ---- a/jdk/make/data/tzdata/zone.tab -+++ b/jdk/make/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/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java -index 43bddd5..4b84cda 100644 ---- a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java -+++ b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java -@@ -573,12 +573,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 { -@@ -600,7 +596,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/jdk/test/java/util/TimeZone/TimeZoneData/VERSION b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION -index c32bee3..7147016 100644 ---- a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION -+++ b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION -@@ -1 +1 @@ --tzdata2022c -+tzdata2022d -diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt b/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt -index a5e6428..e3ce742 100644 ---- a/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt -+++ b/jdk/test/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/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt b/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt -index fc14853..b382395 100644 ---- a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt -+++ b/jdk/test/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/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java b/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java -index 3aad69f..c682531 100644 ---- a/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java -+++ b/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java -@@ -173,10 +173,19 @@ public class TestZoneInfo310 { - * Temporary ignoring the failing TimeZones which are having zone - * rules defined till year 2037 and/or above and have negative DST - * save time in IANA tzdata. This bug is tracked via JDK-8223388. -+ * -+ * Tehran/Iran rule has rules beyond 2037, in which javazic assumes -+ * to be the last year. Thus javazic's rule is based on year 2037 -+ * (Mar 20th/Sep 20th are the cutover dates), while the real rule -+ * has year 2087 where Mar 21st/Sep 21st are the cutover dates. - */ -- if (zid.equals("Africa/Casablanca") || zid.equals("Africa/El_Aaiun") -- || zid.equals("Asia/Tehran") || zid.equals("Iran")) { -- continue; -+ if (zid.equals("Africa/Casablanca") || // uses "Morocco" rule -+ zid.equals("Africa/El_Aaiun") || // uses "Morocco" rule -+ 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; - } - if (! zi.equalsTo(ziOLD)) { - System.out.println(zi.diffsTo(ziOLD)); -diff --git a/jdk/test/sun/util/calendar/zi/tzdata/VERSION b/jdk/test/sun/util/calendar/zi/tzdata/VERSION -index decb871..889d0e6 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/asia b/jdk/test/sun/util/calendar/zi/tzdata/asia -index 6cb6d2c..1dc7d34 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/asia -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/backward b/jdk/test/sun/util/calendar/zi/tzdata/backward -index d4a29e8..7765d99 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/backward -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/europe b/jdk/test/sun/util/calendar/zi/tzdata/europe -index f7eb7a3..9e0a538 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/europe -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/southamerica b/jdk/test/sun/util/calendar/zi/tzdata/southamerica -index 13ec081..3c0e0e2 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/southamerica -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/zone.tab b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab -index 51b65fa..ee02519 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab -+++ b/jdk/test/sun/util/calendar/zi/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 --- -1.8.3.1 diff --git a/8296108-tz-Update-Timezone-Data-to-2022f.patch b/8296108-tz-Update-Timezone-Data-to-2022f.patch deleted file mode 100644 index 19b7fbb716c9dc191d7af691536a3d6428858572..0000000000000000000000000000000000000000 --- a/8296108-tz-Update-Timezone-Data-to-2022f.patch +++ /dev/null @@ -1,4516 +0,0 @@ -From b8733a1abad2eb73a9a1ae5e74be047cf7c5866a Mon Sep 17 00:00:00 2001 -From: eapen -Date: Wed, 30 Nov 2022 15:47:49 +0800 -Subject: [PATCH 09/33] I68TO2: 8296108: (tz) Update Timezone Data to 2022f ---- - jdk/make/data/tzdata/VERSION | 2 +- - jdk/make/data/tzdata/africa | 213 ++++--------- - jdk/make/data/tzdata/antarctica | 2 +- - jdk/make/data/tzdata/asia | 69 ++--- - jdk/make/data/tzdata/australasia | 58 ++-- - jdk/make/data/tzdata/backward | 291 ++++++++++++++---- - jdk/make/data/tzdata/etcetera | 17 +- - jdk/make/data/tzdata/europe | 202 +++++------- - jdk/make/data/tzdata/northamerica | 171 +++-------- - jdk/make/data/tzdata/southamerica | 15 - - jdk/make/data/tzdata/zone.tab | 3 - - .../classes/sun/util/resources/TimeZoneNames.java | 6 +- - .../sun/util/resources/de/TimeZoneNames_de.java | 6 +- - .../sun/util/resources/es/TimeZoneNames_es.java | 6 +- - .../sun/util/resources/fr/TimeZoneNames_fr.java | 6 +- - .../sun/util/resources/it/TimeZoneNames_it.java | 6 +- - .../sun/util/resources/ja/TimeZoneNames_ja.java | 6 +- - .../sun/util/resources/ko/TimeZoneNames_ko.java | 6 +- - .../sun/util/resources/pt/TimeZoneNames_pt_BR.java | 6 +- - .../sun/util/resources/sv/TimeZoneNames_sv.java | 6 +- - .../sun/util/resources/zh/TimeZoneNames_zh_CN.java | 6 +- - .../sun/util/resources/zh/TimeZoneNames_zh_TW.java | 6 +- - jdk/test/java/util/TimeZone/TimeZoneData/VERSION | 2 +- - .../java/util/TimeZone/TimeZoneData/aliases.txt | 341 +++++++++++---------- - .../util/TimeZone/TimeZoneData/displaynames.txt | 7 +- - jdk/test/sun/util/calendar/zi/tzdata/VERSION | 2 +- - jdk/test/sun/util/calendar/zi/tzdata/africa | 213 ++++--------- - jdk/test/sun/util/calendar/zi/tzdata/antarctica | 2 +- - jdk/test/sun/util/calendar/zi/tzdata/asia | 69 ++--- - jdk/test/sun/util/calendar/zi/tzdata/australasia | 58 ++-- - jdk/test/sun/util/calendar/zi/tzdata/backward | 291 ++++++++++++++---- - jdk/test/sun/util/calendar/zi/tzdata/etcetera | 17 +- - jdk/test/sun/util/calendar/zi/tzdata/europe | 202 +++++------- - jdk/test/sun/util/calendar/zi/tzdata/northamerica | 171 +++-------- - jdk/test/sun/util/calendar/zi/tzdata/southamerica | 15 - - jdk/test/sun/util/calendar/zi/tzdata/zone.tab | 3 - - 36 files changed, 1103 insertions(+), 1399 deletions(-) - -diff --git a/jdk/make/data/tzdata/VERSION b/jdk/make/data/tzdata/VERSION -index b8cb36e..b8d9ae7 100644 ---- a/jdk/make/data/tzdata/VERSION -+++ b/jdk/make/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/jdk/make/data/tzdata/africa b/jdk/make/data/tzdata/africa -index e13899b..b4559cd 100644 ---- a/jdk/make/data/tzdata/africa -+++ b/jdk/make/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 - 0:00 Morocco +00/+01 - -+# 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/jdk/make/data/tzdata/antarctica b/jdk/make/data/tzdata/antarctica -index 34c302e..792542b 100644 ---- a/jdk/make/data/tzdata/antarctica -+++ b/jdk/make/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/jdk/make/data/tzdata/asia b/jdk/make/data/tzdata/asia -index f1771e4..8f1fcac 100644 ---- a/jdk/make/data/tzdata/asia -+++ b/jdk/make/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/jdk/make/data/tzdata/australasia b/jdk/make/data/tzdata/australasia -index 019cd77..fbe3b8a 100644 ---- a/jdk/make/data/tzdata/australasia -+++ b/jdk/make/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/jdk/make/data/tzdata/backward b/jdk/make/data/tzdata/backward -index 7765d99..1fb087a 100644 ---- a/jdk/make/data/tzdata/backward -+++ b/jdk/make/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/jdk/make/data/tzdata/etcetera b/jdk/make/data/tzdata/etcetera -index 82ff6b4..8ae294f 100644 ---- a/jdk/make/data/tzdata/etcetera -+++ b/jdk/make/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/jdk/make/data/tzdata/europe b/jdk/make/data/tzdata/europe -index 930cede..7b6aa13 100644 ---- a/jdk/make/data/tzdata/europe -+++ b/jdk/make/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/jdk/make/data/tzdata/northamerica b/jdk/make/data/tzdata/northamerica -index ce4ee74..465e8c2 100644 ---- a/jdk/make/data/tzdata/northamerica -+++ b/jdk/make/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/jdk/make/data/tzdata/southamerica b/jdk/make/data/tzdata/southamerica -index 3c0e0e2..982ad09 100644 ---- a/jdk/make/data/tzdata/southamerica -+++ b/jdk/make/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/jdk/make/data/tzdata/zone.tab b/jdk/make/data/tzdata/zone.tab -index ee02519..535d1c9 100644 ---- a/jdk/make/data/tzdata/zone.tab -+++ b/jdk/make/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/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java b/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -index 215ad9f..d327baf 100644 ---- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -+++ b/jdk/src/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/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java b/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java -index 00e490e..75d4213 100644 ---- a/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java -+++ b/jdk/src/share/classes/sun/util/resources/de/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/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java b/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java -index aaaf4ec..97576bf 100644 ---- a/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java -+++ b/jdk/src/share/classes/sun/util/resources/es/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/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java b/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java -index 6415066..bcf05e9 100644 ---- a/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java -+++ b/jdk/src/share/classes/sun/util/resources/fr/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/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java b/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java -index dead599..951779d 100644 ---- a/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java -+++ b/jdk/src/share/classes/sun/util/resources/it/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/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java b/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java -index 0c104b5..c1dce59 100644 ---- a/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java -+++ b/jdk/src/share/classes/sun/util/resources/ja/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/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java b/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java -index 65efcf5..77cf2c4 100644 ---- a/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java -+++ b/jdk/src/share/classes/sun/util/resources/ko/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/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java b/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java -index b5f3acb..9b35f2b 100644 ---- a/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java -+++ b/jdk/src/share/classes/sun/util/resources/pt/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/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java b/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java -index d51762c..0e5be03 100644 ---- a/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java -+++ b/jdk/src/share/classes/sun/util/resources/sv/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/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java b/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java -index 1c4eef0..c7946f3 100644 ---- a/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java -+++ b/jdk/src/share/classes/sun/util/resources/zh/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/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java b/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java -index f83e2b8..cbc9e75 100644 ---- a/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java -+++ b/jdk/src/share/classes/sun/util/resources/zh/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/jdk/test/java/util/TimeZone/TimeZoneData/VERSION b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION -index 0cad939..f29d2d9 100644 ---- a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION -+++ b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION -@@ -1 +1 @@ --tzdata2022e -+tzdata2022f -diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt b/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt -index e3ce742..24cec5a 100644 ---- a/jdk/test/java/util/TimeZone/TimeZoneData/aliases.txt -+++ b/jdk/test/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/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt b/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt -index 2f2786f..a1cd41d 100644 ---- a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt -+++ b/jdk/test/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/jdk/test/sun/util/calendar/zi/tzdata/VERSION b/jdk/test/sun/util/calendar/zi/tzdata/VERSION -index b8cb36e..b8d9ae7 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/africa b/jdk/test/sun/util/calendar/zi/tzdata/africa -index e13899b..b4559cd 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/africa -+++ b/jdk/test/sun/util/calendar/zi/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 - 0:00 Morocco +00/+01 - -+# 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/jdk/test/sun/util/calendar/zi/tzdata/antarctica b/jdk/test/sun/util/calendar/zi/tzdata/antarctica -index 34c302e..792542b 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/antarctica -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/asia b/jdk/test/sun/util/calendar/zi/tzdata/asia -index f1771e4..8f1fcac 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/asia -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/australasia b/jdk/test/sun/util/calendar/zi/tzdata/australasia -index 019cd77..fbe3b8a 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/australasia -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/backward b/jdk/test/sun/util/calendar/zi/tzdata/backward -index 7765d99..1fb087a 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/backward -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/etcetera b/jdk/test/sun/util/calendar/zi/tzdata/etcetera -index 82ff6b4..8ae294f 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/etcetera -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/europe b/jdk/test/sun/util/calendar/zi/tzdata/europe -index 930cede..7b6aa13 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/europe -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/northamerica b/jdk/test/sun/util/calendar/zi/tzdata/northamerica -index ce4ee74..465e8c2 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/northamerica -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/southamerica b/jdk/test/sun/util/calendar/zi/tzdata/southamerica -index 3c0e0e2..982ad09 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/southamerica -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/zone.tab b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab -index ee02519..535d1c9 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab -+++ b/jdk/test/sun/util/calendar/zi/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) --- -1.8.3.1 diff --git a/8296241-tz-Update-Timezone-Data-to-2022e.patch b/8296241-tz-Update-Timezone-Data-to-2022e.patch deleted file mode 100644 index 699894c6664b1b5fdf2bf165939a65f6e7499bed..0000000000000000000000000000000000000000 --- a/8296241-tz-Update-Timezone-Data-to-2022e.patch +++ /dev/null @@ -1,826 +0,0 @@ -From d31b6120315ecc095ddffa7a5fb92c53bb70bc3b Mon Sep 17 00:00:00 2001 -From: eapen -Date: Wed, 30 Nov 2022 14:57:07 +0000 -Subject: [PATCH 08/33] I68TO2: 8296241: (tz) Update Timezone Data to 2022e ---- - jdk/make/data/tzdata/VERSION | 2 +- - jdk/make/data/tzdata/asia | 36 +++++++--- - jdk/make/data/tzdata/europe | 2 +- - jdk/make/data/tzdata/northamerica | 84 ++++++++++------------ - jdk/test/java/util/TimeZone/TimeZoneData/VERSION | 2 +- - .../util/TimeZone/TimeZoneData/displaynames.txt | 2 - - jdk/test/sun/util/calendar/zi/tzdata/VERSION | 2 +- - jdk/test/sun/util/calendar/zi/tzdata/asia | 36 +++++++--- - jdk/test/sun/util/calendar/zi/tzdata/europe | 2 +- - jdk/test/sun/util/calendar/zi/tzdata/northamerica | 84 ++++++++++------------ - 10 files changed, 135 insertions(+), 117 deletions(-) - -diff --git a/jdk/make/data/tzdata/VERSION b/jdk/make/data/tzdata/VERSION -index 889d0e6..b8cb36e 100644 ---- a/jdk/make/data/tzdata/VERSION -+++ b/jdk/make/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/jdk/make/data/tzdata/asia b/jdk/make/data/tzdata/asia -index 1dc7d34..f1771e4 100644 ---- a/jdk/make/data/tzdata/asia -+++ b/jdk/make/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/jdk/make/data/tzdata/europe b/jdk/make/data/tzdata/europe -index 9e0a538..930cede 100644 ---- a/jdk/make/data/tzdata/europe -+++ b/jdk/make/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/jdk/make/data/tzdata/northamerica b/jdk/make/data/tzdata/northamerica -index 114cef1..ce4ee74 100644 ---- a/jdk/make/data/tzdata/northamerica -+++ b/jdk/make/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/jdk/test/java/util/TimeZone/TimeZoneData/VERSION b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION -index 7147016..0cad939 100644 ---- a/jdk/test/java/util/TimeZone/TimeZoneData/VERSION -+++ b/jdk/test/java/util/TimeZone/TimeZoneData/VERSION -@@ -1 +1 @@ --tzdata2022d -+tzdata2022e -diff --git a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt b/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt -index b382395..2f2786f 100644 ---- a/jdk/test/java/util/TimeZone/TimeZoneData/displaynames.txt -+++ b/jdk/test/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/jdk/test/sun/util/calendar/zi/tzdata/VERSION b/jdk/test/sun/util/calendar/zi/tzdata/VERSION -index 889d0e6..b8cb36e 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/asia b/jdk/test/sun/util/calendar/zi/tzdata/asia -index 1dc7d34..f1771e4 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/asia -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/europe b/jdk/test/sun/util/calendar/zi/tzdata/europe -index 9e0a538..930cede 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/europe -+++ b/jdk/test/sun/util/calendar/zi/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/jdk/test/sun/util/calendar/zi/tzdata/northamerica b/jdk/test/sun/util/calendar/zi/tzdata/northamerica -index 114cef1..ce4ee74 100644 ---- a/jdk/test/sun/util/calendar/zi/tzdata/northamerica -+++ b/jdk/test/sun/util/calendar/zi/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 --- -1.8.3.1 diff --git a/Add-CMS-s-trim-test-cases-and-fix-failure.patch b/Add-CMS-s-trim-test-cases-and-fix-failure.patch new file mode 100644 index 0000000000000000000000000000000000000000..c12debf8359131803a535f8e0cb4e79490456f7f --- /dev/null +++ b/Add-CMS-s-trim-test-cases-and-fix-failure.patch @@ -0,0 +1,219 @@ +From 69b1d2f90f27a9158bc16d549dd0afc7a4e955a8 Mon Sep 17 00:00:00 2001 +From: d30023828 +Date: Sat, 28 Jan 2023 15:47:20 +0800 +Subject: [PATCH 1/6] Add CMS's trim test cases and fix failure + +DTS/AR: DTS2022120810426 +Summary: : Add CMS's trim test cases and fix failure +LLT: NA +Patch Type: huawei +Bug url: NA +--- + hotspot/test/gc/TestTrimNative.java | 77 ++++++++++++++++++++++------- + 1 file changed, 58 insertions(+), 19 deletions(-) + +diff --git a/hotspot/test/gc/TestTrimNative.java b/hotspot/test/gc/TestTrimNative.java +index 58d540527..e0ac7734b 100644 +--- a/hotspot/test/gc/TestTrimNative.java ++++ b/hotspot/test/gc/TestTrimNative.java +@@ -41,7 +41,7 @@ package gc; + /* + * @test id=fullgc-serial + * @summary Test that GCTrimNativeHeap works with Serial +- * @requires vm.gc=="Serial" ++ * @requires vm.gc=="Serial" | vm.gc == "null" + * @requires os.family=="linux" + * @modules java.base/jdk.internal.misc + * @library /testlibrary +@@ -51,17 +51,27 @@ package gc; + /* + * @test id=fullgc-parallel + * @summary Test that GCTrimNativeHeap works with Parallel +- * @requires vm.gc=="Parallel" ++ * @requires vm.gc=="Parallel" | vm.gc == "null" + * @requires os.family=="linux" + * @modules java.base/jdk.internal.misc + * @library /testlibrary + * @run driver gc.TestTrimNative test-fullgc parallel + */ + ++ /* ++ * @test id=fullgc-concMarkSweep ++ * @summary Test that GCTrimNativeHeap works with concMarkSweep ++ * @requires vm.gc=="ConcMarkSweep" | vm.gc=="null" ++ * @requires os.family=="linux" ++ * @modules java.base/jdk.internal.misc ++ * @library /testlibrary ++ * @run driver gc.TestTrimNative test-fullgc concMarkSweep ++ */ ++ + /* + * @test id=fullgc-g1 + * @summary Test that GCTrimNativeHeap works with G1 +- * @requires vm.gc=="G1" ++ * @requires vm.gc=="G1" | vm.gc == "null" + * @requires os.family=="linux" + * @modules java.base/jdk.internal.misc + * @library /testlibrary +@@ -75,17 +85,27 @@ package gc; + /* + * @test id=auto-parallel + * @summary Test that GCTrimNativeHeap works with Parallel +- * @requires vm.gc=="Parallel" ++ * @requires vm.gc=="Parallel" | vm.gc == "null" + * @requires os.family=="linux" + * @modules java.base/jdk.internal.misc + * @library /testlibrary + * @run driver gc.TestTrimNative test-auto parallel + */ + ++ /* ++ * @test id=auto-concMarkSweep ++ * @summary Test that GCTrimNativeHeap works with concMarkSweep ++ * @requires vm.gc=="ConcMarkSweep" | vm.gc == "null" ++ * @requires os.family=="linux" ++ * @modules java.base/jdk.internal.misc ++ * @library /testlibrary ++ * @run driver gc.TestTrimNative test-auto concMarkSweep ++ */ ++ + /* + * @test id=auto-g1 + * @summary Test that GCTrimNativeHeap works with G1 +- * @requires vm.gc=="G1" ++ * @requires vm.gc=="G1" | vm.gc == "null" + * @requires os.family=="linux" + * @modules java.base/jdk.internal.misc + * @library /testlibrary +@@ -100,17 +120,27 @@ package gc; + /* + * @test id=auto-high-interval-parallel + * @summary Test that a high GCTrimNativeHeapInterval effectively disables automatic trimming +- * @requires vm.gc=="Parallel" ++ * @requires vm.gc=="Parallel" | vm.gc == "null" + * @requires os.family=="linux" + * @modules java.base/jdk.internal.misc + * @library /testlibrary + * @run driver gc.TestTrimNative test-auto-high-interval parallel + */ + ++/* ++ * @test id=auto-high-interval-concMarkSweep ++ * @summary Test that a high GCTrimNativeHeapInterval effectively disables automatic trimming ++ * @requires vm.gc=="ConcMarkSweep" | vm.gc == "null" ++ * @requires os.family=="linux" ++ * @modules java.base/jdk.internal.misc ++ * @library /testlibrary ++ * @run driver gc.TestTrimNative test-auto-high-interval concMarkSweep ++ */ ++ + /* + * @test id=auto-high-interval-g1 + * @summary Test that a high GCTrimNativeHeapInterval effectively disables automatic trimming +- * @requires vm.gc=="G1" ++ * @requires vm.gc=="G1" | vm.gc == "null" + * @requires os.family=="linux" + * @modules java.base/jdk.internal.misc + * @library /testlibrary +@@ -124,17 +154,27 @@ package gc; + /* + * @test id=auto-zero-interval-parallel + * @summary Test that a GCTrimNativeHeapInterval=0 disables periodic trimming +- * @requires vm.gc=="Parallel" ++ * @requires vm.gc=="Parallel" | vm.gc == "null" + * @requires os.family=="linux" + * @modules java.base/jdk.internal.misc + * @library /testlibrary + * @run driver gc.TestTrimNative test-auto-zero-interval parallel + */ + ++/* ++ * @test id=auto-zero-interval-concMarkSweep ++ * @summary Test that a GCTrimNativeHeapInterval=0 disables periodic trimming ++ * @requires vm.gc=="ConcMarkSweep" | vm.gc == "null" ++ * @requires os.family=="linux" ++ * @modules java.base/jdk.internal.misc ++ * @library /testlibrary ++ * @run driver gc.TestTrimNative test-auto-zero-interval concMarkSweep ++ */ ++ + /* + * @test id=auto-zero-interval-g1 + * @summary Test that a GCTrimNativeHeapInterval=0 disables periodic trimming +- * @requires vm.gc=="G1" ++ * @requires vm.gc=="G1" | vm.gc == "null" + * @requires os.family=="linux" + * @modules java.base/jdk.internal.misc + * @library /testlibrary +@@ -196,20 +236,19 @@ public class TestTrimNative { + } + + enum GC { +- serial, parallel, g1, shenandoah, z; ++ serial, parallel, g1, concMarkSweep; + String getSwitchName() { + String s = name(); + return "-XX:+Use" + s.substring(0, 1).toUpperCase() + s.substring(1) + "GC"; + } +- boolean isZ() { return this == GC.z; } + boolean isSerial() { return this == GC.serial; } + boolean isParallel() { return this == GC.parallel; } + boolean isG1() { return this == GC.g1; } +- boolean isShenandoah() { return this == GC.shenandoah; } ++ boolean isConcMarkSweep() { return this == GC.concMarkSweep; } + } + + static private boolean usesNativeTrimmer(GC gc) { +- return gc.isG1() || gc.isParallel() || gc.isZ(); ++ return gc.isG1() || gc.isParallel() || gc.isConcMarkSweep(); + } + + static private final OutputAnalyzer runTestWithOptions(String[] extraOptions, String[] testArgs) throws Exception { +@@ -234,7 +273,7 @@ public class TestTrimNative { + /** + * Given JVM output, look for a log line that describes a successful negative trim in the megabyte range + * like this: +- * "[2.053s][debug][gc,trim] Trim native heap (retain size: 5120K): RSS+Swap: 271M->223M (-49112K), 2.834ms" ++ * "Trim native heap (retain size: 5120K): RSS+Swap: 271M->223M (-49112K), 2.834ms" + * (Note: we use the "properXXX" print routines, therefore units can differ) + * Check that the sum of all trim log lines comes to a total RSS reduction in the MB range + * @param output +@@ -244,7 +283,7 @@ public class TestTrimNative { + private final static void parseOutputAndLookForNegativeTrim(OutputAnalyzer output, int minExpected, int maxExpected) { + output.reportDiagnosticSummary(); + List lines = output.asLines(); +- Pattern pat = Pattern.compile(".*\\[gc,trim\\] Trim native heap.*RSS\\+Swap: (\\d+)([KMB])->(\\d+)([KMB]).*"); ++ Pattern pat = Pattern.compile(".*Trim native heap.*RSS\\+Swap: (\\d+)([KMB])->(\\d+)([KMB]).*"); + int numTrimsFound = 0; + long rssReductionTotal = 0; + for (String line : lines) { +@@ -270,7 +309,7 @@ public class TestTrimNative { + // This is very fuzzy. We malloced X, free'd X, trimmed, measured the combined effect of all reductions. + // This does not take into effect mallocs or frees that may happen concurrently. But we expect to see *some* + // reduction somewhere. Test with a fudge factor. +- float fudge = 0.8f; ++ float fudge = 0.25f; + long expectedMinimalReduction = (long) (totalAllocationsSize * fudge); + if (rssReductionTotal < expectedMinimalReduction) { + throw new RuntimeException("We did not see the expected RSS reduction in the UL log. Expected (with fudge)" + +@@ -293,8 +332,8 @@ public class TestTrimNative { + // started and shut down properly. + if (usesNativeTrimmer(gc)) { + output.shouldContain("NativeTrimmer started"); +- output.shouldContain("NativeTrimmer paused"); +- output.shouldContain("NativeTrimmer unpaused"); ++ //Only debug version JDK contains this item: output.shouldContain("NativeTrimmer paused"); ++ //Only debug version JDK contains this item: output.shouldContain("NativeTrimmer unpaused"); + output.shouldContain("NativeTrimmer stopped"); + } else { + output.shouldNotContain("NativeTrimmer"); +@@ -432,4 +471,4 @@ public class TestTrimNative { + + } + +-} +\ No newline at end of file ++} +-- +2.22.0 + diff --git a/Disable-cds-on-x86-32.patch b/Disable-cds-on-x86-32.patch new file mode 100644 index 0000000000000000000000000000000000000000..5f0e220b3a17bf695096e89ca252774f1acb3335 --- /dev/null +++ b/Disable-cds-on-x86-32.patch @@ -0,0 +1,47 @@ +From d7ff4af3e604f4763815fde1753b38c115b23beb Mon Sep 17 00:00:00 2001 +From: hedongbo +Date: Thu, 2 Feb 2023 11:53:48 +0000 +Subject: [PATCH 4/6] Disable cds on x86-32 + +DTS/AR: DTS2023020203620 +Summary: :Disable cds on x86-32 +LLT: NA +Patch Type: huawei +Bug url: NA +--- + common/autoconf/generated-configure.sh | 4 ++++ + common/autoconf/jdk-options.m4 | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh +index a6ba1ac93..b3a9640f1 100644 +--- a/common/autoconf/generated-configure.sh ++++ b/common/autoconf/generated-configure.sh +@@ -14729,6 +14729,10 @@ $as_echo_n "checking if a default CDS archive should be generated... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, not possible with cross compilation" >&5 + $as_echo "no, not possible with cross compilation" >&6; } + BUILD_CDS_ARCHIVE="false" ++ elif test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, not possible with x32" >&5 ++$as_echo "no, not possible with x32" >&6; } ++ BUILD_CDS_ARCHIVE="false" + elif test "x$enable_cds_archive" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, forced" >&5 + $as_echo "yes, forced" >&6; } +diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 +index b9f251750..e2f7dc907 100644 +--- a/common/autoconf/jdk-options.m4 ++++ b/common/autoconf/jdk-options.m4 +@@ -814,6 +814,9 @@ AC_DEFUN_ONCE([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE], + if test "x$COMPILE_TYPE" = "xcross"; then + AC_MSG_RESULT([no, not possible with cross compilation]) + BUILD_CDS_ARCHIVE="false" ++ elif test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then ++ AC_MSG_RESULT([no, not possible with cross x32]) ++ BUILD_CDS_ARCHIVE="false" + elif test "x$enable_cds_archive" = "xyes"; then + AC_MSG_RESULT([yes, forced]) + BUILD_CDS_ARCHIVE="true" +-- +2.22.0 + diff --git a/Disable-no-compressedOop-cds-on-x86-32.patch b/Disable-no-compressedOop-cds-on-x86-32.patch new file mode 100644 index 0000000000000000000000000000000000000000..47f5eaa105f4ec4ac6e74697a03c3ecd715d15fb --- /dev/null +++ b/Disable-no-compressedOop-cds-on-x86-32.patch @@ -0,0 +1,67 @@ +From dd8c7151af05146c8fbc2b5d0dd94e38db6129e9 Mon Sep 17 00:00:00 2001 +From: xiezhaokun +Date: Thu, 2 Feb 2023 15:52:21 +0800 +Subject: [PATCH 5/6] Disable no compressedOop cds on x86-32 + +DTS/AR: DTS2023020203620 +Summary: : Disable no compressedOop cds on x86-32 +LLT: NA +Patch Type:Huawei +Bug url: NA +--- + common/autoconf/generated-configure.sh | 4 ---- + common/autoconf/jdk-options.m4 | 3 --- + jdk/make/BuildJdk.gmk | 4 ++++ + 3 files changed, 4 insertions(+), 7 deletions(-) + +diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh +index b3a9640f1..a6ba1ac93 100644 +--- a/common/autoconf/generated-configure.sh ++++ b/common/autoconf/generated-configure.sh +@@ -14729,10 +14729,6 @@ $as_echo_n "checking if a default CDS archive should be generated... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, not possible with cross compilation" >&5 + $as_echo "no, not possible with cross compilation" >&6; } + BUILD_CDS_ARCHIVE="false" +- elif test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, not possible with x32" >&5 +-$as_echo "no, not possible with x32" >&6; } +- BUILD_CDS_ARCHIVE="false" + elif test "x$enable_cds_archive" = "xyes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, forced" >&5 + $as_echo "yes, forced" >&6; } +diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 +index e2f7dc907..b9f251750 100644 +--- a/common/autoconf/jdk-options.m4 ++++ b/common/autoconf/jdk-options.m4 +@@ -814,9 +814,6 @@ AC_DEFUN_ONCE([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE], + if test "x$COMPILE_TYPE" = "xcross"; then + AC_MSG_RESULT([no, not possible with cross compilation]) + BUILD_CDS_ARCHIVE="false" +- elif test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then +- AC_MSG_RESULT([no, not possible with cross x32]) +- BUILD_CDS_ARCHIVE="false" + elif test "x$enable_cds_archive" = "xyes"; then + AC_MSG_RESULT([yes, forced]) + BUILD_CDS_ARCHIVE="true" +diff --git a/jdk/make/BuildJdk.gmk b/jdk/make/BuildJdk.gmk +index 67074568d..ac87d42cd 100644 +--- a/jdk/make/BuildJdk.gmk ++++ b/jdk/make/BuildJdk.gmk +@@ -106,10 +106,14 @@ images: + ifeq ($(BUILD_CDS_ARCHIVE), true) + echo Creating CDS archive for jdk image + $(JDK_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M -XX:ParallelGCThreads=1 -Xint $(LOG_INFO) ++ ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) + $(JDK_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M -XX:ParallelGCThreads=1 -Xint -XX:-UseCompressedOops $(LOG_INFO) ++ endif + echo Creating CDS archive for jre image + $(JRE_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M -XX:ParallelGCThreads=1 -Xint $(LOG_INFO) ++ ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) + $(JDK_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M -XX:ParallelGCThreads=1 -Xint -XX:-UseCompressedOops $(LOG_INFO) ++ endif + endif + + +-- +2.22.0 + diff --git a/Test8167409.sh-fails-to-run-with-32bit-jdk-on-64bit-.patch b/Test8167409.sh-fails-to-run-with-32bit-jdk-on-64bit-.patch index ec84fc1843006ccc32570c53ff8ddd3b426fd5b3..df845fd0af5795e9a84ced64e763a9f26a8492da 100644 --- a/Test8167409.sh-fails-to-run-with-32bit-jdk-on-64bit-.patch +++ b/Test8167409.sh-fails-to-run-with-32bit-jdk-on-64bit-.patch @@ -10,32 +10,27 @@ LLT: jdk8u/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409. 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh b/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh -index 81695e758..1108aaf93 100644 +index e2de2d3e55..7d0431980e 100644 --- a/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh +++ b/hotspot/test/compiler/criticalnatives/argumentcorruption/Test8167409.sh -@@ -61,19 +61,24 @@ case "$OS" in - exit 0; +@@ -62,6 +62,11 @@ case "$OS" in ;; esac -+ + +${TESTJAVA}${FS}bin${FS}java -XshowSettings 2>&1 | grep sun.arch.data.model | grep 32 +if [ 0 -eq $? ] ; then + M32="-m32" +fi - ++ # CriticalJNINatives is not supported for aarch64 if [ $VM_CPU == "aarch64" ]; then echo "Test Passed" - exit 0; - fi - - THIS_DIR=. - +@@ -73,7 +78,7 @@ THIS_DIR=. cp ${TESTSRC}${FS}*.java ${THIS_DIR} ${TESTJAVA}${FS}bin${FS}javac *.java - --$cc_cmd -fPIC -shared -o libCNCheckLongArgs.so \ -+$cc_cmd ${M32} -fPIC -shared -o libCNCheckLongArgs.so \ + +-$cc_cmd ${CFLAGBITS} -fPIC -shared -o libCNCheckLongArgs.so \ ++$cc_cmd ${M32} ${CFLAGBITS} -fPIC -shared -o libCNCheckLongArgs.so \ -I${TESTJAVA}${FS}include -I${TESTJAVA}${FS}include${FS}linux \ ${TESTSRC}${FS}libCNCheckLongArgs.c diff --git a/The-code-style-is-fixed-and-test-cases-are-added.patch b/The-code-style-is-fixed-and-test-cases-are-added.patch index 9219f3dddf289dd403c4ed554b9269d2494aa417..d4e80cdc987fa573f6b71dee95d76d1018dc1001 100644 --- a/The-code-style-is-fixed-and-test-cases-are-added.patch +++ b/The-code-style-is-fixed-and-test-cases-are-added.patch @@ -16,7 +16,6 @@ Subject: The code style is fixed and test cases are added hotspot/src/share/vm/oops/cpCache.cpp | 1 - hotspot/src/share/vm/oops/instanceKlass.cpp | 4 - hotspot/test/runtime/6929067/Test6929067.sh | 2 +- - .../runtime/InitialThreadOverflow/testme.sh | 2 +- hotspot/test/runtime/Thread/StopAtExit.java | 119 ++++ jdk/make/profile-rtjar-includes.txt | 7 +- .../classes/java/io/ObjectInputStream.java | 4 +- @@ -25,7 +24,7 @@ Subject: The code style is fixed and test cases are added .../security/openssl/kae_cipher_rsa.c | 3 +- .../security/openssl/kae_keyagreement_dh.c | 4 +- .../openssl/RSAKeyPairGeneratorBenchmark.java | 2 +- - 23 files changed, 194 insertions(+), 668 deletions(-) + 22 files changed, 194 insertions(+), 668 deletions(-) create mode 100644 hotspot/test/runtime/Thread/StopAtExit.java diff --git a/hotspot/src/share/vm/cds/archiveBuilder.hpp b/hotspot/src/share/vm/cds/archiveBuilder.hpp @@ -243,19 +242,6 @@ index 438a287c..c78e1787 100644 fi # VM type: need to know server or client -diff --git a/hotspot/test/runtime/InitialThreadOverflow/testme.sh b/hotspot/test/runtime/InitialThreadOverflow/testme.sh -index ffd7d6e3..cf48c2fe 100644 ---- a/hotspot/test/runtime/InitialThreadOverflow/testme.sh -+++ b/hotspot/test/runtime/InitialThreadOverflow/testme.sh -@@ -52,7 +52,7 @@ fi - CFLAGS="-m${VM_BITS}" - - if [ "${VM_CPU}" == "aarch64" ]; then -- CFLAGS="-mabi=lp64" -+ CFLAGS="" - fi - - LD_LIBRARY_PATH=.:${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE}:/usr/lib:$LD_LIBRARY_PATH diff --git a/hotspot/test/runtime/Thread/StopAtExit.java b/hotspot/test/runtime/Thread/StopAtExit.java new file mode 100644 index 00000000..8d6344a6 diff --git a/add-missing-test-case.patch b/add-missing-test-case.patch index ef14a15d5ccea62fb9bef0a245a41ce851f6d82e..6b220f40d59fe0bf95794d290165e78d8a635a26 100644 --- a/add-missing-test-case.patch +++ b/add-missing-test-case.patch @@ -5,10 +5,9 @@ Subject: [PATCH 1/3] add missing test case --- .../java/testlibrary/OutputAnalyzer.java | 2 +- .../lookup/TestDefenderMethodLookup.java | 2 + - .../templates/SSLSocketSSLEngineTemplate.java | 17 +++++++- .../com/huawei/openjdk/TestAdaptiveHeap.java | 42 +++++++++++++++++++ version.txt | 1 + - 9 files changed, 61 insertions(+), 3 deletions(-) + 8 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 test/jdk/com/huawei/openjdk/TestAdaptiveHeap.java create mode 100644 version.txt @@ -38,39 +37,6 @@ index 2ee40289..8ab268b5 100644 * @run testng/othervm test.java.lang.invoke.lookup.TestDefenderMethodLookup */ -diff --git a/jdk/test/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java b/jdk/test/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java -index 54b4e3c6..16af82f0 100644 ---- a/jdk/test/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java -+++ b/jdk/test/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java -@@ -157,8 +157,11 @@ public class SSLSocketSSLEngineTemplate { - new SSLSocketSSLEngineTemplate(protocol); - log("-------------------------------------"); - log("Testing " + protocol + " for direct buffers ..."); -- test.runTest(true); -- -+ -+ test.runTest(true); -+ // invalid session -+ -+ test.invalidSession(); - log("---------------------------------------"); - log("Testing " + protocol + " for indirect buffers ..."); - test.runTest(false); -@@ -529,4 +532,14 @@ public class SSLSocketSSLEngineTemplate { - } - } - } -+ -+ /* -+ * invalid session -+ */ -+ private void invalidSession() { -+ if (sslSocket != null && sslSocket.getSession() != null) { -+ sslSocket.getSession().invalidate(); -+ } -+ } - } -+ diff --git a/test/jdk/com/huawei/openjdk/TestAdaptiveHeap.java b/test/jdk/com/huawei/openjdk/TestAdaptiveHeap.java new file mode 100644 index 00000000..bd22ba83 @@ -125,7 +91,7 @@ index 00000000..9b614024 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ -+8.352.8.0.13 ++8.362.9.0.13 -- 2.23.0 diff --git a/fix-SUSE-x86_32-build-failure.patch b/fix-SUSE-x86_32-build-failure.patch new file mode 100644 index 0000000000000000000000000000000000000000..1dbee201c44d0e81f5937189bd064feb748d055c --- /dev/null +++ b/fix-SUSE-x86_32-build-failure.patch @@ -0,0 +1,76 @@ +From 27eea716e3d9a1a67d82ea67740f477be1e5a112 Mon Sep 17 00:00:00 2001 +From: liuyulong +Date: Wed, 1 Feb 2023 16:23:44 +0800 +Subject: [PATCH 3/6] fix SUSE x86_32 build failure + +DTS/AR: DTS2023013108238 +Summary: : fix SUSE x86_32 build failure +LLT: NA +Patch Type: huawei +Bug url: NA +--- + hotspot/src/share/vm/utilities/elfFile.hpp | 41 +++++++++++----------- + 1 file changed, 20 insertions(+), 21 deletions(-) + +diff --git a/hotspot/src/share/vm/utilities/elfFile.hpp b/hotspot/src/share/vm/utilities/elfFile.hpp +index 3277a40e0..1419d7c63 100644 +--- a/hotspot/src/share/vm/utilities/elfFile.hpp ++++ b/hotspot/src/share/vm/utilities/elfFile.hpp +@@ -36,27 +36,6 @@ + + #ifdef _LP64 + +-#ifdef ASSERT +-// Helper macros to print different log levels during DWARF parsing +-#define DWARF_LOG_SUMMARY(format, ...) DWARF_LOG_WITH_LEVEL(1, format, ##__VA_ARGS__) // Same level as error logging +-#define DWARF_LOG_ERROR(format, ...) DWARF_LOG_WITH_LEVEL(1, format, ##__VA_ARGS__) +-#define DWARF_LOG_INFO(format, ...) DWARF_LOG_WITH_LEVEL(2, format, ##__VA_ARGS__) +-#define DWARF_LOG_DEBUG(format, ...) DWARF_LOG_WITH_LEVEL(3, format, ##__VA_ARGS__) +-#define DWARF_LOG_TRACE(format, ...) DWARF_LOG_WITH_LEVEL(4, format, ##__VA_ARGS__) +- +-#define DWARF_LOG_WITH_LEVEL(level, format, ...) \ +- if (TraceDwarfLevel >= level) { \ +- tty->print("[dwarf] "); \ +- tty->print_cr(format, ##__VA_ARGS__); \ +- } +-#else +-#define DWARF_LOG_SUMMARY(format, ...) +-#define DWARF_LOG_ERROR(format, ...) +-#define DWARF_LOG_INFO(format, ...) +-#define DWARF_LOG_DEBUG(format, ...) +-#define DWARF_LOG_TRACE(format, ...) +-#endif +- + typedef Elf64_Half Elf_Half; + typedef Elf64_Word Elf_Word; + typedef Elf64_Off Elf_Off; +@@ -93,6 +72,26 @@ typedef Elf32_Sym Elf_Sym; + #include "memory/allocation.hpp" + #include "utilities/decoder.hpp" + ++#ifdef ASSERT ++// Helper macros to print different log levels during DWARF parsing ++#define DWARF_LOG_SUMMARY(format, ...) DWARF_LOG_WITH_LEVEL(1, format, ##__VA_ARGS__) // Same level as error logging ++#define DWARF_LOG_ERROR(format, ...) DWARF_LOG_WITH_LEVEL(1, format, ##__VA_ARGS__) ++#define DWARF_LOG_INFO(format, ...) DWARF_LOG_WITH_LEVEL(2, format, ##__VA_ARGS__) ++#define DWARF_LOG_DEBUG(format, ...) DWARF_LOG_WITH_LEVEL(3, format, ##__VA_ARGS__) ++#define DWARF_LOG_TRACE(format, ...) DWARF_LOG_WITH_LEVEL(4, format, ##__VA_ARGS__) ++ ++#define DWARF_LOG_WITH_LEVEL(level, format, ...) \ ++ if (TraceDwarfLevel >= level) { \ ++ tty->print("[dwarf] "); \ ++ tty->print_cr(format, ##__VA_ARGS__); \ ++ } ++#else ++#define DWARF_LOG_SUMMARY(format, ...) ++#define DWARF_LOG_ERROR(format, ...) ++#define DWARF_LOG_INFO(format, ...) ++#define DWARF_LOG_DEBUG(format, ...) ++#define DWARF_LOG_TRACE(format, ...) ++#endif + + class ElfStringTable; + class ElfSymbolTable; +-- +2.22.0 + diff --git a/fix-testme-Test6929067-run-faild.patch b/fix-testme-Test6929067-run-faild.patch index c357721526ab12da46861ff392e730261cd53324..b2dc1b26ea0bcba16c7a0e9ca8bdea5a506d8f49 100755 --- a/fix-testme-Test6929067-run-faild.patch +++ b/fix-testme-Test6929067-run-faild.patch @@ -23,27 +23,27 @@ index 90b96d5e9..438a287c8 100644 ./invoke exit $? diff --git a/hotspot/test/runtime/InitialThreadOverflow/testme.sh b/hotspot/test/runtime/InitialThreadOverflow/testme.sh -index ee8d35ede..ffd7d6e3d 100644 +index abafeef4..f95a2f2c 100644 --- a/hotspot/test/runtime/InitialThreadOverflow/testme.sh +++ b/hotspot/test/runtime/InitialThreadOverflow/testme.sh -@@ -51,6 +51,10 @@ fi - - CFLAGS="-m${VM_BITS}" - +@@ -49,6 +49,10 @@ if [ "x$gcc_cmd" = "x" ]; then + exit 0; + fi + +if [ "${VM_CPU}" == "aarch64" ]; then -+ CFLAGS="-mabi=lp64" ++ CFLAGS="" +fi + LD_LIBRARY_PATH=.:${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE}:/usr/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH - -@@ -67,7 +71,7 @@ echo "Compilation flag: ${COMP_FLAG}" - $gcc_cmd -DLINUX ${CFLAGS} -o invoke \ + +@@ -64,7 +68,7 @@ cp ${TESTCLASSES}${FS}DoOverflow.class . + $gcc_cmd -DLINUX ${CFLAGBITS} -o invoke \ -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \ -L${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE} \ - -ljvm -lpthread invoke.cxx + invoke.cxx -ljvm -lpthread - + ./invoke exit $? -- diff --git a/g1gc-numa-aware-Implementation.patch b/g1gc-numa-aware-Implementation.patch index 844fe299dfb2c16ca3a042a68c7b96aefcc83b2f..56dfe67c8974cf0cce0b847fb4a05167f78da6fa 100755 --- a/g1gc-numa-aware-Implementation.patch +++ b/g1gc-numa-aware-Implementation.patch @@ -3305,7 +3305,7 @@ new file mode 100644 index 000000000..c5322849e --- /dev/null +++ b/hotspot/test/gc/g1/TestG1NUMATouchRegions.java -@@ -0,0 +1,245 @@ +@@ -0,0 +1,243 @@ +/* + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -3329,25 +3329,23 @@ index 000000000..c5322849e + * questions. + */ + -+package gc.g1; ++package gc; + +/** + * @test TestG1NUMATouchRegions + * @summary Ensure the bottom of the given heap regions are properly touched with requested NUMA id. + * @key gc -+ * @requires vm.gc.G1 + * @requires os.family == "linux" -+ * @library /test/lib ++ * @library /testlibrary /testlibrary/whitebox + * @modules java.base/jdk.internal.misc + * java.management + * @build sun.hotspot.WhiteBox + * @run driver ClassFileInstaller sun.hotspot.WhiteBox -+ * @run main/othervm -XX:+UseG1GC -Xbootclasspath/a:. -XX:+UseNUMA -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI gc.g1.TestG1NUMATouchRegions ++ * @run main/othervm -XX:+UseG1GC -Xbootclasspath/a:. -XX:+UseNUMA -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI gc.TestG1NUMATouchRegions + */ + +import java.util.LinkedList; -+import jdk.test.lib.process.OutputAnalyzer; -+import jdk.test.lib.process.ProcessTools; ++import com.oracle.java.testlibrary.*; +import sun.hotspot.WhiteBox; + +public class TestG1NUMATouchRegions { diff --git a/jdk8u-jdk8u352-b08.tar.xz b/jdk8u-jdk8u362-b09.tar.xz similarity index 82% rename from jdk8u-jdk8u352-b08.tar.xz rename to jdk8u-jdk8u362-b09.tar.xz index 19d13e4a3511e06ec5acd8548c55b253065cffb0..6d219adbd6a9d9b457afd87672fc03a9178dcab8 100644 Binary files a/jdk8u-jdk8u352-b08.tar.xz and b/jdk8u-jdk8u362-b09.tar.xz differ diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index 647bac7f8150d1d41abb9f35a0d22585b8a38905..b53e6d0b89a27efc954ebb91548efb26f91f371f 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -146,13 +146,13 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global repo jdk8u -%global revision jdk8u352-b08 +%global revision jdk8u362-b09 %global full_revision %{repo}-%{revision} # Define IcedTea version used for SystemTap tapsets and desktop files %global icedteaver 3.15.0 -%global updatever 352 -%global buildver b08 +%global updatever 362 +%global buildver b09 # priority must be 7 digits in total. The expression is workarounding tip %global priority 1800%{updatever} @@ -916,7 +916,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 6 +Release: 2 # 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 @@ -1129,7 +1129,6 @@ Patch243: Fix-compile-and-runtime-failures-for-minimal1-versio.patch Patch244: fix_X509TrustManagerImpl_symantec_distrust.patch Patch245: change-sa-jdi.jar-make-file-for-BEP.PATCH Patch246: 7092821-java.security.Provider.getService-is-synchro.patch -Patch248: 8067941-TESTBUG-Fix-tests-for-OS-with-64K-page-size.patch # 8u342 Patch249: Improve_AlgorithmConstraints_checkAlgorithm_performance.patch @@ -1143,7 +1142,6 @@ Patch256: 8202951-Support-default-jsa.patch Patch257: 8200332-Improve-GCM-counting.patch Patch258: dynamic-cds-_header-and-_fd-handles-are-not-free.patch Patch259: fix-dumped-heap-using-jhat-parsing-to-appear-failed-to-resolve-object-id-warning-message.patch -Patch260: 8159720-Failure-of-C2-compilation-with-tiered-preven.patch Patch261: revert-fPIC-and-security-compilation-flag-on.patch Patch262: add-configuration-option-of-huawei-internal-version-shown-in-release-file.patch Patch263: The-code-style-is-fixed-and-test-cases-are-added.patch @@ -1155,9 +1153,6 @@ Patch266: 8065895-Synchronous-signals-during-error-reporting-may-terminate-or-ha Patch267: Huawei-fix-windows-build-Dynamic-CDS-failure.patch Patch268: 8296480-Fix-the-problem-that-the-TestPolicy.java-cas.patch Patch269: 8296485-BuildEEBasicConstraints.java-test-fails-with.patch -Patch270: 8294357-tz-Update-Timezone-Data-to-2022d.patch -Patch271: 8296241-tz-Update-Timezone-Data-to-2022e.patch -Patch272: 8296108-tz-Update-Timezone-Data-to-2022f.patch Patch273: 8257695-linux-Add-process-memory-information-to-hs-e.patch Patch274: 8261167-print_process_memory_info-add-a-close-call-a.patch Patch275: 8268893-jcmd-to-trim-the-glibc-heap.patch @@ -1182,6 +1177,13 @@ Patch293: 8140594-Various-minor-code-improvements-compiler.patch Patch294: Fix-the-crash-that-occurs-when-the-process-exits-due.patch Patch295: Fix-AsyncGCLog-s-content-consistent-bug.patch +# 8u362 +Patch296: 8178968-AArch64-Remove-non-standard-code-cache-size.patch +Patch297: 8185736-missing-default-exception-handler-in-calls-t.patch +Patch298: Add-CMS-s-trim-test-cases-and-fix-failure.patch +Patch299: Disable-cds-on-x86-32.patch +Patch300: Disable-no-compressedOop-cds-on-x86-32.patch +Patch301: fix-SUSE-x86_32-build-failure.patch ############################################# # @@ -1654,7 +1656,6 @@ pushd %{top_level_dir_name} %patch244 -p1 %patch245 -p1 %patch246 -p1 -%patch248 -p1 %patch249 -p1 %patch250 -p1 %patch251 -p1 @@ -1666,7 +1667,6 @@ pushd %{top_level_dir_name} %patch257 -p1 %patch258 -p1 %patch259 -p1 -%patch260 -p1 %patch261 -p1 %patch262 -p1 %patch263 -p1 @@ -1676,9 +1676,6 @@ pushd %{top_level_dir_name} %patch267 -p1 %patch268 -p1 %patch269 -p1 -%patch270 -p1 -%patch271 -p1 -%patch272 -p1 %patch273 -p1 %patch274 -p1 %patch275 -p1 @@ -1702,6 +1699,12 @@ pushd %{top_level_dir_name} %patch293 -p1 %patch294 -p1 %patch295 -p1 +%patch296 -p1 +%patch297 -p1 +%patch298 -p1 +%patch299 -p1 +%patch300 -p1 +%patch301 -p1 popd # System library fixes @@ -2320,7 +2323,36 @@ require "copy_jdk_configs.lua" %endif %changelog -* Wed Jan 11 2023 eapen - 1:1.8.0.352-b08.6 +* Wed Feb 15 2023 kuenking111 - 1:1.8.0.362-b09.2 +- add Add-CMS-s-trim-test-cases-and-fix-failure.patch +- add Disable-cds-on-x86-32.patch +- add Disable-no-compressedOop-cds-on-x86-32.patch +- add fix-SUSE-x86_32-build-failure.patch + +* Mon Jan 30 2023 kuenking111 - 1:1.8.0.362-b09.1 +- add 8178968-AArch64-Remove-non-standard-code-cache-size.patch +- add 8185736-missing-default-exception-handler-in-calls-t.patch + +* Sat Jan 28 2023 kuenking111 - 1:1.8.0.362-b09.0 +- modified 6858051-Create-GC-worker-threads-dynamically.patch +- modified 7092821-java.security.Provider.getService-is-synchro.patch +- deleted 8067941-TESTBUG-Fix-tests-for-OS-with-64K-page-size.patch +- deleted 8159720-Failure-of-C2-compilation-with-tiered-preven.patch +- modified 8166253.patch +- modified 8196485.patch +- modified 8200720-Print-additional-information-in-thread-dump-.patch +- modified 8293114-GC-should-trim-the-native-heap-and-bug-fix.patch +- deleted 8294357-tz-Update-Timezone-Data-to-2022d.patch +- deleted 8296108-tz-Update-Timezone-Data-to-2022f.patch +- deleted 8296241-tz-Update-Timezone-Data-to-2022e.patch +- modified Test8167409.sh-fails-to-run-with-32bit-jdk-on-64bit-.patch +- modified The-code-style-is-fixed-and-test-cases-are-added.patch +- modified add-missing-test-case.patch +- modified fix-testme-Test6929067-run-faild.patch +- modified g1gc-numa-aware-Implementation.patch +- upgrade to jdk8u362-b09 + +* Wed Jan 11 2023 eapen - 1:1.8.0.352-b08.5 - add 8296480-Fix-the-problem-that-the-TestPolicy.java-cas.patch - add 8296485-BuildEEBasicConstraints.java-test-fails-with.patch - add 8294357-tz-Update-Timezone-Data-to-2022d.patch @@ -2350,9 +2382,6 @@ require "copy_jdk_configs.lua" - add Fix-the-crash-that-occurs-when-the-process-exits-due.patch - add Fix-AsyncGCLog-s-content-consistent-bug.patch -* Wed Dec 14 2022 DXwangg - 1:1.8.0.352-b08.5 -- downgrade copy-jdk-configs from 3.9 to 3.3 in Requires - * Tue Oct 25 2022 kuenking111 - 1:1.8.0.352-b08.4 - add Huawei-fix-windows-build-Dynamic-CDS-failure.patch @@ -2502,7 +2531,7 @@ require "copy_jdk_configs.lua" - deleted Delete-expired-certificate-globalsignr2ca.patch - deleted inline-optimize-for-aarch64.patch -* Tue Jan 05 2021 noah - 1:1.8.0.312-b07.11 +* Wed Jan 05 2022 noah - 1:1.8.0.312-b07.11 - adapted to newst cjc to fix issue with rpm 4.17 * Tue Dec 21 2021 kuenking111 - 1:1.8.0.312-b07.10 @@ -2648,7 +2677,7 @@ require "copy_jdk_configs.lua" * Fri May 21 2021 kuenking111 - 1:1.8.0.292-b10.1 - add 8247691_incorrect_handling_of_VM_exceptions_in_C1_deopt_stub.patch -* Tue May 18 2021 eapen - 1:1.8.0.292-b10.0 +* Wed May 19 2021 eapen - 1:1.8.0.292-b10.0 - update to jdk8u292-b10 - split sync-patch to multi patches diff --git a/tapsets-icedtea-3.15.0.tar.xz b/tapsets-icedtea-3.15.0.tar.xz old mode 100755 new mode 100644