Update to jdk-11.0.18+1
Update release notes to 11.0.18+1 Switch to EA mode for 11.0.18 pre-release builds. Drop local copies of JDK-8294357 & JDK-8295173 now upstream contains tzdata 2022e Drop local copy of JDK-8275535 which is finally upstream Related: rhbz#2150197
This commit is contained in:
parent
6f5a588379
commit
2d92e384b0
1
.gitignore
vendored
1
.gitignore
vendored
@ -110,3 +110,4 @@
|
||||
/openjdk-jdk11u-jdk-11.0.17+1-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.17+7-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.17+8-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.18+1-4curve.tar.xz
|
||||
|
164
NEWS
164
NEWS
@ -3,10 +3,172 @@ Key:
|
||||
JDK-X - https://bugs.openjdk.java.net/browse/JDK-X
|
||||
CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
|
||||
|
||||
New in release OpenJDK 11.0.18 (2023-01-17):
|
||||
=============================================
|
||||
Live versions of these release notes can be found at:
|
||||
* https://bit.ly/openjdk11018
|
||||
* https://builds.shipilev.net/backports-monitor/release-notes-11.0.18.html
|
||||
|
||||
* Other changes
|
||||
- JDK-4819544: SwingSet2 JTable Demo throws NullPointerException
|
||||
- JDK-6782021: It is not possible to read local computer certificates with the SunMSCAPI provider
|
||||
- JDK-6829250: Reg test: java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java fails in Windows
|
||||
- JDK-7001973: java/awt/Graphics2D/CopyAreaOOB.java fails
|
||||
- JDK-8028998: [TEST_BUG] [macosx] java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java failed
|
||||
- JDK-8030121: java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java fails
|
||||
- JDK-8079267: [TEST_BUG] Test java/awt/Frame/MiscUndecorated/RepaintTest.java fails
|
||||
- JDK-8129827: [TEST_BUG] Test java/awt/Robot/RobotWheelTest/RobotWheelTest.java fails
|
||||
- JDK-8159599: [TEST_BUG] java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java
|
||||
- JDK-8169187: [macosx] Aqua: java/awt/image/multiresolution/MultiresolutionIconTest.java
|
||||
- JDK-8172269: When checking the default behaviour for a scroll tab layout and checking the 'opaque' checkbox, the area behind tabs is not red.
|
||||
- JDK-8193942: Regression automated test '/open/test/jdk/javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java' fails
|
||||
- JDK-8194126: Regression automated Test '/open/test/jdk/javax/swing/JColorChooser/Test7194184.java' fails
|
||||
- JDK-8198343: Test java/awt/print/PrinterJob/TestPgfmtSetMPA.java may fail w/o printer
|
||||
- JDK-8206125: [windows] cannot pass relative path to --with-boot-jdk
|
||||
- JDK-8210047: some pages contain content outside of landmark region
|
||||
- JDK-8211002: test/jdk/java/lang/Math/PowTests.java skips testing for non-corner-case values
|
||||
- JDK-8212096: javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java failed intermittently due to SSLException: Tag mismatch
|
||||
- JDK-8213239: Configure cannot handle command overrides with arguments
|
||||
- JDK-8215571: jdb does not include jdk.* in the default class filter
|
||||
- JDK-8217032: Check pandoc capabilities in configure
|
||||
- JDK-8222251: preflow visitor is not visiting lambda expressions
|
||||
- JDK-8227179: Test for new gc+metaspace=info output format
|
||||
- JDK-8227651: Tests fail with SSLProtocolException: Input record too big
|
||||
- JDK-8228672: [TESTBUG] gc/metaspace/TestSizeTransitions.java fails on 32-bit platforms
|
||||
- JDK-8233557: [TESTBUG] DoubleClickTitleBarTest.java fails on macOs
|
||||
- JDK-8233558: [TESTBUG] WindowOwnedByEmbeddedFrameTest.java fails on macos
|
||||
- JDK-8233565: [TESTBUG] NullModalityDialogTest.java fails on MacOS
|
||||
- JDK-8233648: [TESTBUG] DefaultMenuBarTest.java failing on macos
|
||||
- JDK-8239708: Split basics.m4 into basic.m4 and util.m4
|
||||
- JDK-8240281: Remove failing assertion code when selecting first memory state in SuperWord::co_locate_pack
|
||||
- JDK-8242468: VS2019 build missing vcruntime140_1.dll
|
||||
- JDK-8243565: some gc tests use 'test.java.opts' and not 'test.vm.opts'
|
||||
- JDK-8243568: serviceability/logging/TestLogRotation.java uses 'test.java.opts' and not 'test.vm.opts'
|
||||
- JDK-8244010: Simplify usages of ProcessTools.createJavaProcessBuilder in our tests
|
||||
- JDK-8244557: test/jdk/javax/swing/JTabbedPane/TestBackgroundScrollPolicy.java failed
|
||||
- JDK-8247676: vcruntime140_1.dll is not needed on 32-bit Windows
|
||||
- JDK-8249694: java/lang/StringBuffer/HugeCapacity.java and j/l/StringBuilder/HugeCapacity.java tests shouldn't be @ignore-d
|
||||
- JDK-8253877: gc/g1/TestGCLogMessages.java fails - missing "Evacuation failure" message
|
||||
- JDK-8254874: ZGC: JNIHandleBlock verification failure in stack watermark processing
|
||||
- JDK-8254976: Re-enable swing jtreg tests which were broken due to samevm mode
|
||||
- JDK-8261336: IGV: enhance default filters
|
||||
- JDK-8261758: [TESTBUG] gc/g1/TestGCLogMessages.java fails if ergonomics detect too small InitialHeapSize
|
||||
- JDK-8263326: Remove ReceiverTypeData check from serviceability/sa/TestPrintMdo.java
|
||||
- JDK-8263871: On sem_destroy() failing we should assert
|
||||
- JDK-8264593: debug.cpp utilities should be available in product builds.
|
||||
- JDK-8266082: AssertionError in Annotate.fromAnnotations with -Xdoclint
|
||||
- JDK-8266967: debug.cpp utility find() should print Java Object fields.
|
||||
- JDK-8268893: jcmd to trim the glibc heap
|
||||
- JDK-8269029: compiler/codegen/TestCharVect2.java fails for client VMs
|
||||
- JDK-8269873: serviceability/sa/Clhsdb tests are using a C2 specific VMStruct field
|
||||
- JDK-8272123: Problem list 4 jtreg tests which regularly fail on macos-aarch64
|
||||
- JDK-8273553: sun.security.ssl.SSLEngineImpl.closeInbound also has similar error of JDK-8253368
|
||||
- JDK-8273578: javax/swing/JMenu/4515762/bug4515762.java fails on macOS 12
|
||||
- JDK-8274032: Remove jtreg tag manual=yesno for java/awt/print/PrinterJob/ImagePrinting/ImageTypes.java & show test UI
|
||||
- JDK-8274296: Update or Problem List tests which may fail with uiScale=2 on macOS
|
||||
- JDK-8274563: jfr/event/oldobject/TestClassLoaderLeak.java fails when GC cycles are not happening
|
||||
- JDK-8274597: Some of the dnd tests time out and fail intermittently
|
||||
- JDK-8275170: Some jtreg sound tests should be marked with sound keyword
|
||||
- JDK-8275535: Retrying a failed authentication on multiple LDAP servers can lead to users blocked
|
||||
- JDK-8276841: Add support for Visual Studio 2022
|
||||
- JDK-8277159: Fix java/nio/file/FileStore/Basic.java test by ignoring /run/user/* mount points
|
||||
- JDK-8279066: entries.remove(entry) is useless in PKCS12KeyStore
|
||||
- JDK-8279695: [TESTBUG] modify compiler/loopopts/TestSkeletonPredicateNegation.java to run on C1 also
|
||||
- JDK-8280158: New test from JDK-8274736 failed with/without patch in JDK11u
|
||||
- JDK-8280948: Write a regression test for JDK-4659800
|
||||
- JDK-8281296: Create a regression test for JDK-4515999
|
||||
- JDK-8281297: TestStressG1Humongous fails with guarantee(is_range_uncommitted)
|
||||
- JDK-8282046: Create a regression test for JDK-8000326
|
||||
- JDK-8282276: Problem list failing two Robot Screen Capture tests
|
||||
- JDK-8282345: handle latest VS2022 in abstract_vm_version
|
||||
- JDK-8282402: Create a regression test for JDK-4666101
|
||||
- JDK-8282640: Create a test for JDK-4740761
|
||||
- JDK-8282642: vmTestbase/gc/gctests/LoadUnloadGC2/LoadUnloadGC2.java fails intermittently with exit code 1
|
||||
- JDK-8282777: Create a Regression test for JDK-4515031
|
||||
- JDK-8282778: Create a regression test for JDK-4699544
|
||||
- JDK-8282857: Create a regression test for JDK-4702690
|
||||
- JDK-8282936: Write a regression test for JDK-4615365
|
||||
- JDK-8282937: Write a regression test for JDK-4820080
|
||||
- JDK-8283422: Create a new test for JDK-8254790
|
||||
- JDK-8284294: Create an automated regression test for RFE 4138746
|
||||
- JDK-8284358: Unreachable loop is not removed from C2 IR, leading to a broken graph
|
||||
- JDK-8284521: Write an automated regression test for RFE 4371575
|
||||
- JDK-8284690: [macos] VoiceOver : Getting java.lang.IllegalArgumentException: Invalid location on Editable JComboBox
|
||||
- JDK-8284732: FFI_GO_CLOSURES macro not defined but required for zero build on Mac OS X
|
||||
- JDK-8284752: Zero does not build on Mac OS X due to missing os::current_thread_enable_wx implementation
|
||||
- JDK-8284884: Replace polling with waiting in javax/swing/text/html/parser/Parser/8078268/bug8078268.java
|
||||
- JDK-8284977: MetricsTesterCgroupV2.getLongValueEntryFromFile fails when named value doesn't exist
|
||||
- JDK-8285305: Create an automated test for JDK-4495286
|
||||
- JDK-8285373: Create an automated test for JDK-4702233
|
||||
- JDK-8285617: Fix java/awt/print/PrinterJob/ImagePrinting/PrintARGBImage.java manual test
|
||||
- JDK-8285698: Create a test to check the focus stealing of JPopupMenu from JComboBox
|
||||
- JDK-8285836: sun/net/www/http/KeepAliveCache/KeepAliveProperty.java failed with "RuntimeException: Failed in server"
|
||||
- JDK-8285921: serviceability/dcmd/jvmti/AttachFailed/AttachReturnError.java fails on Alpine
|
||||
- JDK-8286663: Resolve IDE warnings in WTrayIconPeer and SystemTray
|
||||
- JDK-8286772: java/awt/dnd/DropTargetInInternalFrameTest/DropTargetInInternalFrameTest.html times out and fails in Windows
|
||||
- JDK-8287076: Document.normalizeDocument() produces different results
|
||||
- JDK-8287091: aarch64 : guarantee(val < (1ULL << nbits)) failed: Field too big for insn
|
||||
- JDK-8287609: macOS: SIGSEGV at [CoreFoundation] CFArrayGetCount / sun.font.CFont.getTableBytesNative
|
||||
- JDK-8287917: System.loadLibrary does not work on Big Sur if JDK is built with macOS SDK 10.15 and earlier
|
||||
- JDK-8288377: [REDO] DST not applying properly with zone id offset set with TZ env variable
|
||||
- JDK-8288445: AArch64: C2 compilation fails with guarantee(!true || (true && (shift != 0))) failed: impossible encoding
|
||||
- JDK-8288599: com/sun/management/OperatingSystemMXBean/TestTotalSwap.java: Expected total swap size ... but getTotalSwapSpaceSize returned ...
|
||||
- JDK-8288985: P11TlsKeyMaterialGenerator should work with ChaCha20-Poly1305
|
||||
- JDK-8289043: C2: Vector constant materialization attempt
|
||||
- JDK-8289146: containers/docker/TestMemoryWithCgroupV1.java fails on linux ppc64le machine with missing Memory and Swap Limit output
|
||||
- JDK-8290207: Missing notice in dom.md
|
||||
- JDK-8290209: jcup.md missing additional text
|
||||
- JDK-8290451: Incorrect result when switching to C2 OSR compilation from C1
|
||||
- JDK-8290529: C2: assert(BoolTest(btest).is_canonical()) failure
|
||||
- JDK-8290705: StringConcat::validate_mem_flow asserts with "unexpected user: StoreI"
|
||||
- JDK-8290711: assert(false) failed: infinite loop in PhaseIterGVN::optimize
|
||||
- JDK-8290781: Segfault at PhaseIdealLoop::clone_loop_handle_data_uses
|
||||
- JDK-8291459: JVM crash with GenerateOopMap::error_work(char const*, __va_list_tag*)
|
||||
- JDK-8291461: assert(false) failed: bad AD file
|
||||
- JDK-8292083: Detected container memory limit may exceed physical machine memory
|
||||
- JDK-8292158: AES-CTR cipher state corruption with AVX-512
|
||||
- JDK-8292541: [Metrics] Reported memory limit may exceed physical machine memory
|
||||
- JDK-8292887: Bump update version for OpenJDK: jdk-11.0.18
|
||||
- JDK-8292899: CustomTzIDCheckDST.java testcase failed on AIX platform
|
||||
- JDK-8293044: C1: Missing access check on non-accessible class
|
||||
- JDK-8293578: Duplicate ldc generated by javac
|
||||
- JDK-8293672: Update freetype md file
|
||||
- JDK-8293816: CI: ciBytecodeStream::get_klass() is not consistent
|
||||
- JDK-8293828: JFR: jfr/event/oldobject/TestClassLoaderLeak.java still fails when GC cycles are not happening
|
||||
- JDK-8293998: [PPC64] JfrGetCallTrace: assert(_pc != nullptr) failed: must have PC
|
||||
- JDK-8294138: [11u] Revert change from JDK-8210962 in basic.m4
|
||||
- JDK-8294357: (tz) Update Timezone Data to 2022d
|
||||
- JDK-8294578: [PPC64] C2: Missing is_oop information when using disjoint compressed oops mode
|
||||
- JDK-8295173: (tz) Update Timezone Data to 2022e
|
||||
- JDK-8295288: Some vm_flags tests associate with a wrong BugID
|
||||
- JDK-8295322: Tests for JDK-8271459 were not backported to 11u
|
||||
- JDK-8295469: S390X: Optimized builds are broken
|
||||
- JDK-8295641: Fix DEFAULT_PROMOTED_VERSION_PRE=ea for -dev
|
||||
|
||||
Notes on individual issues:
|
||||
===========================
|
||||
|
||||
security-libs/javax.crypto:
|
||||
|
||||
JDK-6782021: Windows KeyStore Updated to Include Access to the Local Machine Location
|
||||
=====================================================================================
|
||||
The Windows KeyStore support in the SunMSCAPI provider has been
|
||||
expanded to include access to the local machine location. The new
|
||||
keystore types are:
|
||||
|
||||
* "Windows-MY-LOCALMACHINE"
|
||||
* "Windows-ROOT-LOCALMACHINE"
|
||||
|
||||
The following keystore types were also added, allowing developers to
|
||||
make it clear they map to the current user:
|
||||
|
||||
* "Windows-MY-CURRENTUSER" (same as "Windows-MY")
|
||||
* "Windows-ROOT-CURRENTUSER" (same as "Windows-ROOT")
|
||||
|
||||
New in release OpenJDK 11.0.17 (2022-10-18):
|
||||
=============================================
|
||||
Live versions of these release notes can be found at:
|
||||
* https://bitly.com/openjdk11017
|
||||
* https://bit.ly/openjdk11017
|
||||
* https://builds.shipilev.net/backports-monitor/release-notes-11.0.17.html
|
||||
|
||||
* Security fixes
|
||||
|
@ -331,7 +331,7 @@
|
||||
# New Version-String scheme-style defines
|
||||
%global featurever 11
|
||||
%global interimver 0
|
||||
%global updatever 17
|
||||
%global updatever 18
|
||||
%global patchver 0
|
||||
# buildjdkver is usually same as %%{featurever},
|
||||
# but in time of bootstrap of next jdk, it is featurever-1,
|
||||
@ -377,8 +377,8 @@
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{origin}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 8
|
||||
%global rpmrelease 2
|
||||
%global buildver 1
|
||||
%global rpmrelease 3
|
||||
#%%global tagsuffix %%{nil}
|
||||
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
|
||||
%if %is_system_jdk
|
||||
@ -406,7 +406,7 @@
|
||||
# Release will be (where N is usually a number starting at 1):
|
||||
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
||||
# - N%%{?extraver}{?dist} for GA releases
|
||||
%global is_ga 1
|
||||
%global is_ga 0
|
||||
%if %{is_ga}
|
||||
%global ea_designator ""
|
||||
%global ea_designator_zip ""
|
||||
@ -1143,9 +1143,8 @@ Provides: jre%{?1} = %{epoch}:%{version}-%{release}
|
||||
Requires: ca-certificates
|
||||
# Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros
|
||||
Requires: javapackages-filesystem
|
||||
# 2022d required as of JDK-8294357
|
||||
# Should be bumped to 2022e once available (JDK-8295173)
|
||||
Requires: tzdata-java >= 2022d
|
||||
# 2022e required as of JDK-8295173
|
||||
Requires: tzdata-java >= 2022e
|
||||
# for support of kernel stream control
|
||||
# libsctp.so.1 is being `dlopen`ed on demand
|
||||
Requires: lksctp-tools%{?_isa}
|
||||
@ -1400,8 +1399,6 @@ Patch1001: fips-11u-%{fipsver}.patch
|
||||
#############################################
|
||||
|
||||
Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
|
||||
# JDK-8275535, RH2053256: Retrying a failed authentication on multiple LDAP servers can lead to users blocked
|
||||
Patch8: jdk8275535-rh2053256-ldap_auth.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -1424,10 +1421,6 @@ Patch8: jdk8275535-rh2053256-ldap_auth.patch
|
||||
#############################################
|
||||
# JDK-8293834: Update CLDR data following tzdata 2022c update
|
||||
Patch2001: jdk8293834-kyiv_cldr_update.patch
|
||||
# JDK-8294357: (tz) Update Timezone Data to 2022d
|
||||
Patch2002: jdk8294357-tzdata2022d.patch
|
||||
# JDK-8295173: (tz) Update Timezone Data to 2022e
|
||||
Patch2003: jdk8295173-tzdata2022e.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
@ -1462,9 +1455,8 @@ BuildRequires: java-%{buildjdkver}-openjdk-devel
|
||||
%ifarch %{zero_arches}
|
||||
BuildRequires: libffi-devel
|
||||
%endif
|
||||
# 2022d required as of JDK-8294357
|
||||
# Should be bumped to 2022e once available (JDK-8295173)
|
||||
BuildRequires: tzdata-java >= 2022d
|
||||
# 2022e required as of JDK-8295173
|
||||
BuildRequires: tzdata-java >= 2022e
|
||||
# Earlier versions have a bug in tree vectorization on PPC
|
||||
BuildRequires: gcc >= 4.8.3-8
|
||||
|
||||
@ -1849,15 +1841,11 @@ pushd %{top_level_dir_name}
|
||||
%patch1000 -p1
|
||||
# tzdata updates targetted for 11.0.18
|
||||
%patch2001 -p1
|
||||
%patch2002 -p1
|
||||
%patch2003 -p1
|
||||
popd # openjdk
|
||||
|
||||
%patch600
|
||||
%patch1003
|
||||
|
||||
%patch8
|
||||
|
||||
# Extract systemtap tapsets
|
||||
%if %{with_systemtap}
|
||||
tar --strip-components=1 -x -I xz -f %{SOURCE8}
|
||||
@ -2663,6 +2651,14 @@ require "copy_jdk_configs.lua"
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Dec 15 2022 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.18.0.1-0.3.ea
|
||||
- Update to jdk-11.0.18+1
|
||||
- Update release notes to 11.0.18+1
|
||||
- Switch to EA mode for 11.0.18 pre-release builds.
|
||||
- Drop local copies of JDK-8294357 & JDK-8295173 now upstream contains tzdata 2022e
|
||||
- Drop local copy of JDK-8275535 which is finally upstream
|
||||
- Related: rhbz#2150197
|
||||
|
||||
* Wed Oct 26 2022 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.17.0.8-2
|
||||
- Update to jdk-11.0.17+8 (GA)
|
||||
- Update release notes to 11.0.17+8
|
||||
|
@ -1,26 +0,0 @@
|
||||
diff --git openjdk.orig/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java openjdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java
|
||||
index 300f3682655..6f3eb6c450b 100644
|
||||
--- openjdk.orig/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java
|
||||
+++ openjdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java
|
||||
@@ -226,6 +226,10 @@ final public class LdapCtxFactory implements ObjectFactory, InitialContextFactor
|
||||
ctx = getLdapCtxFromUrl(
|
||||
r.getDomainName(), url, new LdapURL(u), env);
|
||||
return ctx;
|
||||
+ } catch (AuthenticationException e) {
|
||||
+ // do not retry on a different endpoint to avoid blocking
|
||||
+ // the user if authentication credentials are wrong.
|
||||
+ throw e;
|
||||
} catch (NamingException e) {
|
||||
// try the next element
|
||||
lastException = e;
|
||||
@@ -278,6 +282,10 @@ final public class LdapCtxFactory implements ObjectFactory, InitialContextFactor
|
||||
for (String u : urls) {
|
||||
try {
|
||||
return getUsingURL(u, env);
|
||||
+ } catch (AuthenticationException e) {
|
||||
+ // do not retry on a different URL to avoid blocking
|
||||
+ // the user if authentication credentials are wrong.
|
||||
+ throw e;
|
||||
} catch (NamingException e) {
|
||||
ex = e;
|
||||
}
|
@ -1,304 +0,0 @@
|
||||
commit f67b4de8a07b8158be1dfb5b09cdb4cc5b7ac93b
|
||||
Author: David Alvarez <alvdavi@amazon.com>
|
||||
Date: Tue Oct 11 20:04:39 2022 +0000
|
||||
|
||||
8294357: (tz) Update Timezone Data to 2022d
|
||||
|
||||
Reviewed-by: phh
|
||||
Backport-of: f01573368f905f27d26f1d07d9cfd26dcc736a54
|
||||
|
||||
diff --git a/make/data/tzdata/VERSION b/make/data/tzdata/VERSION
|
||||
index decb8716b22..889d0e6dad7 100644
|
||||
--- a/make/data/tzdata/VERSION
|
||||
+++ b/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/make/data/tzdata/asia b/make/data/tzdata/asia
|
||||
index 3a150b0f36b..f9df7432947 100644
|
||||
--- a/make/data/tzdata/asia
|
||||
+++ b/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/make/data/tzdata/backward b/make/data/tzdata/backward
|
||||
index d4a29e8cf29..7765d99aedf 100644
|
||||
--- a/make/data/tzdata/backward
|
||||
+++ b/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/make/data/tzdata/europe b/make/data/tzdata/europe
|
||||
index 879b5337536..accc845dbaf 100644
|
||||
--- a/make/data/tzdata/europe
|
||||
+++ b/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/make/data/tzdata/southamerica b/make/data/tzdata/southamerica
|
||||
index 13ec081c7e0..3c0e0e2061c 100644
|
||||
--- a/make/data/tzdata/southamerica
|
||||
+++ b/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/make/data/tzdata/zone.tab b/make/data/tzdata/zone.tab
|
||||
index 51b65fa273c..ee025196e50 100644
|
||||
--- a/make/data/tzdata/zone.tab
|
||||
+++ b/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/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java b/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
|
||||
index bfe0dd3b548..1dc82561f23 100644
|
||||
--- a/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
|
||||
+++ b/src/java.base/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/test/jdk/java/util/TimeZone/TimeZoneData/VERSION b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
|
||||
index c32bee39fba..71470168456 100644
|
||||
--- a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
|
||||
+++ b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
|
||||
@@ -1 +1 @@
|
||||
-tzdata2022c
|
||||
+tzdata2022d
|
||||
diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt b/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt
|
||||
index a5e6428a3f5..e3ce742f887 100644
|
||||
--- a/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt
|
||||
+++ b/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt
|
||||
@@ -183,6 +183,8 @@ Link Etc/UTC Etc/UCT
|
||||
Link Europe/London Europe/Belfast
|
||||
Link Europe/Kyiv Europe/Kiev
|
||||
Link Europe/Chisinau Europe/Tiraspol
|
||||
+Link Europe/Kyiv Europe/Uzhgorod
|
||||
+Link Europe/Kyiv Europe/Zaporozhye
|
||||
Link Europe/London GB
|
||||
Link Europe/London GB-Eire
|
||||
Link Etc/GMT GMT+0
|
||||
diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
|
||||
index fc148537f1f..b3823958ae4 100644
|
||||
--- a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
|
||||
+++ b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
|
||||
@@ -163,11 +163,9 @@ Europe/Simferopol MSK
|
||||
Europe/Sofia EET EEST
|
||||
Europe/Tallinn EET EEST
|
||||
Europe/Tirane CET CEST
|
||||
-Europe/Uzhgorod EET EEST
|
||||
Europe/Vienna CET CEST
|
||||
Europe/Vilnius EET EEST
|
||||
Europe/Warsaw CET CEST
|
||||
-Europe/Zaporozhye EET EEST
|
||||
Europe/Zurich CET CEST
|
||||
HST HST
|
||||
MET MET MEST
|
||||
diff --git a/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java b/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java
|
||||
index 7b50c342a0d..a7d14f1aa21 100644
|
||||
--- a/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java
|
||||
+++ b/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java
|
||||
@@ -176,11 +176,12 @@ public class TestZoneInfo310 {
|
||||
* save time in IANA tzdata. This bug is tracked via JDK-8223388.
|
||||
*
|
||||
* These are the zones/rules that employ negative DST in vanguard
|
||||
- * format (as of 2019a):
|
||||
+ * format (as of 2019a), Palestine added in 2022d:
|
||||
*
|
||||
* - Rule "Eire"
|
||||
* - Rule "Morocco"
|
||||
* - Rule "Namibia"
|
||||
+ * - Rule "Palestine"
|
||||
* - Zone "Europe/Prague"
|
||||
*
|
||||
* Tehran/Iran rule has rules beyond 2037, in which javazic assumes
|
||||
@@ -196,6 +197,8 @@ public class TestZoneInfo310 {
|
||||
zid.equals("Europe/Dublin") || // uses "Eire" rule
|
||||
zid.equals("Europe/Prague") ||
|
||||
zid.equals("Asia/Tehran") || // last rule mismatch
|
||||
+ zid.equals("Asia/Gaza") || // uses "Palestine" rule
|
||||
+ zid.equals("Asia/Hebron") || // uses "Palestine" rule
|
||||
zid.equals("Iran")) { // last rule mismatch
|
||||
continue;
|
||||
}
|
@ -1,420 +0,0 @@
|
||||
commit 826a9b80d7db0395308d9f8d5f23d5afc0756971
|
||||
Author: duke <duke@openjdk.org>
|
||||
Date: Fri Oct 14 20:26:41 2022 +0000
|
||||
|
||||
Backport 21407dec0156301871a83328615e4d975c4287c4
|
||||
|
||||
diff --git a/make/data/tzdata/VERSION b/make/data/tzdata/VERSION
|
||||
index 889d0e6dad7..b8cb36e69f4 100644
|
||||
--- a/make/data/tzdata/VERSION
|
||||
+++ b/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/make/data/tzdata/asia b/make/data/tzdata/asia
|
||||
index f9df7432947..5b2337fd0b6 100644
|
||||
--- a/make/data/tzdata/asia
|
||||
+++ b/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/make/data/tzdata/europe b/make/data/tzdata/europe
|
||||
index accc845dbaf..2832c4b9763 100644
|
||||
--- a/make/data/tzdata/europe
|
||||
+++ b/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/make/data/tzdata/northamerica b/make/data/tzdata/northamerica
|
||||
index 114cef14cce..ce4ee74582c 100644
|
||||
--- a/make/data/tzdata/northamerica
|
||||
+++ b/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 <http://www.epa.gov/fedrgstr/EPA-IMPACT/2003/October/Day-28/i27056.htm>.
|
||||
-Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
|
||||
+Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 19:00u
|
||||
-7:00 US M%sT 2003 Oct 26 2:00
|
||||
-6:00 US C%sT
|
||||
|
||||
@@ -498,7 +498,7 @@ Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
|
||||
# largest city in Mercer County). Google Maps places Beulah's city hall
|
||||
# at 47° 15' 51" N, 101° 46' 40" W, which yields an offset of 6h47'07".
|
||||
|
||||
-Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53
|
||||
+Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 19:00u
|
||||
-7:00 US M%sT 2010 Nov 7 2:00
|
||||
-6:00 US C%sT
|
||||
|
||||
@@ -530,7 +530,7 @@ Rule Denver 1921 only - May 22 2:00 0 S
|
||||
Rule Denver 1965 1966 - Apr lastSun 2:00 1:00 D
|
||||
Rule Denver 1965 1966 - Oct lastSun 2:00 0 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
-Zone America/Denver -6:59:56 - LMT 1883 Nov 18 12:00:04
|
||||
+Zone America/Denver -6:59:56 - LMT 1883 Nov 18 19:00u
|
||||
-7:00 US M%sT 1920
|
||||
-7:00 Denver M%sT 1942
|
||||
-7:00 US M%sT 1946
|
||||
@@ -583,7 +583,7 @@ Rule CA 1950 1966 - Apr lastSun 1:00 1:00 D
|
||||
Rule CA 1950 1961 - Sep lastSun 2:00 0 S
|
||||
Rule CA 1962 1966 - Oct lastSun 2:00 0 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
-Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 12:07:02
|
||||
+Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 20:00u
|
||||
-8:00 US P%sT 1946
|
||||
-8:00 CA P%sT 1967
|
||||
-8:00 US P%sT
|
||||
@@ -845,7 +845,7 @@ Zone Pacific/Honolulu -10:31:26 - LMT 1896 Jan 13 12:00
|
||||
# Go with the Arizona State Library instead.
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
-Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 11:31:42
|
||||
+Zone America/Phoenix -7:28:18 - LMT 1883 Nov 18 19:00u
|
||||
-7:00 US M%sT 1944 Jan 1 0:01
|
||||
-7:00 - MST 1944 Apr 1 0:01
|
||||
-7:00 US M%sT 1944 Oct 1 0:01
|
||||
@@ -873,7 +873,7 @@ Link America/Phoenix America/Creston
|
||||
# switched four weeks late in 1974.
|
||||
#
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
-Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11
|
||||
+Zone America/Boise -7:44:49 - LMT 1883 Nov 18 20:00u
|
||||
-8:00 US P%sT 1923 May 13 2:00
|
||||
-7:00 US M%sT 1974
|
||||
-7:00 - MST 1974 Feb 3 2:00
|
||||
@@ -945,7 +945,7 @@ Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D
|
||||
Rule Indianapolis 1941 1954 - Sep lastSun 2:00 0 S
|
||||
Rule Indianapolis 1946 1954 - Apr lastSun 2:00 1:00 D
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
-Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 12:15:22
|
||||
+Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 18:00u
|
||||
-6:00 US C%sT 1920
|
||||
-6:00 Indianapolis C%sT 1942
|
||||
-6:00 US C%sT 1946
|
||||
@@ -965,7 +965,7 @@ Rule Marengo 1951 only - Sep lastSun 2:00 0 S
|
||||
Rule Marengo 1954 1960 - Apr lastSun 2:00 1:00 D
|
||||
Rule Marengo 1954 1960 - Sep lastSun 2:00 0 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
-Zone America/Indiana/Marengo -5:45:23 - LMT 1883 Nov 18 12:14:37
|
||||
+Zone America/Indiana/Marengo -5:45:23 - LMT 1883 Nov 18 18:00u
|
||||
-6:00 US C%sT 1951
|
||||
-6:00 Marengo C%sT 1961 Apr 30 2:00
|
||||
-5:00 - EST 1969
|
||||
@@ -989,7 +989,7 @@ Rule Vincennes 1960 only - Oct lastSun 2:00 0 S
|
||||
Rule Vincennes 1961 only - Sep lastSun 2:00 0 S
|
||||
Rule Vincennes 1962 1963 - Oct lastSun 2:00 0 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
-Zone America/Indiana/Vincennes -5:50:07 - LMT 1883 Nov 18 12:09:53
|
||||
+Zone America/Indiana/Vincennes -5:50:07 - LMT 1883 Nov 18 18:00u
|
||||
-6:00 US C%sT 1946
|
||||
-6:00 Vincennes C%sT 1964 Apr 26 2:00
|
||||
-5:00 - EST 1969
|
||||
@@ -1009,7 +1009,7 @@ Rule Perry 1955 1960 - Sep lastSun 2:00 0 S
|
||||
Rule Perry 1956 1963 - Apr lastSun 2:00 1:00 D
|
||||
Rule Perry 1961 1963 - Oct lastSun 2:00 0 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
-Zone America/Indiana/Tell_City -5:47:03 - LMT 1883 Nov 18 12:12:57
|
||||
+Zone America/Indiana/Tell_City -5:47:03 - LMT 1883 Nov 18 18:00u
|
||||
-6:00 US C%sT 1946
|
||||
-6:00 Perry C%sT 1964 Apr 26 2:00
|
||||
-5:00 - EST 1967 Oct 29 2:00
|
||||
@@ -1026,7 +1026,7 @@ Rule Pike 1955 1960 - Sep lastSun 2:00 0 S
|
||||
Rule Pike 1956 1964 - Apr lastSun 2:00 1:00 D
|
||||
Rule Pike 1961 1964 - Oct lastSun 2:00 0 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
-Zone America/Indiana/Petersburg -5:49:07 - LMT 1883 Nov 18 12:10:53
|
||||
+Zone America/Indiana/Petersburg -5:49:07 - LMT 1883 Nov 18 18:00u
|
||||
-6:00 US C%sT 1955
|
||||
-6:00 Pike C%sT 1965 Apr 25 2:00
|
||||
-5:00 - EST 1966 Oct 30 2:00
|
||||
@@ -1048,7 +1048,7 @@ Rule Starke 1955 1956 - Oct lastSun 2:00 0 S
|
||||
Rule Starke 1957 1958 - Sep lastSun 2:00 0 S
|
||||
Rule Starke 1959 1961 - Oct lastSun 2:00 0 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
-Zone America/Indiana/Knox -5:46:30 - LMT 1883 Nov 18 12:13:30
|
||||
+Zone America/Indiana/Knox -5:46:30 - LMT 1883 Nov 18 18:00u
|
||||
-6:00 US C%sT 1947
|
||||
-6:00 Starke C%sT 1962 Apr 29 2:00
|
||||
-5:00 - EST 1963 Oct 27 2:00
|
||||
@@ -1064,7 +1064,7 @@ Rule Pulaski 1946 1954 - Sep lastSun 2:00 0 S
|
||||
Rule Pulaski 1955 1956 - Oct lastSun 2:00 0 S
|
||||
Rule Pulaski 1957 1960 - Sep lastSun 2:00 0 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
-Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 12:13:35
|
||||
+Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 18:00u
|
||||
-6:00 US C%sT 1946
|
||||
-6:00 Pulaski C%sT 1961 Apr 30 2:00
|
||||
-5:00 - EST 1969
|
||||
@@ -1075,7 +1075,7 @@ Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 12:13:35
|
||||
#
|
||||
# Switzerland County, Indiana, did not observe DST from 1973 through 2005.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
-Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 12:19:44
|
||||
+Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 18:00u
|
||||
-6:00 US C%sT 1954 Apr 25 2:00
|
||||
-5:00 - EST 1969
|
||||
-5:00 US E%sT 1973
|
||||
@@ -1111,7 +1111,7 @@ Rule Louisville 1950 1961 - Apr lastSun 2:00 1:00 D
|
||||
Rule Louisville 1950 1955 - Sep lastSun 2:00 0 S
|
||||
Rule Louisville 1956 1961 - Oct lastSun 2:00 0 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
-Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 12:16:58
|
||||
+Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 18:00u
|
||||
-6:00 US C%sT 1921
|
||||
-6:00 Louisville C%sT 1942
|
||||
-6:00 US C%sT 1946
|
||||
@@ -1145,7 +1145,7 @@ Zone America/Kentucky/Louisville -5:43:02 - LMT 1883 Nov 18 12:16:58
|
||||
# Federal Register 65, 160 (2000-08-17), pp 50154-50158.
|
||||
# https://www.gpo.gov/fdsys/pkg/FR-2000-08-17/html/00-20854.htm
|
||||
#
|
||||
-Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 12:20:36
|
||||
+Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 18:00u
|
||||
-6:00 US C%sT 1946
|
||||
-6:00 - CST 1968
|
||||
-6:00 US C%sT 2000 Oct 29 2:00
|
||||
@@ -2640,6 +2640,8 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
|
||||
# longitude they are located at.
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
+Rule Mexico 1931 only - May 1 23:00 1:00 D
|
||||
+Rule Mexico 1931 only - Oct 1 0:00 0 S
|
||||
Rule Mexico 1939 only - Feb 5 0:00 1:00 D
|
||||
Rule Mexico 1939 only - Jun 25 0:00 0 S
|
||||
Rule Mexico 1940 only - Dec 9 0:00 1:00 D
|
||||
@@ -2656,13 +2658,13 @@ Rule Mexico 2002 max - Apr Sun>=1 2:00 1:00 D
|
||||
Rule Mexico 2002 max - Oct lastSun 2:00 0 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
# Quintana Roo; represented by Cancún
|
||||
-Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 0:12:56
|
||||
+Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 6:00u
|
||||
-6:00 - CST 1981 Dec 23
|
||||
-5:00 Mexico E%sT 1998 Aug 2 2:00
|
||||
-6:00 Mexico C%sT 2015 Feb 1 2:00
|
||||
-5:00 - EST
|
||||
# Campeche, Yucatán; represented by Mérida
|
||||
-Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32
|
||||
+Zone America/Merida -5:58:28 - LMT 1922 Jan 1 6:00u
|
||||
-6:00 - CST 1981 Dec 23
|
||||
-5:00 - EST 1982 Dec 2
|
||||
-6:00 Mexico C%sT
|
||||
@@ -2676,23 +2678,21 @@ Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32
|
||||
# See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,
|
||||
# 2016-03-12
|
||||
# http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza
|
||||
-Zone America/Matamoros -6:40:00 - LMT 1921 Dec 31 23:20:00
|
||||
+Zone America/Matamoros -6:30:00 - LMT 1922 Jan 1 6:00u
|
||||
-6:00 - CST 1988
|
||||
-6:00 US C%sT 1989
|
||||
-6:00 Mexico C%sT 2010
|
||||
-6:00 US C%sT
|
||||
# Durango; Coahuila, Nuevo León, Tamaulipas (away from US border)
|
||||
-Zone America/Monterrey -6:41:16 - LMT 1921 Dec 31 23:18:44
|
||||
+Zone America/Monterrey -6:41:16 - LMT 1922 Jan 1 6:00u
|
||||
-6:00 - CST 1988
|
||||
-6:00 US C%sT 1989
|
||||
-6:00 Mexico C%sT
|
||||
# Central Mexico
|
||||
-Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24
|
||||
+Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 7:00u
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
-6:00 - CST 1930 Nov 15
|
||||
- -7:00 - MST 1931 May 1 23:00
|
||||
- -6:00 - CST 1931 Oct
|
||||
- -7:00 - MST 1932 Apr 1
|
||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
||||
-6:00 Mexico C%sT 2001 Sep 30 2:00
|
||||
-6:00 - CST 2002 Feb 20
|
||||
-6:00 Mexico C%sT
|
||||
@@ -2700,35 +2700,29 @@ Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24
|
||||
# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
|
||||
# Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
|
||||
# (See the 2016-03-12 El Universal source mentioned above.)
|
||||
-Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 0:02:20
|
||||
+Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 7:00u
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
-6:00 - CST 1930 Nov 15
|
||||
- -7:00 - MST 1931 May 1 23:00
|
||||
- -6:00 - CST 1931 Oct
|
||||
- -7:00 - MST 1932 Apr 1
|
||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
||||
-6:00 - CST 1996
|
||||
-6:00 Mexico C%sT 1998
|
||||
-6:00 - CST 1998 Apr Sun>=1 3:00
|
||||
-7:00 Mexico M%sT 2010
|
||||
-7:00 US M%sT
|
||||
# Chihuahua (away from US border)
|
||||
-Zone America/Chihuahua -7:04:20 - LMT 1921 Dec 31 23:55:40
|
||||
+Zone America/Chihuahua -7:04:20 - LMT 1922 Jan 1 7:00u
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
-6:00 - CST 1930 Nov 15
|
||||
- -7:00 - MST 1931 May 1 23:00
|
||||
- -6:00 - CST 1931 Oct
|
||||
- -7:00 - MST 1932 Apr 1
|
||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
||||
-6:00 - CST 1996
|
||||
-6:00 Mexico C%sT 1998
|
||||
-6:00 - CST 1998 Apr Sun>=1 3:00
|
||||
-7:00 Mexico M%sT
|
||||
# Sonora
|
||||
-Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08
|
||||
+Zone America/Hermosillo -7:23:52 - LMT 1922 Jan 1 7:00u
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
-6:00 - CST 1930 Nov 15
|
||||
- -7:00 - MST 1931 May 1 23:00
|
||||
- -6:00 - CST 1931 Oct
|
||||
- -7:00 - MST 1932 Apr 1
|
||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
||||
-6:00 - CST 1942 Apr 24
|
||||
-7:00 - MST 1949 Jan 14
|
||||
-8:00 - PST 1970
|
||||
@@ -2763,24 +2757,20 @@ Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08
|
||||
# Use "Bahia_Banderas" to keep the name to fourteen characters.
|
||||
|
||||
# Mazatlán
|
||||
-Zone America/Mazatlan -7:05:40 - LMT 1921 Dec 31 23:54:20
|
||||
+Zone America/Mazatlan -7:05:40 - LMT 1922 Jan 1 7:00u
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
-6:00 - CST 1930 Nov 15
|
||||
- -7:00 - MST 1931 May 1 23:00
|
||||
- -6:00 - CST 1931 Oct
|
||||
- -7:00 - MST 1932 Apr 1
|
||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
||||
-6:00 - CST 1942 Apr 24
|
||||
-7:00 - MST 1949 Jan 14
|
||||
-8:00 - PST 1970
|
||||
-7:00 Mexico M%sT
|
||||
|
||||
# Bahía de Banderas
|
||||
-Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00
|
||||
+Zone America/Bahia_Banderas -7:01:00 - LMT 1922 Jan 1 7:00u
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
-6:00 - CST 1930 Nov 15
|
||||
- -7:00 - MST 1931 May 1 23:00
|
||||
- -6:00 - CST 1931 Oct
|
||||
- -7:00 - MST 1932 Apr 1
|
||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
||||
-6:00 - CST 1942 Apr 24
|
||||
-7:00 - MST 1949 Jan 14
|
||||
-8:00 - PST 1970
|
||||
@@ -2788,7 +2778,7 @@ Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00
|
||||
-6:00 Mexico C%sT
|
||||
|
||||
# Baja California
|
||||
-Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56
|
||||
+Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 7:00u
|
||||
-7:00 - MST 1924
|
||||
-8:00 - PST 1927 Jun 10 23:00
|
||||
-7:00 - MST 1930 Nov 15
|
||||
diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
|
||||
index 71470168456..0cad939008f 100644
|
||||
--- a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
|
||||
+++ b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
|
||||
@@ -1 +1 @@
|
||||
-tzdata2022d
|
||||
+tzdata2022e
|
||||
diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
|
||||
index b3823958ae4..2f2786f1c69 100644
|
||||
--- a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
|
||||
+++ b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
|
||||
@@ -97,9 +97,7 @@ America/Winnipeg CST CDT
|
||||
America/Yakutat AKST AKDT
|
||||
America/Yellowknife MST MDT
|
||||
Antarctica/Macquarie AEST AEDT
|
||||
-Asia/Amman EET EEST
|
||||
Asia/Beirut EET EEST
|
||||
-Asia/Damascus EET EEST
|
||||
Asia/Famagusta EET EEST
|
||||
Asia/Gaza EET EEST
|
||||
Asia/Hebron EET EEST
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
|
||||
SHA512 (openjdk-jdk11u-jdk-11.0.17+8-4curve.tar.xz) = 236c0ff89e85727c8b2bdb9ebbce6350db7653f319b2a9c2e12f2489844aec4fcc0629f65bc999798acfcf2a678177f1caaddab9353e55006df7bfe2aa69bcba
|
||||
SHA512 (openjdk-jdk11u-jdk-11.0.18+1-4curve.tar.xz) = 66130ced7fd4c5439784a404660d4c96c37fe6b5137050c829f36891736e9cad7b021e187579d80a9ee47903d380161106d887f2994bf261cf83dbce2793d27f
|
||||
|
Loading…
Reference in New Issue
Block a user