Update to jdk-11.0.18+9

Update release notes to 11.0.18+9
Drop local copy of JDK-8293834 now this is upstream
Require tzdata 2022g due to inclusion of JDK-8296108, JDK-8296715 & JDK-8297804
Update TestTranslations.java to test the new America/Ciudad_Juarez zone

Resolves: rhbz#2150197

.gitignore

@@ -111,3 +111,4 @@
 /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
+/openjdk-jdk11u-jdk-11.0.18+9-4curve.tar.xz

NEWS

@@ -14,16 +14,21 @@ Live versions of these release notes can be found at:
   - 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-8022403: sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java fails
   - JDK-8028998: [TEST_BUG] [macosx] java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java failed
+  - JDK-8029633: Raw inner class constructor ref should not perform diamond inference
   - 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-8178698: javax/sound/midi/Sequencer/MetaCallback.java failed with timeout
   - 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-8199290: [TESTBUG] sun.hotspot.WhiteBox$WhiteBoxPermission is not copied
+  - JDK-8202836: [macosx] test java/awt/Graphics/TextAAHintsTest.java fails
   - 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
@@ -31,7 +36,9 @@ Live versions of these release notes can be found at:
   - 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-8222091: Javadoc does not handle package annotations correctly on package-info.java
   - JDK-8222251: preflow visitor is not visiting lambda expressions
+  - JDK-8226236: win32: gc/metaspace/TestCapacityUntilGCWrapAround.java fails
   - 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
@@ -51,44 +58,70 @@ Live versions of these release notes can be found at:
   - 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-8255439: System Tray icons get corrupted when Windows scaling changes
+  - JDK-8256109: Create implementation for NSAccessibilityButton protocol
+  - JDK-8257679: Improved unix compatibility layer in Windows build (winenv)
+  - JDK-8257722: Improve "keytool -printcert -jarfile" output
+  - JDK-8258005: JDK build fails with incorrect fixpath script
+  - JDK-8259485: Document need for short paths when building on Windows
+  - JDK-8260272: bash configure --prefix does not work after JDK-8257679
   - JDK-8261336: IGV: enhance default filters
+  - JDK-8261445: Use memory_order_relaxed for os::random().
   - 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-8264666: Change implementation of safeAdd/safeMult in the LCMSImageLayout class
   - JDK-8266082: AssertionError in Annotate.fromAnnotations with -Xdoclint
   - JDK-8266967: debug.cpp utility find() should print Java Object fields.
+  - JDK-8268361: Fix the infinite loop in next_line
+  - JDK-8268860: Windows-Aarch64 build is failing in GitHub actions
   - 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-8273236: keytool does not accurately warn about algorithms that are disabled but have additional constraints
   - 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-8273685: Remove jtreg tag manual=yesno for  java/awt/Graphics/LCDTextAndGraphicsState.java & show test instruction
+  - JDK-8274029: Remove jtreg tag manual=yesno for  java/awt/print/Dialog/DialogOrient.java
   - 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-8274456: Remove jtreg tag manual=yesno  java/awt/print/PrinterJob/PageDialogTest.java
   - 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-8277497: Last column cell in the JTable row is read as empty cell
+  - JDK-8277881: Missing SessionID in TLS1.3 resumption in compatibility mode
+  - JDK-8277970: Test jdk/sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.java fails with "tag mismatch"
   - 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-8280550: SplittableRandom#nextDouble(double,double) can return result >= bound
+  - JDK-8280863: Update build README to reflect that MSYS2 is supported
+  - JDK-8280890: Cannot use '-Djava.system.class.loader' with class loader in signed JAR
   - JDK-8280948: Write a regression test for JDK-4659800
+  - JDK-8280950: RandomGenerator:NextDouble() default behavior non conformant after JDK-8280550 fix
+  - JDK-8281183: RandomGenerator:NextDouble() default behavior partially fixed by JDK-8280950
   - 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-8282306: os::is_first_C_frame(frame*) crashes on invalid link access
   - 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-8282730: LdapLoginModule throw NPE from logout method after login failure
   - 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-8283199: Linux os::cpu_microcode_revision() stalls cold startup
   - 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
@@ -96,20 +129,33 @@ Live versions of these release notes can be found at:
   - 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-8284771: java/util/zip/CloseInflaterDeflaterTest.java failed with "AssertionError: Expected IOException to be thrown, but nothing was thrown"
   - 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-8285604: closed sun/java2d/GdiRendering/ClipShapeRendering.java failed with "Incorrect color ffeeeeee instead of ff0000ff in pixel (100, 100)"
   - 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-8285794: AsyncGetCallTrace might acquire a lock via JavaThread::thread_from_jni_environment
   - 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-8286624: Regression Test CoordinateTruncationBug.java fails on OL8.3
   - JDK-8286663: Resolve IDE warnings in WTrayIconPeer and SystemTray
   - JDK-8286772: java/awt/dnd/DropTargetInInternalFrameTest/DropTargetInInternalFrameTest.html times out and fails in Windows
+  - JDK-8286872: Refactor add/modify notification icon (TrayIcon)
   - JDK-8287076: Document.normalizeDocument() produces different results
   - JDK-8287091: aarch64 : guarantee(val < (1ULL << nbits)) failed: Field too big for insn
+  - JDK-8287425: Remove unnecessary register push for MacroAssembler::check_klass_subtype_slow_path
   - JDK-8287609: macOS: SIGSEGV at [CoreFoundation] CFArrayGetCount / sun.font.CFont.getTableBytesNative
+  - JDK-8287724: Fix various issues with msys2
+  - JDK-8287826: javax/accessibility/4702233/AccessiblePropertiesTest.java fails to compile
+  - JDK-8287895: Some langtools tests fail on msys2
+  - JDK-8287896: PropertiesTest.sh fail on msys2
+  - JDK-8287902: UnreadableRB case in MissingResourceCauseTest is not working reliably on Windows
   - JDK-8287917: System.loadLibrary does not work on Big Sur if JDK is built with macOS SDK 10.15 and earlier
+  - JDK-8288132: Update test artifacts in QuoVadis CA interop tests
+  - JDK-8288302: Shenandoah: SIGSEGV in vm maybe related to jit compiling xerces
   - 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 ...
@@ -128,22 +174,51 @@ Live versions of these release notes can be found at:
   - 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-8292682: Code change of JDK-8282730 not updated to reflect CSR update
+  - JDK-8292778: EncodingSupport_md.c convertUtf8ToPlatformString wrong placing of free
+  - JDK-8292866: Java_sun_awt_shell_Win32ShellFolder2_getLinkLocation check MultiByteToWideChar return value for failures
   - 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-8293472: Incorrect container resource limit detection if manual cgroup fs mounts present
+  - JDK-8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts
   - JDK-8293578: Duplicate ldc generated by javac
   - JDK-8293672: Update freetype md file
   - JDK-8293816: CI: ciBytecodeStream::get_klass() is not consistent
+  - JDK-8293826: Closed test fails after JDK-8276108 on aarch64
   - JDK-8293828: JFR: jfr/event/oldobject/TestClassLoaderLeak.java still fails when GC cycles are not happening
+  - JDK-8293834: Update CLDR data following tzdata 2022c update
   - JDK-8293998: [PPC64] JfrGetCallTrace: assert(_pc != nullptr) failed: must have PC
   - JDK-8294138: [11u] Revert change from JDK-8210962 in basic.m4
+  - JDK-8294307: ISO 4217 Amendment 173 Update
   - JDK-8294357: (tz) Update Timezone Data to 2022d
   - JDK-8294578: [PPC64] C2: Missing is_oop information when using disjoint compressed oops mode
+  - JDK-8294740: Add cgroups keyword to TestDockerBasic.java
   - 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-8295429: Update harfbuzz md file
   - JDK-8295469: S390X: Optimized builds are broken
+  - JDK-8295554: Move the "sizecalc.h" to the correct location
   - JDK-8295641: Fix DEFAULT_PROMOTED_VERSION_PRE=ea for -dev
+  - JDK-8295714: GHA ::set-output is deprecated and will be removed
+  - JDK-8295872: [PPC64] JfrGetCallTrace: Need pc == nullptr check before frame constructor
+  - JDK-8295952: Problemlist existing compiler/rtm tests also on x86
+  - JDK-8296108: (tz) Update Timezone Data to 2022f
+  - 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-8296632: Write a test to verify the content change of TextArea sends TextEvent
+  - JDK-8296652: Restore windows aarch64 fixpath patch that was removed in 8239708
+  - JDK-8296715: CLDR v42 update for tzdata 2022f
+  - JDK-8296957: One more cast in SAFE_SIZE_NEW_ARRAY2
+  - 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-8297481: Create a regression test for JDK-4424517
+  - JDK-8297656: AArch64: Enable AES/GCM Intrinsics
+  - JDK-8297804: (tz) Update Timezone Data to 2022g
+  - JDK-8298737: 8296772 backport to jdk11u caused build error on sparc
 
 Notes on individual issues:
 ===========================
@@ -165,6 +240,26 @@ make it clear they map to the current user:
 * "Windows-MY-CURRENTUSER" (same as "Windows-MY")
 * "Windows-ROOT-CURRENTUSER" (same as "Windows-ROOT")
 
+security-libs/java.security:
+
+JDK-8282730: New Implementation Note for LoginModule on Removing Null from a Principals or Credentials Set
+==========================================================================================================
+Back in OpenJDK 9, JDK-8015081 changed the Set implementation used to
+hold principals and credentials so that it rejected null
+values. Attempts to call add(null), contains(null) or remove(null)
+were changed to throw a NullPointerException.
+
+However, the logout() methods in the LoginModule implementations
+within the JDK were not updated to check for null values, which may
+occur in the event of a failed login. As a result, a logout() call may
+throw a NullPointerException.
+
+The LoginModule implementations have now been updated with such checks
+and an implementation note added to the specification to suggest that
+the same change is made in third party modules.  Developers of third
+party modules are advised to verify that their logout() method does not
+throw a NullPointerException.
+
 New in release OpenJDK 11.0.17 (2022-10-18):
 =============================================
 Live versions of these release notes can be found at:

TestTranslations.java

@@ -30,7 +30,7 @@ import java.util.TimeZone;
 
 public class TestTranslations {
 
-    private static Map<Locale,String[]> KYIV;
+    private static Map<Locale,String[]> KYIV, CIUDAD_JUAREZ;
 
     static {
         Map<Locale,String[]> map = new HashMap<Locale,String[]>();
@@ -44,6 +44,18 @@ public class TestTranslations {
                                                "Osteurop\u00e4ische Sommerzeit", "OESZ", "OESZ",
                                                "Osteurop\u00e4ische Zeit", "OEZ", "OEZ"});
         KYIV = Collections.unmodifiableMap(map);
+
+        map = new HashMap<Locale,String[]>();
+        map.put(Locale.US, new String[] { "Mountain Standard Time", "MST", "MST",
+                                          "Mountain Daylight Time", "MDT", "MDT",
+                                          "Mountain Time", "MT", "MT"});
+        map.put(Locale.FRANCE, new String[] { "heure normale des Rocheuses", "UTC\u221207:00", "MST",
+                                              "heure d\u2019\u00e9t\u00e9 des Rocheuses", "UTC\u221206:00", "MDT",
+                                              "heure des Rocheuses", "UTC\u221207:00", "MT"});
+        map.put(Locale.GERMANY, new String[] { "Rocky Mountain-Normalzeit", "GMT-07:00", "MST",
+                                               "Rocky-Mountain-Sommerzeit", "GMT-06:00", "MDT",
+                                               "Rocky-Mountain-Zeit", "GMT-07:00", "MT"});
+        CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
     }
 
 
@@ -53,7 +65,6 @@ public class TestTranslations {
             System.exit(1);
         }
 
-        String localeProvider = args[0];
         System.out.println("Checking sanity of full zone string set...");
         boolean invalid = Arrays.stream(Locale.getAvailableLocales())
             .peek(l -> System.out.println("Locale: " + l))
@@ -68,9 +79,18 @@ public class TestTranslations {
             System.exit(2);
         }
 
-        for (Locale l : KYIV.keySet()) {
+        String localeProvider = args[0];
-            String[] expected = KYIV.get(l);
+        testZone(localeProvider, KYIV,
-            for (String id : new String[] { "Europe/Kiev", "Europe/Kyiv", "Europe/Uzhgorod", "Europe/Zaporozhye" }) {
+                 new String[] { "Europe/Kiev", "Europe/Kyiv", "Europe/Uzhgorod", "Europe/Zaporozhye" });
+        testZone(localeProvider, CIUDAD_JUAREZ,
+                 new String[] { "America/Cambridge_Bay", "America/Ciudad_Juarez" });
+    }
+
+    private static void testZone(String localeProvider, Map<Locale,String[]> exp, String[] ids) {
+        for (Locale l : exp.keySet()) {
+            String[] expected = exp.get(l);
+            System.out.printf("Expected values for %s are %s\n", l, Arrays.toString(expected));
+            for (String id : ids) {
                 String expectedShortStd = null;
                 String expectedShortDST = null;
                 String expectedShortGen = null;
@@ -124,7 +144,7 @@ public class TestTranslations {
                 }
 
                 if (!expected[6].equals(longGen)) {
-                    System.err.printf("Long standard display name for %s in %s was %s, expected %s\n",
+                    System.err.printf("Long generic display name for %s in %s was %s, expected %s\n",
                                       id, l, longGen, expected[6]);
                     System.exit(8);
                 }

java-11-openjdk.spec

@@ -377,7 +377,7 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver        1
+%global buildver        9
 %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
@@ -1143,8 +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
-# 2022e required as of JDK-8295173
+# 2022g required as of JDK-8297804
-Requires: tzdata-java >= 2022e
+Requires: tzdata-java >= 2022g
 # for support of kernel stream control
 # libsctp.so.1 is being `dlopen`ed on demand
 Requires: lksctp-tools%{?_isa}
@@ -1419,8 +1419,6 @@ Patch3:    rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk1
 # able to be removed once that release is out
 # and used by this RPM.
 #############################################
-# JDK-8293834: Update CLDR data following tzdata 2022c update
-Patch2001: jdk8293834-kyiv_cldr_update.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -1455,8 +1453,8 @@ BuildRequires: java-%{buildjdkver}-openjdk-devel
 %ifarch %{zero_arches}
 BuildRequires: libffi-devel
 %endif
-# 2022e required as of JDK-8295173
+# 2022g required as of JDK-8297804
-BuildRequires: tzdata-java >= 2022e
+BuildRequires: tzdata-java >= 2022g
 # Earlier versions have a bug in tree vectorization on PPC
 BuildRequires: gcc >= 4.8.3-8
 
@@ -1839,8 +1837,6 @@ 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 11.0.18
-%patch2001 -p1
 popd # openjdk
 
 %patch600
@@ -2651,6 +2647,14 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Tue Jan 03 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.18.0.9-0.3.ea
+- Update to jdk-11.0.18+9
+- Update release notes to 11.0.18+9
+- Drop local copy of JDK-8293834 now this is upstream
+- Require tzdata 2022g due to inclusion of JDK-8296108, JDK-8296715 & JDK-8297804
+- Update TestTranslations.java to test the new America/Ciudad_Juarez zone
+- Resolves: rhbz#2150197
+
 * 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

jdk8293834-kyiv_cldr_update.patch

@@ -1,57 +0,0 @@
-commit 58ba3b61d276423cef1e1f52bd73c9706cc073fc
-Author: Andrew Hughes <gnu.andrew@redhat.com>
-Date:   Sat Oct 15 05:37:36 2022 +0100
-
-    Backport e10231248fc100f9dfa08468ac897f60b843857f
-
-diff --git a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/bcp47/timezone.xml b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/bcp47/timezone.xml
-index 35f8fc86efa..a9b635b4fa4 100644
---- a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/bcp47/timezone.xml
-+++ b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/bcp47/timezone.xml
-@@ -392,7 +392,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="Kiev, 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 c2b5672646c..53903d19d3d 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
-+ * @bug 8181157 8202537 8234347 8236548 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",

sources

@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
-SHA512 (openjdk-jdk11u-jdk-11.0.18+1-4curve.tar.xz) = 66130ced7fd4c5439784a404660d4c96c37fe6b5137050c829f36891736e9cad7b021e187579d80a9ee47903d380161106d887f2994bf261cf83dbce2793d27f
+SHA512 (openjdk-jdk11u-jdk-11.0.18+9-4curve.tar.xz) = ab6149bd4459124e1993eb837f76076d07e8c363016dd69a5dc1176990d6337aeed1fc1afa499aaefad44885b03147baa58db13f6768d178c9336da6c4756599