Update to jdk-19.0.2 release

Update release notes to 19.0.2 Drop JDK-8293834 (CLDR update for Kyiv) which is now upstream Drop JDK-8294357 (tzdata2022d), JDK-8295173 (tzdata2022e) & JDK-8296108 (tzdata2022f) local patches which are now upstream Drop JDK-8296715 (CLDR update for 2022f) which is now upstream Add local patch JDK-8295447 (javac NPE) which was accepted into 19u upstream but not in the GA tag Add local patches for JDK-8296239 & JDK-8299439 (Croatia Euro update) which are present in 8u, 11u & 17u releases
2023-01-30 22:43:53 +01:00 · 2023-01-30 22:43:53 +01:00 · 37721ebf23
commit 37721ebf23
parent 71bf195efd
12 changed files with 397 additions and 3515 deletions
--- a/.gitignore
+++ b/.gitignore
@ -30,3 +30,4 @@
 /openjdk-jdk18u-jdk-18.0.2+9.tar.xz
 /openjdk-jdk19u-jdk-19+36.tar.xz
 /openjdk-jdk19u-jdk-19.0.1+10.tar.xz
+/openjdk-jdk19u-jdk-19.0.2+7.tar.xz
--- a/133
+++ b/133
@ -3,6 +3,139 @@ Key:
 JDK-X  - https://bugs.openjdk.java.net/browse/JDK-X
 CVE-XXXX-YYYY: https://cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY

+New in release OpenJDK 19.0.2 (2023-01-17):
+===========================================
+Live versions of these release notes can be found at:
+  * https://builds.shipilev.net/backports-monitor/release-notes-19.0.2.html
+
+* CVEs
+  - CVE-2023-21835
+  - CVE-2023-21843
+* Security fixes
+  - JDK-8286070: Improve UTF8 representation
+  - JDK-8286496: Improve Thread labels
+  - JDK-8287411: Enhance DTLS performance
+  - JDK-8288516: Enhance font creation
+  - JDK-8293554: Enhanced DH Key Exchanges
+  - JDK-8293598: Enhance InetAddress address handling
+  - JDK-8293717: Objective view of ObjectView
+  - JDK-8293734: Improve BMP image handling
+  - JDK-8293742: Better Banking of Sounds
+  - JDK-8295687: Better BMP bounds
+* Other changes
+  - JDK-8022403: sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java fails
+  - JDK-8029633: Raw inner class constructor ref should not perform diamond inference
+  - JDK-8178698: javax/sound/midi/Sequencer/MetaCallback.java failed with timeout
+  - JDK-8277970: Test jdk/sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.java fails with "tag mismatch"
+  - JDK-8279941: sun/security/pkcs11/Signature/TestDSAKeyLength.java fails when NSS version detection fails
+  - JDK-8285604: closed sun/java2d/GdiRendering/ClipShapeRendering.java failed with "Incorrect color ffeeeeee instead of ff0000ff in pixel (100, 100)"
+  - JDK-8285835: SIGSEGV in PhaseIdealLoop::build_loop_late_post_work
+  - JDK-8286314: Trampoline not created for far runtime targets outside small CodeCache
+  - JDK-8286624: Regression Test CoordinateTruncationBug.java fails on OL8.3
+  - JDK-8287217: C2: PhaseCCP: remove not visited nodes, prevent type inconsistency
+  - JDK-8288132: Update test artifacts in QuoVadis CA interop tests
+  - JDK-8288377: [REDO] DST not applying properly with zone id offset set with TZ env variable
+  - JDK-8288992: AArch64: CMN should be handled the same way as CMP
+  - JDK-8290164: compiler/runtime/TestConstantsInError.java fails on riscv
+  - JDK-8290246: test fails "assert(init != __null) failed: initialization not found"
+  - JDK-8290451: Incorrect result when switching to C2 OSR compilation from C1
+  - JDK-8290496: riscv: Fix build warnings-as-errors with GCC 11
+  - JDK-8290529: C2: assert(BoolTest(btest).is_canonical()) failure
+  - JDK-8290694: Update the release date after forking Oct CPU22_10
+  - JDK-8290705: StringConcat::validate_mem_flow asserts with "unexpected user: StoreI"
+  - JDK-8290711: assert(false) failed: infinite loop in PhaseIterGVN::optimize
+  - JDK-8290781: Segfault at PhaseIdealLoop::clone_loop_handle_data_uses
+  - JDK-8290900: Build failure with Clang 14+ due to function warning attribute
+  - JDK-8290964: C2 compilation fails with assert "non-reduction loop contains reduction nodes"
+  - JDK-8290974: Bump version numbers for January 2023 CPU
+  - JDK-8291508: Fix some tests with "requires vm.jvmti & vm.continuations"
+  - JDK-8291599: Assertion in PhaseIdealLoop::skeleton_predicate_has_opaque after JDK-8289127
+  - JDK-8291633: Build failures with GCC 11, Alpine 3 due to incompatible casts from nullptr
+  - JDK-8291775: C2: assert(r != __null && r->is_Region()) failed: this phi must have a region
+  - JDK-8292158: AES-CTR cipher state corruption with AVX-512
+  - JDK-8292159: TYPE_USE annotations on generic type arguments of record components discarded
+  - JDK-8292385: assert(ctrl == kit.control()) failed: Control flow was added although the intrinsic bailed out
+  - JDK-8292695: SIGQUIT and jcmd attaching mechanism does not work with signal chaining library
+  - JDK-8292756: java.lang.AssertionError at at jdk.compiler/com.sun.tools.javac.code.Scope$ScopeImpl.leave(Scope.java:386)
+  - JDK-8292780: misc tests failed "assert(false) failed: graph should be schedulable"
+  - JDK-8292899: CustomTzIDCheckDST.java testcase failed on AIX platform
+  - JDK-8292969: Bad Thread Utilization in ForkJoinPool
+  - JDK-8293044: C1: Missing access check on non-accessible class
+  - JDK-8293100: RISC-V: Need to save and restore callee-saved FloatRegisters in StubGenerator::generate_call_stub
+  - JDK-8293348: A false cyclic inheritance error reported
+  - JDK-8293578: Duplicate ldc generated by javac
+  - JDK-8293701: jdeps InverseDepsAnalyzer runs into NoSuchElementException: No value present
+  - JDK-8293816: CI: ciBytecodeStream::get_klass() is not consistent
+  - JDK-8293834: Update CLDR data following tzdata 2022c update
+  - JDK-8293996: C2: fix and simplify IdealLoopTree::do_remove_empty_loop
+  - JDK-8294307: ISO 4217 Amendment 173 Update
+  - JDK-8294357: (tz) Update Timezone Data to 2022d
+  - JDK-8294517: Update jdk19u fix version to 19.0.2
+  - JDK-8294538: missing is_unloading() check in SharedRuntime::fixup_callers_callsite()
+  - JDK-8294602: Change milestone to fcs for releases: jdk-11.0.18, jdk-17.0.6, jdk-19.0.2
+  - JDK-8294755: Update milestone to ea for 19.0.2
+  - JDK-8294840: langtools OptionalDependencyTest.java use File.pathSeparator
+  - JDK-8295173: (tz) Update Timezone Data to 2022e
+  - JDK-8295264: Fix PaX check on RISC-V
+  - JDK-8295268: Optimized builds are broken due to incorrect assert_is_rfp shortcuts
+  - JDK-8295414: [Aarch64] C2: assert(false) failed: bad AD file
+  - JDK-8295469: S390X: Optimized builds are broken
+  - JDK-8295554: Move the "sizecalc.h" to the correct location
+  - JDK-8295723: security/infra/wycheproof/RunWycheproof.java fails with  Assertion Error
+  - JDK-8295926: RISC-V: C1: Fix LIRGenerator::do_LibmIntrinsic
+  - JDK-8296083: javax/swing/JTree/6263446/bug6263446.java fails intermittently on a VM
+  - JDK-8296108: (tz) Update Timezone Data to 2022f
+  - JDK-8296448: RISC-V: Fix temp usages of heapbase register killed by MacroAssembler::en/decode_klass_not_null
+  - JDK-8296463: Memory leak in JVM_StartThread with the integration of Virtual threads
+  - JDK-8296480: java/security/cert/pkix/policyChanges/TestPolicy.java is failing
+  - JDK-8296485: BuildEEBasicConstraints.java test fails with SunCertPathBuilderException
+  - JDK-8296496: Overzealous check in sizecalc.h prevents large memory allocation
+  - JDK-8296602: RISC-V: improve performance of copy_memory stub
+  - JDK-8296632: Write a test to verify the content change of TextArea sends TextEvent
+  - JDK-8296715: CLDR v42 update for tzdata 2022f
+  - JDK-8296733: JFR: File Read event for RandomAccessFile::write(byte[]) is incorrect
+  - JDK-8296771: RISC-V: C2: assert(false) failed: bad AD file
+  - JDK-8296945: PublicMethodsTest is slow due to dependency verification with debug builds
+  - JDK-8296957: One more cast in SAFE_SIZE_NEW_ARRAY2
+  - JDK-8296970: Remove sysThreadAvailableStackWithSlack from hotspot-symbols
+  - JDK-8297147: UnexpectedSourceImageSize test times out on slow machines when fastdebug is used
+  - JDK-8297153: sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java fails again
+  - JDK-8297241: Update sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java
+  - JDK-8297309: Memory leak in ShenandoahFullGC
+  - JDK-8297451: ProcessHandleImpl should assert privilege when modifying reaper thread
+  - JDK-8297476: Increase InlineSmallCode default from 1000 to 2500 for RISC-V
+
+Notes on individual issues:
+===========================
+
+client-libs/javax.imageio:
+
+JDK-8295687: Better BMP bounds
+==============================
+Loading a linked ICC profile within a BMP image is now disabled by
+default. To re-enable it, set the new system property
+`sun.imageio.bmp.enabledLinkedProfiles` to `true`.  This new property
+replaces the old property,
+`sun.imageio.plugins.bmp.disableLinkedProfiles`.
+
+client-libs/javax.sound:
+
+JDK-8293742: Better Banking of Sounds
+=====================================
+Previously, the SoundbankReader implementation,
+`com.sun.media.sound.JARSoundbankReader`, would download a JAR
+soundbank from a URL.  This behaviour is now disabled by default. To
+re-enable it, set the new system property `jdk.sound.jarsoundbank` to
+`true`.
+
+security-libs/javax.net.ssl:
+
+JDK-8287411: Enhance DTLS performance
+=====================================
+The JDK now exchanges DTLS cookies for all handshakes, new and
+resumed. The previous behaviour can be re-enabled by setting the new
+system property `jdk.tls.enableDtlsResumeCookie` to `false`.
+
 New in release OpenJDK 19.0.1 (2022-10-18):
 ===========================================
 Live versions of these release notes can be found at:
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@ -344,7 +344,7 @@
 # New Version-String scheme-style defines
 %global featurever 19
 %global interimver 0
-%global updatever 1
+%global updatever 2
 %global patchver 0
 # buildjdkver is usually same as %%{featurever},
 # but in time of bootstrap of next jdk, it is featurever-1,
@ -391,8 +391,8 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver        10
-%global rpmrelease      3
+%global buildver        7
+%global rpmrelease      1
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@ -695,21 +695,17 @@ Patch1001: fips-19u-%{fipsver}.patch

 #############################################
 #
-# OpenJDK patches targetted for 19.0.2
+# OpenJDK patches which missed 19.0.2
 #
 #############################################
-# JDK-8293834: Update CLDR data following tzdata 2022c update
-Patch2001: jdk8293834-kyiv_cldr_update.patch
-# JDK-8294357: (tz) Update Timezone Data to 2022d
-Patch2002: jdk8294357-tzdata2022d.patch
-# JDK-8295173: (tz) Update Timezone Data to 2022e
-Patch2003: jdk8295173-tzdata2022e.patch
-# JDK-8296108: (tz) Update Timezone Data to 2022f
-Patch2004: jdk8296108-tzdata2022f.patch
-# JDK-8296715: CLDR v42 update for tzdata 2022f
-Patch2005: jdk8296715-cldr2022f.patch
 # JDK-8297804: (tz) Update Timezone Data to 2022g
 Patch2006: jdk8297804-tzdata2022g.patch
+# JDK-8295447: NullPointerException with invalid pattern matching construct in constructor call
+Patch2007: jdk8295447-npe_in_constructor.patch
+# JDK-8296239: ISO 4217 Amendment 174 Update
+Patch2008: jdk8296239-iso4217_up174.patch
+# JDK-8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR
+Patch2009: jdk8299439-test_for_hr.patch 

 BuildRequires: autoconf
 BuildRequires: automake
@ -971,13 +967,11 @@ pushd %{top_level_dir_name}
 %patch1001 -p1
 # nss.cfg PKCS11 support; must come last as it also alters java.security
 %patch1000 -p1
-# tzdata updates targetted for 19.0.2
-%patch2001 -p1
-%patch2002 -p1
-%patch2003 -p1
-%patch2004 -p1
-%patch2005 -p1
+# updates which missed 19.0.2
 %patch2006 -p1
+%patch2007 -p1
+%patch2008 -p1
+%patch2009 -p1 
 popd # openjdk

 %patch600
@ -1607,6 +1601,15 @@ done
 %endif

 %changelog
+ * Thu Jan 26 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:19.0.2.0.7-1.rolling
+- Update to jdk-19.0.2 release
+- Update release notes to 19.0.2
+- Drop JDK-8293834 (CLDR update for Kyiv) which is now upstream
+- Drop JDK-8294357 (tzdata2022d), JDK-8295173 (tzdata2022e) & JDK-8296108 (tzdata2022f) local patches which are now upstream
+- Drop JDK-8296715 (CLDR update for 2022f) which is now upstream
+- Add local patch JDK-8295447 (javac NPE) which was accepted into 19u upstream but not in the GA tag
+- Add local patches for JDK-8296239 & JDK-8299439 (Croatia Euro update) which are present in 8u, 11u & 17u releases
+
 * Thu Jan 19 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:19.0.1.0.10-3.rolling
 - Update in-tree tzdata & CLDR to 2022g with JDK-8296108, JDK-8296715 & JDK-8297804
 - Update TestTranslations.java to test the new America/Ciudad_Juarez zone
--- a/jdk8293834-kyiv_cldr_update.patch
+++ b/jdk8293834-kyiv_cldr_update.patch
@ -1,59 +0,0 @@
-commit e10231248fc100f9dfa08468ac897f60b843857f
-Author: Andrew John Hughes <andrew@openjdk.org>
-Date:   Wed Sep 28 00:51:07 2022 +0000
-
-    8293834: Update CLDR data following tzdata 2022c update
-    
-    Reviewed-by: naoto
-
-diff --git a/make/data/cldr/common/bcp47/timezone.xml b/make/data/cldr/common/bcp47/timezone.xml
-index f0812776d5d..ddbccff077c 100644
--- a/make/data/cldr/common/bcp47/timezone.xml
-+++ b/make/data/cldr/common/bcp47/timezone.xml
-@@ -394,7 +394,7 @@ For terms of use, see http://www.unicode.org/copyright.html
-             <type name="tvfun" description="Funafuti, Tuvalu" alias="Pacific/Funafuti"/>
-             <type name="twtpe" description="Taipei, Taiwan" alias="Asia/Taipei ROC"/>
-             <type name="tzdar" description="Dar es Salaam, Tanzania" alias="Africa/Dar_es_Salaam"/>
-            <type name="uaiev" description="Kyiv, Ukraine" alias="Europe/Kiev"/>
-+            <type name="uaiev" description="Kyiv, Ukraine" alias="Europe/Kiev Europe/Kyiv"/>
-             <type name="uaozh" description="Zaporizhia (Zaporozhye), Ukraine" alias="Europe/Zaporozhye"/>
-             <type name="uasip" description="Simferopol, Ukraine" alias="Europe/Simferopol"/>
-             <type name="uauzh" description="Uzhhorod (Uzhgorod), Ukraine" alias="Europe/Uzhgorod"/>
-diff --git a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
-index eb56c087ad6..e398af3c151 100644
--- a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
-+++ b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
-@@ -23,7 +23,7 @@
- 
-  /*
-  * @test
- * @bug 8181157 8202537 8234347 8236548 8261279
-+ * @bug 8181157 8202537 8234347 8236548 8261279 8293834
-  * @modules jdk.localedata
-  * @summary Checks CLDR time zone names are generated correctly at runtime
-  * @run testng/othervm -Djava.locale.providers=CLDR TimeZoneNamesTest
-@@ -102,6 +102,24 @@ public class TimeZoneNamesTest {
-                                                     "UTC+04:00",
-                                                     "heure : Astrakhan",
-                                                     "UTC+04:00"},
-+            {"Europe/Kyiv",             Locale.US, "Eastern European Standard Time",
-+                                                    "GMT+02:00",
-+                                                    "Eastern European Summer Time",
-+                                                    "GMT+03:00",
-+                                                    "Eastern European Time",
-+                                                    "GMT+02:00"},
-+            {"Europe/Kyiv",             Locale.FRANCE, "heure normale d\u2019Europe de l\u2019Est",
-+                                                    "UTC+02:00",
-+                                                    "heure d\u2019\u00e9t\u00e9 d\u2019Europe de l\u2019Est",
-+                                                    "UTC+03:00",
-+                                                    "heure d\u2019Europe de l\u2019Est",
-+                                                    "UTC+02:00"},
-+            {"Europe/Kyiv",             Locale.GERMANY, "Osteurop\u00e4ische Normalzeit",
-+                                                    "OEZ",
-+                                                    "Osteurop\u00e4ische Sommerzeit",
-+                                                    "OESZ",
-+                                                    "Osteurop\u00e4ische Zeit",
-+                                                    "OEZ"},
-             {"Europe/Saratov",          Locale.US, "Saratov Standard Time",
-                                                     "GMT+04:00",
-                                                     "Saratov Daylight Time",
--- a/jdk8294357-tzdata2022d.patch
+++ b/jdk8294357-tzdata2022d.patch
@ -1,303 +0,0 @@
-commit 689f8f2dff8ba4c4a39a846641af988db3359480
-Author: Yoshiki Sato <ysatowse@openjdk.org>
-Date:   Wed Oct 5 01:54:50 2022 +0000
-
-    8294357: (tz) Update Timezone Data to 2022d
-    
-    Backport-of: f01573368f905f27d26f1d07d9cfd26dcc736a54
-
-diff --git a/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java b/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
-index 2b21a01f3f9..40f2b987e28 100644
--- a/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
-+++ b/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
-@@ -582,12 +582,8 @@ public final class ZoneInfoFile {
-                     // we can then pass in the dom = -1, dow > 0 into ZoneInfo
-                     //
-                     // hacking, assume the >=24 is the result of ZRB optimization for
-                    // "last", it works for now. From tzdata2020d this hacking
-                    // will not work for Asia/Gaza and Asia/Hebron which follow
-                    // Palestine DST rules.
-                    if (dom < 0 || dom >= 24 &&
-                                   !(zoneId.equals("Asia/Gaza") ||
-                                     zoneId.equals("Asia/Hebron"))) {
-+                    // "last", it works for now.
-+                    if (dom < 0 || dom >= 24) {
-                         params[1] = -1;
-                         params[2] = toCalendarDOW[dow];
-                     } else {
-@@ -609,7 +605,6 @@ public final class ZoneInfoFile {
-                     params[7] = 0;
-                 } else {
-                     // hacking: see comment above
-                    // No need of hacking for Asia/Gaza and Asia/Hebron from tz2021e
-                     if (dom < 0 || dom >= 24) {
-                         params[6] = -1;
-                         params[7] = toCalendarDOW[dow];
-diff --git a/src/java.base/share/data/tzdata/VERSION b/src/java.base/share/data/tzdata/VERSION
-index decb8716b22..889d0e6dad7 100644
--- a/src/java.base/share/data/tzdata/VERSION
-+++ b/src/java.base/share/data/tzdata/VERSION
-@@ -21,4 +21,4 @@
- # or visit www.oracle.com if you need additional information or have any
- # questions.
- #
-tzdata2022c
-+tzdata2022d
-diff --git a/src/java.base/share/data/tzdata/asia b/src/java.base/share/data/tzdata/asia
-index 3a150b0f36b..f9df7432947 100644
--- a/src/java.base/share/data/tzdata/asia
-+++ b/src/java.base/share/data/tzdata/asia
-@@ -3398,10 +3398,6 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
- # The winter time in 2015 started on October 23 at 01:00.
- # https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY
- # http://www.palestinecabinet.gov.ps/portal/meeting/details/27583
-#
-# From Paul Eggert (2019-04-10):
-# For now, guess spring-ahead transitions are at 00:00 on the Saturday
-# preceding March's last Sunday (i.e., Sat>=24).
- 
- # From P Chan (2021-10-18):
- # http://wafa.ps/Pages/Details/34701
-@@ -3418,6 +3414,18 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
- # From Heba Hamad (2022-03-10):
- # summer time will begin in Palestine from Sunday 03-27-2022, 00:00 AM.
- 
-+# From Heba Hamad (2022-08-30):
-+# winter time will begin in Palestine from Saturday 10-29, 02:00 AM by
-+# 60 minutes backwards.  Also the state of Palestine adopted the summer
-+# and winter time for the years: 2023,2024,2025,2026 ...
-+# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf
-+# (2022-08-31): ... the Saturday before the last Sunday in March and October
-+# at 2:00 AM ,for the years from 2023 to 2026.
-+# (2022-09-05): https://mtit.pna.ps/Site/New/1453
-+#
-+# From Paul Eggert (2022-08-31):
-+# For now, assume that this rule will also be used after 2026.
-+
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
- Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
- Rule EgyptAsia	1957	1958	-	Oct	 1	0:00	0	-
-@@ -3448,14 +3456,16 @@ Rule Palestine	2013	only	-	Sep	27	0:00	0	-
- Rule Palestine	2014	only	-	Oct	24	0:00	0	-
- Rule Palestine	2015	only	-	Mar	28	0:00	1:00	S
- Rule Palestine	2015	only	-	Oct	23	1:00	0	-
-Rule Palestine	2016	2018	-	Mar	Sat>=24	1:00	1:00	S
-Rule Palestine	2016	2018	-	Oct	Sat>=24	1:00	0	-
-+Rule Palestine	2016	2018	-	Mar	Sat<=30	1:00	1:00	S
-+Rule Palestine	2016	2018	-	Oct	Sat<=30	1:00	0	-
- Rule Palestine	2019	only	-	Mar	29	0:00	1:00	S
-Rule Palestine	2019	only	-	Oct	Sat>=24	0:00	0	-
-Rule Palestine	2020	2021	-	Mar	Sat>=24	0:00	1:00	S
-+Rule Palestine	2019	only	-	Oct	Sat<=30	0:00	0	-
-+Rule Palestine	2020	2021	-	Mar	Sat<=30	0:00	1:00	S
- Rule Palestine	2020	only	-	Oct	24	1:00	0	-
-Rule Palestine	2021	max	-	Oct	Fri>=23	1:00	0	-
-Rule Palestine	2022	max	-	Mar	Sun>=25	0:00	1:00	S
-+Rule Palestine	2021	only	-	Oct	29	1:00	0	-
-+Rule Palestine	2022	only	-	Mar	27	0:00	1:00	S
-+Rule Palestine	2022	max	-	Oct	Sat<=30	2:00	0	-
-+Rule Palestine	2023	max	-	Mar	Sat<=30	2:00	1:00	S
- 
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
-diff --git a/src/java.base/share/data/tzdata/backward b/src/java.base/share/data/tzdata/backward
-index d4a29e8cf29..7765d99aedf 100644
--- a/src/java.base/share/data/tzdata/backward
-+++ b/src/java.base/share/data/tzdata/backward
-@@ -113,6 +113,8 @@ Link	Etc/UTC			Etc/UCT
- Link	Europe/London		Europe/Belfast
- Link	Europe/Kyiv		Europe/Kiev
- Link	Europe/Chisinau		Europe/Tiraspol
-+Link	Europe/Kyiv		Europe/Uzhgorod
-+Link	Europe/Kyiv		Europe/Zaporozhye
- Link	Europe/London		GB
- Link	Europe/London		GB-Eire
- Link	Etc/GMT			GMT+0
-diff --git a/src/java.base/share/data/tzdata/europe b/src/java.base/share/data/tzdata/europe
-index 879b5337536..accc845dbaf 100644
--- a/src/java.base/share/data/tzdata/europe
-+++ b/src/java.base/share/data/tzdata/europe
-@@ -2638,10 +2638,14 @@ Zone Europe/Simferopol	 2:16:24 -	LMT	1880
- # From Alexander Krivenyshev (2014-03-17):
- # time change at 2:00 (2am) on March 30, 2014
- # https://vz.ru/news/2014/3/17/677464.html
-# From Paul Eggert (2014-03-30):
-# Simferopol and Sevastopol reportedly changed their central town clocks
-# late the previous day, but this appears to have been ceremonial
-# and the discrepancies are small enough to not worry about.
-+# From Tim Parenti (2022-07-01), per Paul Eggert (2014-03-30):
-+# The clocks at the railway station in Simferopol were put forward from 22:00
-+# to 24:00 the previous day in a "symbolic ceremony"; however, per
-+# contemporaneous news reports, "ordinary Crimeans [made] the daylight savings
-+# time switch at 2am" on Sunday.
-+# https://www.business-standard.com/article/pti-stories/crimea-to-set-clocks-to-russia-time-114033000014_1.html
-+# https://www.reuters.com/article/us-ukraine-crisis-crimea-time/crimea-switches-to-moscow-time-amid-incorporation-frenzy-idUKBREA2S0LT20140329
-+# https://www.bbc.com/news/av/world-europe-26806583
- 			 2:00	EU	EE%sT	2014 Mar 30  2:00
- 			 4:00	-	MSK	2014 Oct 26  2:00s
- 			 3:00	-	MSK
-@@ -3774,8 +3778,8 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
- # US colleague David Cochrane) are still trying to get more
- # information upon these local deviations from Kiev rules.
- #
-# From Paul Eggert (2022-02-08):
-# For now, assume that Ukraine's other three zones followed the same rules,
-+# From Paul Eggert (2022-08-27):
-+# For now, assume that Ukraine's zones all followed the same rules,
- # except that Crimea switched to Moscow time in 1994 as described elsewhere.
- 
- # From Igor Karpov, who works for the Ukrainian Ministry of Justice,
-@@ -3845,21 +3849,7 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
- # * Ukrainian Government's Resolution of 20.03.1992, No. 139.
- # http://www.uazakon.com/documents/date_8u/pg_grcasa.htm
- 
-# From Paul Eggert (2022-04-12):
-# As is usual in tzdb, Ukrainian zones use the most common English spellings.
-# In particular, tzdb's name Europe/Kyiv uses the most common spelling in
-# English for Ukraine's capital.  Although tzdb's former name was Europe/Kiev,
-# "Kyiv" is now more common due to widespread reporting of the current conflict.
-# Conversely, tzdb continues to use the names Europe/Uzhgorod and
-# Europe/Zaporozhye; this is similar to tzdb's use of Europe/Prague, which is
-# certainly wrong as a transliteration of the Czech "Praha".
-# English-language spelling of Ukrainian names is in flux, and
-# some day "Uzhhorod" or "Zaporizhzhia" may become substantially more
-# common in English; in the meantime, do not change these
-# English spellings as that means less disruption for our users.
-
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-# This represents most of Ukraine.  See above for the spelling of "Kyiv".
- Zone Europe/Kyiv	2:02:04 -	LMT	1880
- 			2:02:04	-	KMT	1924 May  2 # Kyiv Mean Time
- 			2:00	-	EET	1930 Jun 21
-@@ -3869,34 +3859,6 @@ Zone Europe/Kyiv	2:02:04 -	LMT	1880
- 			2:00	1:00	EEST	1991 Sep 29  3:00
- 			2:00	C-Eur	EE%sT	1996 May 13
- 			2:00	EU	EE%sT
-# Transcarpathia used CET 1990/1991.
-# "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
-# "Uzhgorod" is more common in English.
-Zone Europe/Uzhgorod	1:29:12 -	LMT	1890 Oct
-			1:00	-	CET	1940
-			1:00	C-Eur	CE%sT	1944 Oct
-			1:00	1:00	CEST	1944 Oct 26
-			1:00	-	CET	1945 Jun 29
-			3:00	Russia	MSK/MSD	1990
-			3:00	-	MSK	1990 Jul  1  2:00
-			1:00	-	CET	1991 Mar 31  3:00
-			2:00	-	EET	1992 Mar 20
-			2:00	C-Eur	EE%sT	1996 May 13
-			2:00	EU	EE%sT
-# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
-# "Zaporizhzhia" is the transliteration of the Ukrainian name, but
-# "Zaporozh'ye" is more common in English.  Use the common English
-# spelling, except omit the apostrophe as it is not allowed in
-# portable Posix file names.
-Zone Europe/Zaporozhye	2:20:40 -	LMT	1880
-			2:20	-	+0220	1924 May  2
-			2:00	-	EET	1930 Jun 21
-			3:00	-	MSK	1941 Aug 25
-			1:00	C-Eur	CE%sT	1943 Oct 25
-			3:00	Russia	MSK/MSD	1991 Mar 31  2:00
-			2:00	E-Eur	EE%sT	1992 Mar 20
-			2:00	C-Eur	EE%sT	1996 May 13
-			2:00	EU	EE%sT
- 
- # Vatican City
- # See Europe/Rome.
-diff --git a/src/java.base/share/data/tzdata/southamerica b/src/java.base/share/data/tzdata/southamerica
-index 13ec081c7e0..3c0e0e2061c 100644
--- a/src/java.base/share/data/tzdata/southamerica
-+++ b/src/java.base/share/data/tzdata/southamerica
-@@ -1332,8 +1332,14 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
- # for America/Santiago will start on midnight of September 11th;
- # and will end on April 1st, 2023. Magallanes region (America/Punta_Arenas)
- # will keep UTC -3 "indefinitely"...  This is because on September 4th
-# we will have a voting whether to approve a new Constitution....
-# https://www.interior.gob.cl/noticias/2022/08/09/comunicado-el-proximo-sabado-10-de-septiembre-los-relojes-se-deben-adelantar-una-hora/
-+# we will have a voting whether to approve a new Constitution.
-+#
-+# From Eduardo Romero Urra (2022-08-17):
-+# https://www.diariooficial.interior.gob.cl/publicaciones/2022/08/13/43327/01/2172567.pdf
-+#
-+# From Paul Eggert (2022-08-17):
-+# Although the presidential decree stops at fall 2026, assume that
-+# similar DST rules will continue thereafter.
- 
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
- Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	-
-diff --git a/src/java.base/share/data/tzdata/zone.tab b/src/java.base/share/data/tzdata/zone.tab
-index 51b65fa273c..ee025196e50 100644
--- a/src/java.base/share/data/tzdata/zone.tab
-+++ b/src/java.base/share/data/tzdata/zone.tab
-@@ -424,8 +424,6 @@ TV	-0831+17913	Pacific/Funafuti
- TW	+2503+12130	Asia/Taipei
- TZ	-0648+03917	Africa/Dar_es_Salaam
- UA	+5026+03031	Europe/Kyiv	Ukraine (most areas)
-UA	+4837+02218	Europe/Uzhgorod	Transcarpathia
-UA	+4750+03510	Europe/Zaporozhye	Zaporozhye and east Lugansk
- UG	+0019+03225	Africa/Kampala
- UM	+2813-17722	Pacific/Midway	Midway Islands
- UM	+1917+16637	Pacific/Wake	Wake Island
-diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
-index c32bee39fba..71470168456 100644
--- a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
-+++ b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
-@@ -1 +1 @@
-tzdata2022c
-+tzdata2022d
-diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt b/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt
-index a5e6428a3f5..e3ce742f887 100644
--- a/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt
-+++ b/test/jdk/java/util/TimeZone/TimeZoneData/aliases.txt
-@@ -183,6 +183,8 @@ Link	Etc/UTC			Etc/UCT
- Link	Europe/London		Europe/Belfast
- Link	Europe/Kyiv		Europe/Kiev
- Link	Europe/Chisinau		Europe/Tiraspol
-+Link	Europe/Kyiv		Europe/Uzhgorod
-+Link	Europe/Kyiv		Europe/Zaporozhye
- Link	Europe/London		GB
- Link	Europe/London		GB-Eire
- Link	Etc/GMT			GMT+0
-diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
-index fc148537f1f..b3823958ae4 100644
--- a/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
-+++ b/test/jdk/java/util/TimeZone/TimeZoneData/displaynames.txt
-@@ -163,11 +163,9 @@ Europe/Simferopol MSK
- Europe/Sofia EET EEST
- Europe/Tallinn EET EEST
- Europe/Tirane CET CEST
-Europe/Uzhgorod EET EEST
- Europe/Vienna CET CEST
- Europe/Vilnius EET EEST
- Europe/Warsaw CET CEST
-Europe/Zaporozhye EET EEST
- Europe/Zurich CET CEST
- HST HST
- MET MET MEST
-diff --git a/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java b/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java
-index ef6405860f5..221e0d5d29c 100644
--- a/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java
-+++ b/test/jdk/sun/util/calendar/zi/TestZoneInfo310.java
-@@ -176,11 +176,12 @@ public class TestZoneInfo310 {
-              * save time in IANA tzdata. This bug is tracked via JDK-8223388.
-              *
-              * These are the zones/rules that employ negative DST in vanguard
-             * format (as of 2019a):
-+             * format (as of 2019a), Palestine added in 2022d:
-              *
-              *  - Rule "Eire"
-              *  - Rule "Morocco"
-              *  - Rule "Namibia"
-+             *  - Rule "Palestine"
-              *  - Zone "Europe/Prague"
-              *
-              * Tehran/Iran rule has rules beyond 2037, in which javazic assumes
-@@ -196,6 +197,8 @@ public class TestZoneInfo310 {
-                 zid.equals("Europe/Dublin") || // uses "Eire" rule
-                 zid.equals("Europe/Prague") ||
-                 zid.equals("Asia/Tehran") || // last rule mismatch
-+                zid.equals("Asia/Gaza") || // uses "Palestine" rule
-+                zid.equals("Asia/Hebron") || // uses "Palestine" rule
-                 zid.equals("Iran")) { // last rule mismatch
-                     continue;
-             }
--- a/jdk8295173-tzdata2022e.patch
+++ b/jdk8295173-tzdata2022e.patch
@ -1,422 +0,0 @@
-commit 03d3e3ddff8e9cddfda7bec3a62e5547abe630db
-Author: Yoshiki Sato <ysatowse@openjdk.org>
-Date:   Tue Oct 18 08:21:15 2022 +0000
-
-    8295173: (tz) Update Timezone Data to 2022e
-    
-    Backport-of: 21407dec0156301871a83328615e4d975c4287c4
-
-diff --git a/src/java.base/share/data/tzdata/VERSION b/src/java.base/share/data/tzdata/VERSION
-index 889d0e6dad7..b8cb36e69f4 100644
--- a/src/java.base/share/data/tzdata/VERSION
-+++ b/src/java.base/share/data/tzdata/VERSION
-@@ -21,4 +21,4 @@
- # or visit www.oracle.com if you need additional information or have any
- # questions.
- #
-tzdata2022d
-+tzdata2022e
-diff --git a/src/java.base/share/data/tzdata/asia b/src/java.base/share/data/tzdata/asia
-index f9df7432947..5b2337fd0b6 100644
--- a/src/java.base/share/data/tzdata/asia
-+++ b/src/java.base/share/data/tzdata/asia
-@@ -2254,6 +2254,17 @@ Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 31 15:00u
- # From the Arabic version, it seems to say it would be at midnight
- # (assume 24:00) on the last Thursday in February, starting from 2022.
- 
-+# From Issam Al-Zuwairi (2022-10-05):
-+# The Council of Ministers in Jordan decided Wednesday 5th October 2022,
-+# that daylight saving time (DST) will be throughout the year....
-+#
-+# From Brian Inglis (2022-10-06):
-+# https://petra.gov.jo/Include/InnerPage.jsp?ID=45567&lang=en&name=en_news
-+#
-+# From Paul Eggert (2022-10-05):
-+# Like Syria, model this as a transition from EEST +03 (DST) to plain +03
-+# (non-DST) at the point where DST would otherwise have ended.
-+
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
- Rule	Jordan	1973	only	-	Jun	6	0:00	1:00	S
- Rule	Jordan	1973	1975	-	Oct	1	0:00	0	-
-@@ -2285,11 +2296,12 @@ Rule	Jordan	2005	only	-	Sep	lastFri	0:00s	0	-
- Rule	Jordan	2006	2011	-	Oct	lastFri	0:00s	0	-
- Rule	Jordan	2013	only	-	Dec	20	0:00	0	-
- Rule	Jordan	2014	2021	-	Mar	lastThu	24:00	1:00	S
-Rule	Jordan	2014	max	-	Oct	lastFri	0:00s	0	-
-Rule	Jordan	2022	max	-	Feb	lastThu	24:00	1:00	S
-+Rule	Jordan	2014	2022	-	Oct	lastFri	0:00s	0	-
-+Rule	Jordan	2022	only	-	Feb	lastThu	24:00	1:00	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Amman	2:23:44 -	LMT	1931
-			2:00	Jordan	EE%sT
-+			2:00	Jordan	EE%sT	2022 Oct 28 0:00s
-+			3:00	-	+03
- 
- 
- # Kazakhstan
-@@ -3838,19 +3850,27 @@ Rule	Syria	2007	only	-	Nov	 Fri>=1	0:00	0	-
- # Our brief summary:
- # https://www.timeanddate.com/news/time/syria-dst-2012.html
- 
-# From Arthur David Olson (2012-03-27):
-# Assume last Friday in March going forward XXX.
-+# From Steffen Thorsen (2022-10-05):
-+# Syria is adopting year-round DST, starting this autumn....
-+# From https://www.enabbaladi.net/archives/607812
-+# "This [the decision] came after the weekly government meeting today,
-+# Tuesday 4 October ..."
-+#
-+# From Paul Eggert (2022-10-05):
-+# Like Jordan, model this as a transition from EEST +03 (DST) to plain +03
-+# (non-DST) at the point where DST would otherwise have ended.
- 
- Rule	Syria	2008	only	-	Apr	Fri>=1	0:00	1:00	S
- Rule	Syria	2008	only	-	Nov	1	0:00	0	-
- Rule	Syria	2009	only	-	Mar	lastFri	0:00	1:00	S
- Rule	Syria	2010	2011	-	Apr	Fri>=1	0:00	1:00	S
-Rule	Syria	2012	max	-	Mar	lastFri	0:00	1:00	S
-Rule	Syria	2009	max	-	Oct	lastFri	0:00	0	-
-+Rule	Syria	2012	2022	-	Mar	lastFri	0:00	1:00	S
-+Rule	Syria	2009	2022	-	Oct	lastFri	0:00	0	-
- 
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Damascus	2:25:12 -	LMT	1920 # Dimashq
-			2:00	Syria	EE%sT
-+			2:00	Syria	EE%sT	2022 Oct 28 0:00
-+			3:00	-	+03
- 
- # Tajikistan
- # From Shanks & Pottenger.
-diff --git a/src/java.base/share/data/tzdata/europe b/src/java.base/share/data/tzdata/europe
-index accc845dbaf..2832c4b9763 100644
--- a/src/java.base/share/data/tzdata/europe
-+++ b/src/java.base/share/data/tzdata/europe
-@@ -3417,7 +3417,7 @@ Zone	Europe/Madrid	-0:14:44 -	LMT	1901 Jan  1  0:00u
- 			 0:00	Spain	WE%sT	1940 Mar 16 23:00
- 			 1:00	Spain	CE%sT	1979
- 			 1:00	EU	CE%sT
-Zone	Africa/Ceuta	-0:21:16 -	LMT	1900 Dec 31 23:38:44
-+Zone	Africa/Ceuta	-0:21:16 -	LMT	1901 Jan  1  0:00u
- 			 0:00	-	WET	1918 May  6 23:00
- 			 0:00	1:00	WEST	1918 Oct  7 23:00
- 			 0:00	-	WET	1924
-diff --git a/src/java.base/share/data/tzdata/northamerica b/src/java.base/share/data/tzdata/northamerica
-index 114cef14cce..ce4ee74582c 100644
--- a/src/java.base/share/data/tzdata/northamerica
-+++ b/src/java.base/share/data/tzdata/northamerica
-@@ -462,7 +462,7 @@ Rule	Chicago	1922	1966	-	Apr	lastSun	2:00	1:00	D
- Rule	Chicago	1922	1954	-	Sep	lastSun	2:00	0	S
- Rule	Chicago	1955	1966	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 12:09:24
-+Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 18:00u
- 			-6:00	US	C%sT	1920
- 			-6:00	Chicago	C%sT	1936 Mar  1  2:00
- 			-5:00	-	EST	1936 Nov 15  2:00
-@@ -471,7 +471,7 @@ Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 12:09:24
- 			-6:00	Chicago	C%sT	1967
- 			-6:00	US	C%sT
- # Oliver County, ND switched from mountain to central time on 1992-10-25.
-Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:14:48
-+Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 19:00u
- 			-7:00	US	M%sT	1992 Oct 25  2:00
- 			-6:00	US	C%sT
- # Morton County, ND, switched from mountain to central time on
-@@ -481,7 +481,7 @@ Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:14:48
- # Jones, Mellette, and Todd Counties in South Dakota;
- # but in practice these other counties were already observing central time.
- # See <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
--- a/jdk8295447-npe_in_constructor.patch
+++ b/jdk8295447-npe_in_constructor.patch
@ -0,0 +1,97 @@
+commit c9d485792b99233f381dcdfd69838e7b973909bd
+Author: Victor Rudometov <vrudomet@openjdk.org>
+Date:   Thu Dec 1 10:57:43 2022 +0000
+
+    8295447: NullPointerException with invalid pattern matching construct in constructor call
+    
+    Backport-of: 6c05771b9be3dd5cbcdb40d2e53cc53959926cdd
+
+diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+index 21cc8e57e1f..46b076d3d03 100644
+--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+@@ -4145,6 +4145,10 @@ public class Attr extends JCTree.Visitor {
+                                          Type exprType,
+                                          Type pattType) {
+         Warner warner = new Warner();
+        // if any type is erroneous, the problem is reported elsewhere
+        if (exprType.isErroneous() || pattType.isErroneous()) {
+            return false;
+        }
+         if (!types.isCastable(exprType, pattType, warner)) {
+             chk.basicHandler.report(pos,
+                     diags.fragment(Fragments.InconvertibleTypes(exprType, pattType)));
+@@ -4206,7 +4210,7 @@ public class Attr extends JCTree.Visitor {
+             tree.record = record;
+         } else {
+             log.error(tree.pos(), Errors.DeconstructionPatternOnlyRecords(site.tsym));
+-            expectedRecordTypes = Stream.generate(() -> Type.noType)
+            expectedRecordTypes = Stream.generate(() -> types.createErrorType(tree.type))
+                                 .limit(tree.nested.size())
+                                 .collect(List.collector());
+         }
+diff --git a/test/langtools/tools/javac/T8295447.java b/test/langtools/tools/javac/T8295447.java
+new file mode 100644
+index 00000000000..76fcaf10f8d
+--- /dev/null
+++ b/test/langtools/tools/javac/T8295447.java
+@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/**
+ * @test
+ * @bug 8295447
+ * @summary NullPointerException with invalid pattern matching construct in constructor call
+ * @modules jdk.compiler
+ * @compile/fail/ref=T8295447.out -XDrawDiagnostics --enable-preview -source ${jdk.version} T8295447.java
+ */
+public class T8295447 {
+    class Foo {
+        void m(Object o) {
+            if(o instanceof Foo(int x)) {}
+        }
+
+        Foo(Object o) {
+            m((o instanceof Foo(int x))? 0 : 1);
+        }
+        void m(int i) { }
+    }
+
+    class Base { int i; Base(int j) { i = j; } }
+    class Sub extends Base {
+        Sub(Object o) { super(o instanceof java.awt.Point(int x, int y)? x + y: 0); }
+    }
+}
+diff --git a/test/langtools/tools/javac/T8295447.out b/test/langtools/tools/javac/T8295447.out
+new file mode 100644
+index 00000000000..7f6746f802f
+--- /dev/null
+++ b/test/langtools/tools/javac/T8295447.out
+@@ -0,0 +1,6 @@
+T8295447.java:33:29: compiler.err.deconstruction.pattern.only.records: T8295447.Foo
+T8295447.java:37:29: compiler.err.deconstruction.pattern.only.records: T8295447.Foo
+T8295447.java:44:44: compiler.err.deconstruction.pattern.only.records: java.awt.Point
+- compiler.note.preview.filename: T8295447.java, DEFAULT
+- compiler.note.preview.recompile
+3 errors
+\ No newline at end of file
--- a/jdk8296108-tzdata2022f.patch
+++ b/jdk8296108-tzdata2022f.patch
--- a/jdk8296239-iso4217_up174.patch
+++ b/jdk8296239-iso4217_up174.patch
@ -0,0 +1,79 @@
+commit bf899de7aa8cc862ed123865b9aa26e06d96a7de
+Author: duke <duke@openjdk.org>
+Date:   Thu Jan 26 00:55:32 2023 +0000
+
+    Backport fd837649811c866c144c9133d211fb5ad8f994a7
+
+diff --git a/src/java.base/share/data/currency/CurrencyData.properties b/src/java.base/share/data/currency/CurrencyData.properties
+index 688de592c7b..d234c96c476 100644
+--- a/src/java.base/share/data/currency/CurrencyData.properties
+++ b/src/java.base/share/data/currency/CurrencyData.properties
+@@ -32,7 +32,7 @@ formatVersion=3
+ # Version of the currency code information in this class.
+ # It is a serial number that accompanies with each amendment.
+ 
+-dataVersion=173
+dataVersion=174
+ 
+ # List of all valid ISO 4217 currency codes.
+ # To ensure compatibility, do not remove codes.
+@@ -189,7 +189,7 @@ CR=CRC
+ # COTE D'IVOIRE
+ CI=XOF
+ # CROATIA
+-HR=HRK
+HR=HRK;2022-12-31-23-00-00;EUR
+ # CUBA
+ CU=CUP
+ # Cura\u00e7ao
+diff --git a/test/jdk/java/util/Currency/ValidateISO4217.java b/test/jdk/java/util/Currency/ValidateISO4217.java
+index b7e64f318b1..b6a91835b19 100644
+--- a/test/jdk/java/util/Currency/ValidateISO4217.java
+++ b/test/jdk/java/util/Currency/ValidateISO4217.java
+@@ -24,7 +24,7 @@
+  * @test
+  * @bug 4691089 4819436 4942982 5104960 6544471 6627549 7066203 7195759
+  *      8039317 8074350 8074351 8145952 8187946 8193552 8202026 8204269
+- *      8208746 8209775 8264792 8274658 8283277
+ *      8208746 8209775 8264792 8274658 8283277 8296239
+  * @summary Validate ISO 4217 data for Currency class.
+  * @modules java.base/java.util:open
+  *          jdk.localedata
+@@ -34,7 +34,7 @@
+  * ############################################################################
+  *
+  *  ValidateISO4217 is a tool to detect differences between the latest ISO 4217
+- *  data and and Java's currency data which is based on ISO 4217.
+ *  data and Java's currency data which is based on ISO 4217.
+  *  If there is a difference, the following file which includes currency data
+  *  may need to be updated.
+  *      src/share/classes/java/util/CurrencyData.properties
+diff --git a/test/jdk/java/util/Currency/tablea1.txt b/test/jdk/java/util/Currency/tablea1.txt
+index 3e107823042..3eef0eba00e 100644
+--- a/test/jdk/java/util/Currency/tablea1.txt
+++ b/test/jdk/java/util/Currency/tablea1.txt
+@@ -1,12 +1,12 @@
+ #
+ #
+-# Amendments up until ISO 4217 AMENDMENT NUMBER 173
+-#   (As of 23 September 2022)
+# Amendments up until ISO 4217 AMENDMENT NUMBER 174
+#   (As of 2 November 2022)
+ #
+ 
+ # Version
+ FILEVERSION=3
+-DATAVERSION=173
+DATAVERSION=174
+ 
+ # ISO 4217 currency data
+ AF	AFN	971	2
+@@ -67,7 +67,7 @@ CD	CDF	976	2
+ CK	NZD	554	2
+ CR	CRC	188	2
+ CI	XOF	952	0
+-HR	HRK	191	2
+HR	HRK	191	2	2022-12-31-23-00-00	EUR	978	2
+ CU	CUP	192	2
+ CW	ANG	532	2
+ CY	EUR	978	2
--- a/jdk8296715-cldr2022f.patch
+++ b/jdk8296715-cldr2022f.patch
@ -1,90 +1 @@
-commit 55dd90222e2cef11ebca39a2998d8f799aadbb9a
-Author: Yoshiki Sato <ysatowse@openjdk.org>
-Date:   Tue Nov 15 00:51:21 2022 +0000
-
-    8296715: CLDR v42 update for tzdata 2022f
-    
-    Reviewed-by: naoto
-
-diff --git a/make/data/cldr/common/main/es_419.xml b/make/data/cldr/common/main/es_419.xml
-index eeef247d3d0..73f8b7f4edf 100644
--- a/make/data/cldr/common/main/es_419.xml
-+++ b/make/data/cldr/common/main/es_419.xml
-@@ -1019,11 +1019,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
- 		<decimalFormats numberSystem="latn">
- 			<decimalFormatLength type="long">
- 				<decimalFormat>
-					<pattern type="1000000000000" count="one">0 billón</pattern>
- 					<pattern type="1000000000000" count="other">0 billón</pattern>
-					<pattern type="10000000000000" count="one">00 billones</pattern>
- 					<pattern type="10000000000000" count="other">00 billones</pattern>
-					<pattern type="100000000000000" count="one">000 billones</pattern>
- 					<pattern type="100000000000000" count="other">000 billones</pattern>
- 				</decimalFormat>
- 			</decimalFormatLength>
-diff --git a/make/data/cldr/common/main/es_MX.xml b/make/data/cldr/common/main/es_MX.xml
-index 6632c099084..816996b30c3 100644
--- a/make/data/cldr/common/main/es_MX.xml
-+++ b/make/data/cldr/common/main/es_MX.xml
-@@ -707,11 +707,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
- 		<decimalFormats numberSystem="latn">
- 			<decimalFormatLength type="long">
- 				<decimalFormat>
-					<pattern type="1000000000000" count="one">0 billón</pattern>
- 					<pattern type="1000000000000" count="other">0 billones</pattern>
-					<pattern type="10000000000000" count="one">00 billones</pattern>
- 					<pattern type="10000000000000" count="other">00 billones</pattern>
-					<pattern type="100000000000000" count="one">000 billones</pattern>
- 					<pattern type="100000000000000" count="other">000 billones</pattern>
- 				</decimalFormat>
- 			</decimalFormatLength>
-diff --git a/make/data/cldr/common/supplemental/metaZones.xml b/make/data/cldr/common/supplemental/metaZones.xml
-index a3c76520554..bfdadad6ba2 100644
--- a/make/data/cldr/common/supplemental/metaZones.xml
-+++ b/make/data/cldr/common/supplemental/metaZones.xml
-@@ -330,7 +330,8 @@ For terms of use, see http://www.unicode.org/copyright.html
- 			</timezone>
- 			<timezone type="America/Chihuahua">
- 				<usesMetazone to="1998-04-05 09:00" mzone="America_Central"/>
-				<usesMetazone from="1998-04-05 09:00" mzone="Mexico_Pacific"/>
-+				<usesMetazone to="2022-10-30 08:00" from="1998-04-05 09:00" mzone="Mexico_Pacific"/>
-+				<usesMetazone from="2022-10-30 08:00" mzone="America_Central"/>
- 			</timezone>
- 			<timezone type="America/Coral_Harbour">
- 				<usesMetazone mzone="America_Eastern"/>
-@@ -613,7 +614,8 @@ For terms of use, see http://www.unicode.org/copyright.html
- 			</timezone>
- 			<timezone type="America/Ojinaga">
- 				<usesMetazone to="1998-04-05 09:00" mzone="America_Central"/>
-				<usesMetazone from="1998-04-05 09:00" mzone="America_Mountain"/>
-+				<usesMetazone to="2022-10-30 08:00" from="1998-04-05 09:00" mzone="America_Mountain"/>
-+				<usesMetazone from="2022-10-30 08:00" mzone="America_Central"/>
- 			</timezone>
- 			<timezone type="America/Panama">
- 				<usesMetazone mzone="America_Eastern"/>
-diff --git a/test/jdk/sun/text/resources/LocaleData.cldr b/test/jdk/sun/text/resources/LocaleData.cldr
-index 1282c42288f..3783061d487 100644
--- a/test/jdk/sun/text/resources/LocaleData.cldr
-+++ b/test/jdk/sun/text/resources/LocaleData.cldr
-@@ -8394,3 +8394,7 @@ FormatData/de/latn.NumberElements/12=
- FormatData/de_AT/latn.NumberElements/12=.
- FormatData/fr/latn.NumberElements/11=
- FormatData/fr_CH/latn.NumberElements/11=.
-+
-+# tzdata2022f
-+TimeZoneNames/en/America\/Ojinaga/1=Central Standard Time
-+TimeZoneNames/en/America\/Chihuahua/1=Central Standard Time
-diff --git a/test/jdk/sun/text/resources/LocaleDataTest.java b/test/jdk/sun/text/resources/LocaleDataTest.java
-index a959796e079..605fa74ca6c 100644
--- a/test/jdk/sun/text/resources/LocaleDataTest.java
-+++ b/test/jdk/sun/text/resources/LocaleDataTest.java
-@@ -40,7 +40,7 @@
-  *      8145136 8145952 8164784 8037111 8081643 7037368 8178872 8185841 8190918
-  *      8187946 8195478 8181157 8179071 8193552 8202026 8204269 8202537 8208746
-  *      8209775 8221432 8227127 8230284 8231273 8233579 8234288 8250665 8255086
- *      8251317 8274658 8283277 8283805 8265315
-+ *      8251317 8274658 8283277 8283805 8265315 8296715
-  * @summary Verify locale data
-  * @modules java.base/sun.util.resources
-  * @modules jdk.localedata

--- a/jdk8299439-test_for_hr.patch
+++ b/jdk8299439-test_for_hr.patch
@ -0,0 +1,63 @@
+commit cf262d7441d797942d33ed2a79540230fc5c97fa
+Author: Christoph Langer <clanger@openjdk.org>
+Date:   Thu Jan 12 08:02:58 2023 +0000
+
+    8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR
+    
+    Reviewed-by: naoto
+    Backport-of: 3b374c0153950ab193f3a188b57d3404b4ce2fe2
+
+diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties
+index 70f210e2da6..56e61953a8c 100644
+--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties
+@@ -1,5 +1,5 @@
+ # 
+-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -35,4 +35,5 @@
+ # This notice and attribution to Taligent may not be removed.
+ # Taligent is a registered trademark of Taligent, Inc.
+ 
+EUR=\u20AC
+ HRK=Kn
+diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
+index dc167492272..a806ebe778a 100644
+--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
+@@ -1,6 +1,6 @@
+ ###########################################################################
+ #
+-# Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+diff --git a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties
+index cf73a9c7e31..665dd3b290a 100644
+--- a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties
+++ b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties
+@@ -79,7 +79,7 @@ fr_FR=\u20AC
+ fr_LU=\u20AC
+ hi_IN=\u0930\u0942
+ hr=\u00A4
+-hr_HR=Kn
+hr_HR=\u20AC
+ hu=\u00A4
+ hu_HU=Ft
+ is=\u00A4
+@@ -94,9 +94,9 @@ ja_JP=\uFFE5
+ ko=\u00A4
+ ko_KR=\uFFE6
+ lt=\u00A4
+-lt_LT=Lt;2014-12-31-22-00-00;\u20AC
+lt_LT=\u20AC
+ lv=\u00A4
+-lv_LV=Ls;2013-12-31-22-00-00;\u20AC
+lv_LV=\u20AC
+ mk=\u00A4
+ mk_MK=Den
+ nl=\u00A4
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (openjdk-jdk19u-jdk-19.0.1+10.tar.xz) = c39a6b2919247f69ce8b66766101ebf7b81714043e961ca6b5303e9cb0ffeddb3ceab826b168757f6b4db6b558f0ede59ffdc758ed273d98f19559d965dd2080
+SHA512 (openjdk-jdk19u-jdk-19.0.2+7.tar.xz) = f9b54ae43074caa53773000ed8000ff5592cda44b2bef8fafa2c38cf623048722c34a111aacfd1831050525804230b29cc20fd95ad2162c43412b957190cc7b0