bumped build jdk to 22

fixed condition for taspets
updated to 22+36
2024-02-17 12:18:12 +01:00 · 2024-02-17 09:22:03 +01:00 · 2024-02-16 17:52:24 +01:00 · 2024-02-16 17:39:03 +01:00 · 2024-01-26 15:31:55 +01:00 · 2024-01-24 18:52:38 +01:00
22 changed files with 2954 additions and 1342 deletions
--- a/.gitignore
+++ b/.gitignore
@ -33,3 +33,13 @@
 /openjdk-jdk19u-jdk-19.0.2+7.tar.xz
 /openjdk-jdk20u-jdk-20+36.tar.xz
 /openjdk-jdk20u-jdk-20.0.1+9.tar.xz
+/openjdk-jdk20u-jdk-20.0.2+9.tar.xz
+/openjdk-jdk21u-jdk-21+34.tar.xz
+/openjdk-jdk21u-jdk-21+35.tar.xz
+/openjdk-21+35.tar.xz
+/openjdk-21.0.1+12.tar.xz
+/openjdk-21.0.2+11.tar.xz
+/openjdk-21.0.2+12.tar.xz
+/openjdk-21.0.2+13.tar.xz
+/openjdk-22+32-ea.tar.xz
+/openjdk-jdk-22+36-ea.tar.xz
--- a/859
+++ b/859
@ -3,51 +3,620 @@ 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 20.0.1 (2023-04-18):
+New in release OpenJDK 21.0.2 (2024-01-16):
 ===========================================

 * CVEs
-  - CVE-2023-21930
-  - CVE-2023-21937
-  - CVE-2023-21938
-  - CVE-2023-21939
-  - CVE-2023-21967
-  - CVE-2023-21968
+  - CVE-2024-20918
+  - CVE-2024-20919
+  - CVE-2024-20921
+  - CVE-2024-20945
+  - CVE-2024-20952
 * Security fixes
-  - JDK-8287404: Improve ping times
-  - JDK-8288436: Improve Xalan supports
-  - JDK-8294474: Better AES support
-  - JDK-8295304: Runtime support improvements
-  - JDK-8296676, JDK-8296622: Improve String platform support
-  - JDK-8296684: Improve String platform support
-  - JDK-8296692: Improve String platform support
-  - JDK-8296832: Improve Swing platform support
-  - JDK-8297371: Improve UTF8 representation redux
-  - JDK-8298310: Enhance TLS session negotiation
-  - JDK-8298667: Improved path handling
-  - JDK-8299129: Enhance NameService lookups
+  - JDK-8308204: Enhanced certificate processing
+  - JDK-8314295: Enhance verification of verifier
+  - JDK-8314307: Improve loop handling
+  - JDK-8314468: Improve Compiler loops
+  - JDK-8316976: Improve signature handling
+  - JDK-8317547: Enhance TLS connection support
 * Other changes
-  - JDK-8208077: File.listRoots performance degradation
-  - JDK-8245654: Add Certigna Root CA
-  - JDK-8278965: crash in SymbolTable::do_lookup
-  - JDK-8295951: intermittent cmp_baseline task failures with CDS files
-  - JDK-8299194: CustomTzIDCheckDST.java may fail at future date
-  - JDK-8299843: Bump version numbers for 20.0.1
-  - JDK-8299947: Change milestone to fcs for all releases
-  - JDK-8301123: Enable Symbol refcounting underflow checks in PRODUCT
-  - JDK-8301858: Verification error when compiling switch with record patterns
-  - JDK-8301876: Crash in DumpTimeClassInfo::add_verification_constraint
-  - JDK-8302202: Incorrect desugaring of null-allowed nested patterns
-  - JDK-8302879: doc/building.md update link to jtreg builds
-  - JDK-8303412: Update linux_x64-to-linux_aarch64 cross compilation devkit at Oracle
+  - JDK-8038244: (fs) Check return value of malloc in Java_sun_nio_fs_AixNativeDispatcher_getmntctl()
+  - JDK-8161536: sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java fails with ProviderException
+  - JDK-8219652: [aix] Tests failing with JNI attach problems.
+  - JDK-8225377: type annotations are not visible to javac plugins across compilation boundaries
+  - JDK-8232839: JDI AfterThreadDeathTest.java failed due to "FAILED: Did not get expected IllegalThreadStateException on a StepRequest.enable()"
+  - JDK-8267502: JDK-8246677 caused 16x performance regression in SynchronousQueue
+  - JDK-8267509: Improve IllegalAccessException message to include the cause of the exception
+  - JDK-8268916: Tests for AffirmTrust roots
+  - JDK-8286757: adlc tries to build with /pathmap but without /experimental:deterministic
+  - JDK-8294156: Allow PassFailJFrame.Builder to create test UI
+  - JDK-8294158: HTML formatting for PassFailJFrame instructions
+  - JDK-8294427: Check boxes and radio buttons have rendering issues on Windows in High DPI env
+  - JDK-8294535: Add screen capture functionality to PassFailJFrame
+  - JDK-8295068: SSLEngine throws NPE parsing CertificateRequests
+  - JDK-8295555: Primitive wrapper caches could be `@Stable`
+  - JDK-8299614: Shenandoah: STW mark should keep nmethod/oops referenced from stack chunk alive
+  - JDK-8300663: java/util/concurrent/SynchronousQueue/Fairness.java failed with "Error: fair=true i=0 j=1"
+  - JDK-8301247: JPackage app-image exe launches multiple exe's in JDK 17+
+  - JDK-8301341: LinkedTransferQueue does not respect timeout for poll()
+  - JDK-8301457: Code in SendPortZero.java is uncommented even after JDK-8236852 was fixed
+  - JDK-8301489: C1: ShortLoopOptimizer might lift instructions before their inputs
+  - JDK-8301846: Invalid TargetDataLine after screen lock when using JFileChooser or COM library
+  - JDK-8303737: C2: Load can bypass subtype check that enforces it's from the right object type
+  - JDK-8306561: Possible out of bounds access in print_pointer_information
+  - JDK-8308103: Massive (up to ~30x) increase in C2 compilation time since JDK 17
+  - JDK-8308452: Extend internal Architecture enum with byte order and address size
+  - JDK-8308479: [s390x] Implement alternative fast-locking scheme
+  - JDK-8308592: Framework for CA interoperability testing
+  - JDK-8308593: Add KEEPALIVE Extended Socket Options Support for Windows
+  - JDK-8309209: C2 failed "assert(_stack_guard_state == stack_guard_reserved_disabled) failed: inconsistent state"
+  - JDK-8309305: sun/security/ssl/SSLSocketImpl/BlockedAsyncClose.java fails with jtreg test timeout
+  - JDK-8309545: Thread.interrupted from virtual thread needlessly resets interrupt status
+  - JDK-8309663: test fails "assert(check_alignment(result)) failed: address not aligned: 0x00000008baadbabe"
+  - JDK-8309778: java/nio/file/Files/CopyAndMove.java fails when using second test directory
+  - JDK-8309974: some JVMCI tests fail when VM options include -XX:+EnableJVMCI
+  - JDK-8310239: Add missing cross modifying fence in nmethod entry barriers
+  - JDK-8310512: Cleanup indentation in jfc files
+  - JDK-8310596: Utilize existing method frame::interpreter_frame_monitor_size_in_bytes()
+  - JDK-8310982: jdk/internal/util/ArchTest.java fails after JDK-8308452 failed with Method isARM()
+  - JDK-8311261: [AIX] TestAlwaysPreTouchStacks.java fails due to java.lang.RuntimeException: Did not find expected NMT output
+  - JDK-8311514: Incorrect regex in TestMetaSpaceLog.java
+  - JDK-8311585: Add JRadioButtonMenuItem to bug8031573.java
+  - JDK-8311591: Add SystemModulesPlugin test case that splits module descriptors with new local variables defined by DedupSetBuilder
+  - JDK-8311630: [s390] Implementation of Foreign Function & Memory API (Preview)
+  - JDK-8311631: When multiple users run tools/jpackage/share/LicenseTest.java, Permission denied for writing /var/tmp/*.files
+  - JDK-8311680: Update the release version after forking Oct CPU23_10
+  - JDK-8311681: Update the Jan CPU24_01 release date in master branch after forking Oct CPU23_10
+  - JDK-8311813: C1: Uninitialized PhiResolver::_loop field
+  - JDK-8311938: Add default cups include location for configure on AIX
+  - JDK-8312078: [PPC] JcmdScale.java Failing on AIX
+  - JDK-8312126: NullPointerException in CertStore.getCRLs after 8297955
+  - JDK-8312166: (dc) DatagramChannel's socket adaptor does not release carrier thread when blocking in receive
+  - JDK-8312174: missing JVMTI events from vthreads parked during JVMTI attach
+  - JDK-8312191: ColorConvertOp.filter for the default destination is too slow
+  - JDK-8312433: HttpClient request fails due to connection being considered idle and closed
+  - JDK-8312434: SPECjvm2008/xml.transform with CDS fails with "can't seal package nu.xom"
+  - JDK-8312440: assert(cast != nullptr) failed: must have added a cast to pin the node
+  - JDK-8312466: /bin/nm  usage in AIX makes needs -X64 flag
+  - JDK-8312467: relax the builddir check in make/autoconf/basic.m4
+  - JDK-8312592: New parentheses warnings after HarfBuzz 7.2.0 update
+  - JDK-8312612: handle WideCharToMultiByte return values
+  - JDK-8313164: src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp GetRGBPixels adjust releasing of resources
+  - JDK-8313167: Update to use jtreg 7.3
+  - JDK-8313206: PKCS11 tests silently skip execution
+  - JDK-8313244: NM flags handling in configure process
+  - JDK-8313252: Java_sun_awt_windows_ThemeReader_paintBackground release resources in early returns
+  - JDK-8313322: RISC-V: implement MD5 intrinsic
+  - JDK-8313368: (fc) FileChannel.size returns 0 on block special files
+  - JDK-8313575: Refactor PKCS11Test tests
+  - JDK-8313616: support loading library members on AIX in os::dll_load
+  - JDK-8313643: Update HarfBuzz to 8.2.2
+  - JDK-8313656: assert(!JvmtiExport::can_support_virtual_threads()) with -XX:-DoJVMTIVirtualThreadTransitions
+  - JDK-8313756: [BACKOUT] 8308682: Enhance AES performance
+  - JDK-8313760: [REDO] Enhance AES performance
+  - JDK-8313779: RISC-V: use andn / orn in the MD5 instrinsic
+  - JDK-8313781: Add regression tests for large page logging and user-facing error messages
+  - JDK-8313782: Add user-facing warning if THPs are enabled but cannot be used
+  - JDK-8313792: Verify 4th party information in src/jdk.internal.le/share/legal/jline.md
+  - JDK-8313873: java/nio/channels/DatagramChannel/SendReceiveMaxSize.java  fails on AIX due to small default RCVBUF size and different IPv6 Header interpretation
+  - JDK-8314045: ArithmeticException in GaloisCounterMode
+  - JDK-8314094: java/lang/ProcessHandle/InfoTest.java fails on Windows when run as user with Administrator privileges
+  - JDK-8314120: Add tests for FileDescriptor.sync
+  - JDK-8314121: test tools/jpackage/share/RuntimePackageTest.java#id0 fails on RHEL8
+  - JDK-8314191: C2 compilation fails with "bad AD file"
+  - JDK-8314226: Series of colon-style fallthrough switch cases with guards compiled incorrectly
+  - JDK-8314242: Update applications/scimark/Scimark.java to accept VM flags
+  - JDK-8314246: javax/swing/JToolBar/4529206/bug4529206.java fails intermittently on Linux
+  - JDK-8314263: Signed jars triggering Logger finder recursion and StackOverflowError
+  - JDK-8314330: java/foreign tests should respect vm flags when start new processes
+  - JDK-8314476: TestJstatdPortAndServer.java failed with "java.rmi.NoSuchObjectException: no such object in table"
+  - JDK-8314495: Update to use jtreg 7.3.1
+  - JDK-8314551: More generic way to handshake GC threads with monitor deflation
+  - JDK-8314580: PhaseIdealLoop::transform_long_range_checks fails with assert "was tested before"
+  - JDK-8314632: Intra-case dominance check fails in the presence of a guard
+  - JDK-8314759: VirtualThread.parkNanos timeout adjustment when pinned should be replaced
+  - JDK-8314883: Java_java_util_prefs_FileSystemPreferences_lockFile0 write result errno in missing case
+  - JDK-8314935: Shenandoah: Unable to throw OOME on back-to-back Full GCs
+  - JDK-8315026: ProcessHandle implementation listing processes on AIX should use getprocs64
+  - JDK-8315062: [GHA] get-bootjdk action should return the abolute path
+  - JDK-8315082: [REDO] Generational ZGC: Tests crash with assert(index == 0 || is_power_of_2(index))
+  - JDK-8315088: C2: assert(wq.size() - before == EMPTY_LOOP_SIZE) failed: expect the EMPTY_LOOP_SIZE nodes of this body if empty
+  - JDK-8315195: RISC-V: Update hwprobe query for new extensions
+  - JDK-8315206: RISC-V: hwprobe query is_set return wrong value
+  - JDK-8315213: java/lang/ProcessHandle/TreeTest.java test enhance output of children
+  - JDK-8315214: Do not run sun/tools/jhsdb tests concurrently
+  - JDK-8315362: NMT: summary diff reports threads count incorrectly
+  - JDK-8315377: C2: assert(u->find_out_with(Op_AddP) == nullptr) failed: more than 2 chained AddP nodes?
+  - JDK-8315383: jlink SystemModulesPlugin incorrectly parses the options
+  - JDK-8315415: OutputAnalyzer.shouldMatchByLine() fails in some cases
+  - JDK-8315437: Enable parallelism in vmTestbase/nsk/monitoring/stress/classload tests
+  - JDK-8315442: Enable parallelism in vmTestbase/nsk/monitoring/stress/thread tests
+  - JDK-8315452: Erroneous AST missing modifiers for partial input
+  - JDK-8315499: build using devkit on Linux ppc64le RHEL puts path to devkit into libsplashscreen
+  - JDK-8315545: C1: x86 cmove can use short branches
+  - JDK-8315549: CITime misreports code/total nmethod sizes
+  - JDK-8315554: C1: Replace "cmp reg, 0" with "test reg, reg" on x86
+  - JDK-8315578: PPC builds are broken after JDK-8304913
+  - JDK-8315579: SPARC64 builds are broken after JDK-8304913
+  - JDK-8315606: Open source few swing text/html tests
+  - JDK-8315612: RISC-V: intrinsic for unsignedMultiplyHigh
+  - JDK-8315644: increase timeout of sun/security/tools/jarsigner/Warning.java
+  - JDK-8315651: Stop hiding AIX specific multicast socket errors via NetworkConfiguration (aix)
+  - JDK-8315683: Parallelize java/util/concurrent/tck/JSR166TestCase.java
+  - JDK-8315684: Parallelize sun/security/util/math/TestIntegerModuloP.java
+  - JDK-8315688: Update jdk21u fix version to 21.0.2
+  - JDK-8315692: Parallelize gc/stress/TestStressRSetCoarsening.java test
+  - JDK-8315696: SignedLoggerFinderTest.java test failed
+  - JDK-8315702: jcmd Thread.dump_to_file slow with millions of virtual threads
+  - JDK-8315706: com/sun/tools/attach/warnings/DynamicLoadWarningTest.java real fix for failure on AIX
+  - JDK-8315735: VerifyError when switch statement used with synchronized block
+  - JDK-8315751: RandomTestBsi1999 fails often with timeouts on Linux ppc64le
+  - JDK-8315766: Parallelize gc/stress/TestStressIHOPMultiThread.java test
+  - JDK-8315770: serviceability/sa/TestJmapCoreMetaspace.java should run with -XX:-VerifyDependencies
+  - JDK-8315774: Enable parallelism in vmTestbase/gc/g1/unloading tests
+  - JDK-8315863: [GHA] Update checkout action to use v4
+  - JDK-8315869: UseHeavyMonitors not used
+  - JDK-8315920: C2: "control input must dominate current control" assert failure
+  - JDK-8315931: RISC-V: xxxMaxVectorTestsSmokeTest fails when using RVV
+  - JDK-8315936: Parallelize gc/stress/TestStressG1Humongous.java test
+  - JDK-8315937: Enable parallelism in vmTestbase/nsk/stress/numeric tests
+  - JDK-8315942: Sort platform enums and definitions after JDK-8304913 follow-ups
+  - JDK-8315960: test/jdk/java/io/File/TempDirDoesNotExist.java leaves test files behind
+  - JDK-8315971: ProblemList containers/docker/TestMemoryAwareness.java on linux-all
+  - JDK-8316003: Update FileChooserSymLinkTest.java to HTML instructions
+  - JDK-8316017: Refactor timeout handler in PassFailJFrame
+  - JDK-8316025: Use testUI() method of PassFailJFrame.Builder in FileChooserSymLinkTest.java
+  - JDK-8316030: Update Libpng to 1.6.40
+  - JDK-8316031: SSLFlowDelegate should not log from synchronized block
+  - JDK-8316060: test/hotspot/jtreg/runtime/reflect/ReflectOutOfMemoryError.java may fail if heap is huge
+  - JDK-8316087: Test SignedLoggerFinderTest.java is still failing
+  - JDK-8316113: Infinite permission checking loop in java/net/spi/InetAddressResolverProvider/RuntimePermissionTest
+  - JDK-8316123: ProblemList serviceability/dcmd/gc/RunFinalizationTest.java on AIX
+  - JDK-8316130: Incorrect control in LibraryCallKit::inline_native_notify_jvmti_funcs
+  - JDK-8316142: Enable parallelism in vmTestbase/nsk/monitoring/stress/lowmem tests
+  - JDK-8316156: ByteArrayInputStream.transferTo causes MaxDirectMemorySize overflow
+  - JDK-8316178: Better diagnostic header for CodeBlobs
+  - JDK-8316179: Use consistent naming for lightweight locking in MacroAssembler
+  - JDK-8316181: Move the fast locking implementation out of the .ad files
+  - JDK-8316199: Remove sun/tools/jstatd/TestJstatd* tests from problemlist for Windows.
+  - JDK-8316206: Test StretchedFontTest.java fails for Baekmuk font
+  - JDK-8316304: (fs) Add support for BasicFileAttributes.creationTime() for Linux
+  - JDK-8316337: (bf) Concurrency issue in DirectByteBuffer.Deallocator
+  - JDK-8316341: sun/security/pkcs11/PKCS11Test.java needs adjustment on Linux ppc64le Ubuntu 22
+  - JDK-8316387: Exclude more failing multicast tests on AIX after JDK-8315651
+  - JDK-8316396: Endless loop in C2 compilation triggered by AddNode::IdealIL
+  - JDK-8316399: Exclude java/net/MulticastSocket/Promiscuous.java on AIX
+  - JDK-8316400: Exclude jdk/jfr/event/runtime/TestResidentSetSizeEvent.java on AIX
+  - JDK-8316401: sun/tools/jhsdb/JStackStressTest.java failed with "InternalError: We should have found a thread that owns the anonymous lock"
+  - JDK-8316411: compiler/compilercontrol/TestConflictInlineCommands.java fails intermittent with force inline by CompileCommand missing
+  - JDK-8316414: C2: large byte array clone triggers "failed: malformed control flow" assertion failure on linux-x86
+  - JDK-8316415: Parallelize sun/security/rsa/SignedObjectChain.java subtests
+  - JDK-8316418: containers/docker/TestMemoryWithCgroupV1.java get OOM killed with Parallel GC
+  - JDK-8316436: ContinuationWrapper uses unhandled nullptr oop
+  - JDK-8316461: Fix: make test outputs TEST SUCCESS after unsuccessful exit
+  - JDK-8316468: os::write incorrectly handles partial write
+  - JDK-8316514: Better diagnostic header for VtableStub
+  - JDK-8316540: StoreReproducibilityTest fails on some locales
+  - JDK-8316566: RISC-V: Zero extended narrow oop passed to Atomic::cmpxchg
+  - JDK-8316581: Improve performance of Symbol::print_value_on()
+  - JDK-8316585: [REDO] runtime/InvocationTests spend a lot of time on dependency verification
+  - JDK-8316645: RISC-V: Remove dependency on libatomic by adding cmpxchg 1b
+  - JDK-8316648: jrt-fs.jar classes not reproducible between standard and bootcycle builds
+  - JDK-8316659: assert(LockingMode != LM_LIGHTWEIGHT || flag == CCR0) failed: bad condition register
+  - JDK-8316671: sun/security/ssl/SSLSocketImpl/SSLSocketCloseHang.java test fails intermittent with Read timed out
+  - JDK-8316679: C2 SuperWord: wrong result, load should not be moved before store if not comparable
+  - JDK-8316710: Exclude java/awt/font/Rotate/RotatedTextTest.java
+  - JDK-8316719: C2 compilation still fails with "bad AD file"
+  - JDK-8316735: Print LockStack in hs_err files
+  - JDK-8316741: BasicStroke.createStrokedShape miter-limits failing on small shapes
+  - JDK-8316743: RISC-V: Change UseVectorizedMismatchIntrinsic option result to warning
+  - JDK-8316746: Top of lock-stack does not match the unlocked object
+  - JDK-8316778: test hprof lib: invalid array element type from JavaValueArray.elementSize
+  - JDK-8316859: RISC-V: Disable detection of V through HWCAP
+  - JDK-8316879: RegionMatches1Tests fails if CompactStrings are disabled after JDK-8302163
+  - JDK-8316880: AArch64: "stop: Header is not fast-locked" with -XX:-UseLSE since JDK-8315880
+  - JDK-8316894: make test  TEST="jtreg:test/jdk/..."  fails on AIX
+  - JDK-8316906: Clarify TLABWasteTargetPercent flag
+  - JDK-8316929: Shenandoah: Shenandoah degenerated GC and full GC need to cleanup old OopMapCache entries
+  - JDK-8316933: RISC-V: compiler/vectorapi/VectorCastShape128Test.java fails when using RVV
+  - JDK-8316935: [s390x] Use consistent naming for lightweight locking in MacroAssembler
+  - JDK-8316958: Add test for unstructured locking
+  - JDK-8316967: Correct the scope of vmtimer in UnregisteredClasses::load_class
+  - JDK-8317039: Enable specifying the JDK used to run jtreg
+  - JDK-8317136: [AIX] Problem List runtime/jni/terminatedThread/TestTerminatedThread.java
+  - JDK-8317257: RISC-V: llvm build broken
+  - JDK-8317262: LockStack::contains(oop) fails "assert(t->is_Java_thread()) failed: incorrect cast to JavaThread"
+  - JDK-8317294: Classloading throws exceptions over already pending exceptions
+  - JDK-8317327: Remove JT_JAVA dead code in jib-profiles.js
+  - JDK-8317331: Solaris build failed with "declaration can not follow a statement (E_DECLARATION_IN_CODE)"
+  - JDK-8317335: Build on windows fails after 8316645
+  - JDK-8317336: Assertion error thrown during 'this' escape analysis
+  - JDK-8317340: Windows builds are not reproducible if MS VS compiler install path differs
+  - JDK-8317373: Add Telia Root CA v2
+  - JDK-8317374: Add Let's Encrypt ISRG Root X2
+  - JDK-8317439: Updating RE Configs for BUILD REQUEST 21.0.2+1
+  - JDK-8317507: C2 compilation fails with "Exceeded _node_regs array"
+  - JDK-8317510: Change Windows debug symbol files naming to avoid losing info when an executable and a library share the same name
+  - JDK-8317581: [s390x] Multiple test failure with LockingMode=2
+  - JDK-8317601: Windows build on WSL broken after JDK-8317340
+  - JDK-8317603: Improve exception messages thrown by sun.nio.ch.Net native methods (win)
+  - JDK-8317692: jcmd GC.heap_dump performance regression after JDK-8292818
+  - JDK-8317705: ProblemList sun/tools/jstat/jstatLineCountsX.sh on linux-ppc64le and aix due to JDK-8248691
+  - JDK-8317706: Exclude java/awt/Graphics2D/DrawString/RotTransText.java on linux
+  - JDK-8317711: Exclude gtest/GTestWrapper.java on AIX
+  - JDK-8317736: Stream::handleReset locks twice
+  - JDK-8317751: ProblemList ConsumeForModalDialogTest.java, MenuItemActivatedTest.java & MouseModifiersUnitTest_Standard.java for windows
+  - JDK-8317772: NMT: Make peak values available in release builds
+  - JDK-8317790: Fix Bug entry for exclusion of runtime/jni/terminatedThread/TestTerminatedThread.java on AIX
+  - JDK-8317803: Exclude java/net/Socket/asyncClose/Race.java on AIX
+  - JDK-8317807: JAVA_FLAGS removed from jtreg running in JDK-8317039
+  - JDK-8317818: Combinatorial explosion during 'this' escape analysis
+  - JDK-8317834: java/lang/Thread/IsAlive.java timed out
+  - JDK-8317839: Exclude java/nio/channels/Channels/SocketChannelStreams.java on AIX
+  - JDK-8317920: JDWP-agent sends broken exception event with onthrow option
+  - JDK-8317959: Check return values of malloc in native java.base coding
+  - JDK-8317964: java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java fails on macosx-all after JDK-8317751
+  - JDK-8317967: Enhance test/jdk/javax/net/ssl/TLSCommon/SSLEngineTestCase.java to handle default cases
+  - JDK-8317987: C2 recompilations cause high memory footprint
+  - JDK-8318078: ADLC: pass ASSERT and PRODUCT flags
+  - JDK-8318089: Class space not marked as such with NMT when CDS is off
+  - JDK-8318137: Change milestone to fcs for all releases
+  - JDK-8318144: Match on enum constants with body compiles but fails with MatchException
+  - JDK-8318183: C2: VM may crash after hitting node limit
+  - JDK-8318240: [AIX] Cleaners.java test failure
+  - JDK-8318415: Adjust describing comment of os_getChildren after 8315026
+  - JDK-8318474: Fix memory reporter for thread_count
+  - JDK-8318525: Atomic gtest should run as TEST_VM to access VM capabilities
+  - JDK-8318528: Rename TestUnstructuredLocking test
+  - JDK-8318540: make test cannot run .jasm tests directly
+  - JDK-8318562: Computational test more than 2x slower when AVX instructions are used
+  - JDK-8318587: refresh libraries cache on AIX in print_vm_info
+  - JDK-8318591: avoid leaks in loadlib_aix.cpp reload_table()
+  - JDK-8318669: Target OS detection in 'test-prebuilt' makefile target is incorrect when running on MSYS2
+  - JDK-8318705: [macos] ProblemList java/rmi/registry/multipleRegistries/MultipleRegistries.java
+  - JDK-8318736: com/sun/jdi/JdwpOnThrowTest.java failed with "transport error 202: bind failed: Address already in use"
+  - JDK-8318759: Add four DigiCert root certificates
+  - JDK-8318889: C2: add bailout after assert Bad graph detected in build_loop_late
+  - JDK-8318895: Deoptimization results in incorrect lightweight locking stack
+  - JDK-8318951: Additional negative value check in JPEG decoding
+  - JDK-8318953: RISC-V: Small refactoring for MacroAssembler::test_bit
+  - JDK-8318955: Add ReleaseIntArrayElements in Java_sun_awt_X11_XlibWrapper_SetBitmapShape XlbWrapper.c to early return
+  - JDK-8318957: enhance agentlib:jdwp help output by info about allow option
+  - JDK-8318961: increase javacserver connection timeout values and max retry attempts
+  - JDK-8318981: compiler/compilercontrol/TestConflictInlineCommands.java fails intermittent with 'disallowed by CompileCommand' missing from stdout/stderr
+  - JDK-8319104: GtestWrapper crashes with SIGILL in AsyncLogTest::test_asynclog_raw on AIX opt
+  - JDK-8319120: Unbound ScopedValue.get() throws the wrong exception
+  - JDK-8319184: RISC-V: improve MD5 intrinsic
+  - JDK-8319187: Add three eMudhra emSign roots
+  - JDK-8319195: Move most tier 1 vector API regression tests to tier 3
+  - JDK-8319268: Build failure with GCC8.3.1 after 8313643
+  - JDK-8319339: Internal error on spurious markup in a hybrid snippet
+  - JDK-8319436: Proxy.newProxyInstance throws NPE if loader is null and interface not visible from class loader
+  - JDK-8319525: RISC-V: Rename *_riscv64.ad files to *_riscv.ad under riscv/gc
+  - JDK-8319532: jshell - Non-sealed declarations sometimes break a snippet evaluation
+  - JDK-8319542: Fix boundaries of region to be tested with os::is_readable_range
+  - JDK-8319700: [AArch64] C2 compilation fails with "Field too big for insn"
+  - JDK-8319828: runtime/NMT/VirtualAllocCommitMerge.java may fail if mixing interpreted and compiled native invocations
+  - JDK-8319922: libCreationTimeHelper.so fails to link in JDK 21
+  - JDK-8319958: test/jdk/java/io/File/libGetXSpace.c does not compile on Windows 32-bit
+  - JDK-8319961: JvmtiEnvBase doesn't zero _ext_event_callbacks
+  - JDK-8320001: javac crashes while adding type annotations to the return type of a constructor
+  - JDK-8320053: GHA: Cross-compile gtest code
+  - JDK-8320209: VectorMaskGen clobbers rflags on x86_64
+  - JDK-8320280: RISC-V: Avoid passing t0 as temp register to MacroAssembler::lightweight_lock/unlock
+  - JDK-8320363: ppc64 TypeEntries::type_unknown logic looks wrong, missed optimization opportunity
+  - JDK-8320597: RSA signature verification fails on signed data that does not encode params correctly
+  - JDK-8320601: ProblemList java/lang/invoke/lambda/LambdaFileEncodingSerialization.java on linux-all
+  - JDK-8321067: Unlock experimental options in EATests.java
+  - JDK-8322883: [BACKOUT] 8225377: type annotations are not visible to javac plugins across compilation boundaries
+  - JDK-8322985: [BACKOUT] 8318562: Computational test more than 2x slower when AVX instructions are used

-New in release OpenJDK 20.0.0 (2023-03-21):
+Notes on individual issues:
+===========================
+
+core-libs/java.net:
+
+JDK-8308593: Add KEEPALIVE Extended Socket Options Support for Windows
+======================================================================
+On Windows 10 version 1709 and above, TCP_KEEPIDLE and
+TCP_KEEPINTERVAL are now supported in the
+java.net.ExtendedSocketOptions class.  Similarly, on Windows 10
+version 1703 and above, TCP_KEEPCOUNT is now supported.
+
+hotspot/compiler:
+
+JDK-8315082: [REDO] Generational ZGC: Tests crash with assert(index == 0 || is_power_of_2(index))
+=================================================================================================
+In the initial release of JDK 21, running the JVM with -XX:+UseZGC and
+a non-default value of -XX:ObjectAlignmentInBytes could lead to JVM
+crashes or incorrect execution. This issue should now be resolved and
+it should be possible to use these options again.
+
+hotspot/runtime:
+
+JDK-8317772: NMT: Make peak values available in release builds
+==============================================================
+The peak value is the highest value for committed memory in a given
+Native Memory Tracking (NMT) category over the lifetime of the JVM
+process. NMT reports will now show the peak value for all categories.
+
+If the committed memory for a category is at its peak, NMT will
+print "at peak". Otherwise, it prints the peak value.
+
+For example, "Compiler (arena=196KB #4) (peak=6126KB #16)" shows that
+compiler arena memory peaked above 6 MB, but now hovers around 200KB.
+
+JDK-8313782: Add user-facing warning if THPs are enabled but cannot be used
+===========================================================================
+On Linux, the JVM will now print the following message to standard
+output if Transparent Huge Pages (THPs) are requested, but are not
+supported on the operating system:
+
+"UseTransparentHugePages disabled; transparent huge pages are not
+supported by the operating system."
+
+security-libs/java.security:
+
+JDK-8317374: Added ISRG Root X2 CA Certificate from Let's Encrypt
+=================================================================
+The following root certificate has been added to the cacerts
+truststore:
+
+Name: Let's Encrypt
+Alias Name: letsencryptisrgx2
+Distinguished Name: CN=ISRG Root X2, O=Internet Security Research Group, C=US
+
+JDK-8318759: Added Four Root Certificates from DigiCert, Inc.
+=============================================================
+The following root certificates have been added to the cacerts
+truststore:
+
+Name: DigiCert, Inc.
+Alias Name: digicertcseccrootg5
+Distinguished Name: CN=DigiCert CS ECC P384 Root G5, O="DigiCert, Inc.", C=US
+
+Name: DigiCert, Inc.
+Alias Name: digicertcsrsarootg5
+Distinguished Name: CN=DigiCert CS RSA4096 Root G5, O="DigiCert, Inc.", C=US
+
+Name: DigiCert, Inc.
+Alias Name: digicerttlseccrootg5
+Distinguished Name: CN=DigiCert TLS ECC P384 Root G5, O="DigiCert, Inc.", C=US
+
+Name: DigiCert, Inc.
+Alias Name: digicerttlsrsarootg5
+Distinguished Name: CN=DigiCert TLS RSA4096 Root G5, O="DigiCert, Inc.", C=US
+
+JDK-8319187: Added Three Root Certificates from eMudhra Technologies Limited
+============================================================================
+The following root certificates have been added to the cacerts
+truststore:
+
+Name: eMudhra Technologies Limited
+Alias Name: emsignrootcag1
+Distinguished Name: CN=emSign Root CA - G1, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
+
+Name: eMudhra Technologies Limited
+Alias Name: emsigneccrootcag3
+Distinguished Name: CN=emSign ECC Root CA - G3, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
+
+Name: eMudhra Technologies Limited
+Alias Name: emsignrootcag2
+Distinguished Name: CN=emSign Root CA - G2, O=eMudhra Technologies Limited, OU=emSign PKI, C=IN
+
+JDK-8317373: Added Telia Root CA v2 Certificate
+===============================================
+The following root certificate has been added to the cacerts
+truststore:
+
+Name: Telia Root CA v2
+Alias Name: teliarootcav2
+Distinguished Name: CN=Telia Root CA v2, O=Telia Finland Oyj, C=FI ```
+
+New in release OpenJDK 21.0.1 (2023-10-17):
+===========================================
+
+* CVEs
+  - CVE-2023-22081
+  - CVE-2023-22025
+* Security fixes
+  - JDK-8286503, JDK-8312367: Enhance security classes
+  - JDK-8296581: Better system proxy support
+  - JDK-8297856: Improve handling of Bidi characters
+  - JDK-8309966: Enhanced TLS connections
+  - JDK-8312248: Enhanced archival support redux
+  - JDK-8314649: Enhanced archival support redux
+  - JDK-8317121: vector_masked_load instruction is moved too early after JDK-8286941
+* Other changes
+  - JDK-8240567: MethodTooLargeException thrown while creating a jlink image
+  - JDK-8284772: GHA: Use GCC Major Version Dependencies Only
+  - JDK-8293114: JVM should trim the native heap
+  - JDK-8299658: C1 compilation crashes in LinearScan::resolve_exception_edge
+  - JDK-8302017: Allocate BadPaddingException only if it will be thrown
+  - JDK-8303815: Improve Metaspace test speed
+  - JDK-8304954: SegmentedCodeCache fails when using large pages
+  - JDK-8307766: Linux: Provide the option to override the timer slack
+  - JDK-8308042: [macos] Developer ID Application Certificate not picked up by jpackage if it contains UNICODE characters
+  - JDK-8308047: java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java timed out and also had jcmd pipe errors
+  - JDK-8308184: Launching java with large number of jars in classpath with java.protocol.handler.pkgs system property set can lead to StackOverflowError
+  - JDK-8308474: DSA does not reset SecureRandom when initSign is called again
+  - JDK-8308609: java/lang/ScopedValue/StressStackOverflow.java fails with "-XX:-VMContinuations"
+  - JDK-8309032: jpackage does not work for module projects unless --module-path is specified
+  - JDK-8309088: security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java fails
+  - JDK-8309214: sun/security/pkcs11/KeyStore/CertChainRemoval.java fails after 8301154
+  - JDK-8309475: Test java/foreign/TestByteBuffer.java fails: a problem with msync (aix)
+  - JDK-8309502: RISC-V: String.indexOf intrinsic may produce misaligned memory loads
+  - JDK-8309591: Socket.setOption(TCP_QUICKACK) uses wrong level
+  - JDK-8309746: Reconfigure check should include make/conf/version-numbers.conf
+  - JDK-8309889: [s390] Missing return statement after calling jump_to_native_invoker method in generate_method_handle_dispatch.
+  - JDK-8310106: sun.security.ssl.SSLHandshake.getHandshakeProducer() incorrectly checks handshakeConsumers
+  - JDK-8310171: Bump version numbers for 21.0.1
+  - JDK-8310211: serviceability/jvmti/thread/GetStackTrace/getstacktr03/getstacktr03.java failing
+  - JDK-8310233: Fix THP detection on Linux
+  - JDK-8310268: RISC-V: misaligned memory access in String.Compare intrinsic
+  - JDK-8310321: make JDKOPT_CHECK_CODESIGN_PARAMS more verbose
+  - JDK-8310586: ProblemList java/lang/ScopedValue/StressStackOverflow.java#default with virtual threads on linux-all
+  - JDK-8310687: JDK-8303215 is incomplete
+  - JDK-8310873: Re-enable locked_create_entry symbol check in runtime/NMT/CheckForProperDetailStackTrace.java for RISC-V
+  - JDK-8311026: Some G1 specific tests do not set -XX:+UseG1GC
+  - JDK-8311033: [macos] PrinterJob does not take into account Sides attribute
+  - JDK-8311160: [macOS, Accessibility] VoiceOver: No announcements on JRadioButtonMenuItem and JCheckBoxMenuItem
+  - JDK-8311249: Remove unused MemAllocator::obj_memory_range
+  - JDK-8311285: report some fontconfig related environment variables in hs_err file
+  - JDK-8311511: Improve description of NativeLibrary JFR event
+  - JDK-8311592: ECKeySizeParameterSpec causes too many exceptions on third party providers
+  - JDK-8311682: Change milestone to fcs for all releases
+  - JDK-8311862: RISC-V: small improvements to shift immediate instructions
+  - JDK-8311917: MAP_FAILED definition seems to be obsolete in src/java.desktop/unix/native/common/awt/fontpath.c
+  - JDK-8311921: Inform about MaxExpectedDataSegmentSize in case of pthread_create failures on AIX
+  - JDK-8311923: TestIRMatching.java fails on RISC-V
+  - JDK-8311926: java/lang/ScopedValue/StressStackOverflow.java takes 9mins in tier1
+  - JDK-8311955: c++filt is now ibm-llvm-cxxfilt when using xlc17 / clang on AIX
+  - JDK-8311981: Test gc/stringdedup/TestStringDeduplicationAgeThreshold.java#ZGenerational timed out
+  - JDK-8312127: FileDescriptor.sync should temporarily increase parallelism
+  - JDK-8312180: (bf) MappedMemoryUtils passes incorrect arguments to msync (aix)
+  - JDK-8312182: THPs cause huge RSS due to thread start timing issue
+  - JDK-8312394: [linux] SIGSEGV if kernel was built without hugepage support
+  - JDK-8312395: Improve assertions in growableArray
+  - JDK-8312401: SymbolTable::do_add_if_needed hangs when called in InstanceKlass::add_initialization_error path with requesting length exceeds max_symbol_length
+  - JDK-8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
+  - JDK-8312525: New test runtime/os/TestTrimNative.java#trimNative is failing: did not see the expected RSS reduction
+  - JDK-8312535: MidiSystem.getSoundbank() throws unexpected SecurityException
+  - JDK-8312555: Ideographic characters aren't stretched by AffineTransform.scale(2, 1)
+  - JDK-8312573: Failure during CompileOnly parsing leads to ShouldNotReachHere
+  - JDK-8312585: Rename DisableTHPStackMitigation flag to THPStackMitigation
+  - JDK-8312591: GCC 6 build failure after JDK-8280982
+  - JDK-8312619: Strange error message when switching over long
+  - JDK-8312620: WSL Linux build crashes after JDK-8310233
+  - JDK-8312625: Test serviceability/dcmd/vm/TrimLibcHeapTest.java failed: RSS use increased
+  - JDK-8312909: C1 should not inline through interface calls with non-subtype receiver
+  - JDK-8312976: MatchResult produces StringIndexOutOfBoundsException for groups outside match
+  - JDK-8312984: javac may crash on a record pattern with too few components
+  - JDK-8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074
+  - JDK-8313248: C2: setScopedValueCache intrinsic exposes nullptr pre-values to store barriers
+  - JDK-8313262: C2:  Sinking node may cause required cast to be dropped
+  - JDK-8313307: java/util/Formatter/Padding.java fails on some Locales
+  - JDK-8313312: Add missing classpath exception copyright header
+  - JDK-8313323: javac -g on a java file which uses unnamed variable leads to ClassFormatError when launching that class
+  - JDK-8313402: C1: Incorrect LoadIndexed value numbering
+  - JDK-8313428: GHA: Bump GCC versions for July 2023 updates
+  - JDK-8313576: GCC 7 reports compiler warning in bundled freetype 2.13.0
+  - JDK-8313602: increase timeout for jdk/classfile/CorpusTest.java
+  - JDK-8313626: C2 crash due to unexpected exception control flow
+  - JDK-8313657: com.sun.jndi.ldap.Connection.cleanup does not close connections on SocketTimeoutErrors
+  - JDK-8313676: Amend TestLoadIndexedMismatch test to target intrinsic directly
+  - JDK-8313678: SymbolTable can leak Symbols during cleanup
+  - JDK-8313691: use close after failing os::fdopen in vmError and ciEnv
+  - JDK-8313701: GHA: RISC-V should use the official repository for bootstrap
+  - JDK-8313707: GHA: Bootstrap sysroots with --variant=minbase
+  - JDK-8313752: InstanceKlassFlags::print_on doesn't print the flag names
+  - JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+  - JDK-8313796: AsyncGetCallTrace crash on unreadable interpreter method pointer
+  - JDK-8313874: JNI NewWeakGlobalRef throws exception for null arg
+  - JDK-8313901: [TESTBUG] test/hotspot/jtreg/compiler/codecache/CodeCacheFullCountTest.java fails with java.lang.VirtualMachineError
+  - JDK-8313904: [macos] All signing tests which verifies unsigned app images are failing
+  - JDK-8314020: Print instruction blocks in byte units
+  - JDK-8314024: SIGSEGV in PhaseIdealLoop::build_loop_late_post_work due to bad immediate dominator info
+  - JDK-8314063: The socket is not closed in Connection::createSocket when the handshake failed for LDAP connection
+  - JDK-8314117: RISC-V: Incorrect VMReg encoding in RISCV64Frame.java
+  - JDK-8314118: Update JMH devkit to 1.37
+  - JDK-8314139: TEST_BUG: runtime/os/THPsInThreadStackPreventionTest.java could fail on machine with large number of cores
+  - JDK-8314144: gc/g1/ihop/TestIHOPStatic.java fails due to extra concurrent mark with -Xcomp
+  - JDK-8314216: Case enumConstant, pattern compilation fails
+  - JDK-8314262: GHA: Cut down cross-compilation sysroots deeper
+  - JDK-8314423: Multiple patterns without unnamed variables
+  - JDK-8314426: runtime/os/TestTrimNative.java is failing on slow machines
+  - JDK-8314501: Shenandoah: sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java fails
+  - JDK-8314517: some tests fail in case ipv6 is disabled on the machine
+  - JDK-8314618: RISC-V: -XX:MaxVectorSize does not work as expected
+  - JDK-8314656: GHA: No need for Debian ports keyring installation after JDK-8313701
+  - JDK-8314679: SA fails to properly attach to JVM after having just detached from a different JVM
+  - JDK-8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
+  - JDK-8314850: SharedRuntime::handle_wrong_method() gets called too often when resolving Continuation.enter
+  - JDK-8314960: Add Certigna Root CA - 2
+  - JDK-8315020: The macro definition for LoongArch64 zero build is not accurate.
+  - JDK-8315051: jdk/jfr/jvm/TestGetEventWriter.java fails with non-JVMCI GCs
+  - JDK-8315534: Incorrect warnings about implicit annotation processing
+
+Notes on individual issues:
+===========================
+
+core-libs/java.util.jar:
+
+JDK-8313765: Invalid CEN header (invalid zip64 extra data field size)
+=====================================================================
+Additional validity checks in the handling of Zip64 files,
+JDK-8302483, introduced in 21.0.0, caused the use of some valid zip
+files to now fail with the error, `Invalid CEN header (invalid zip64
+extra data field size)`
+
+This release, 21.0.1, allows for zero length headers and additional
+padding produced by some Zip64 creation tools.
+
+The following third party tools have also released patches to better
+adhere to the ZIP File Format Specification:
+
+* Apache Commons Compress fix for Empty CEN Zip64 Extra Headers fixed in Commons Compress release 1.11
+* Apache Ant fix for Empty CEN Zip64 Extra Headers fixed in Ant 1.10.14
+* BND issue with writing invalid Extra Headers fixed in BND 5.3
+
+The maven-bundle-plugin 5.1.5 includes the BND 5.3 patch.
+
+If these improved validation checks cause issues for deployed zip or
+jar files, check how the file was created and whether patches are
+available from the generating software to resolve the issue.  With
+both JDK releases, the checks can be disabled by setting the new
+system property, `jdk.util.zip.disableZip64ExtraFieldValidation` to
+`true`.
+
+hotspot/runtime:
+
+JDK-8311981: JVM May Hang When Using Generational ZGC if a VM Handshake Stalls on Memory
+========================================================================================
+The JVM can hang under an uncommon condition that involves the JVM
+running out of heap memory, the GC just starting a relocation phase to
+reclaim memory, and a JVM thread-local Handshake asking to relocate an
+object.  This potential deadlock should now be avoided in this
+release.
+
+core-libs/java.util.regex:
+
+JDK-8312976: `java.util.regex.MatchResult` Might Throw `StringIndexOutOfBoundsException` on Regex Patterns Containing Lookaheads and Lookbehinds
+================================================================================================================================================
+JDK-8132995 introduced an unintended regression when using instances
+returned by `java.util.regex.Matcher.toMatchResult()`.
+
+This regression happens with a `java.util.regex.Pattern`s containing
+lookaheads and lookbehinds that, in turn, contain groups. If these are
+located outside the match, a `StringIndexOutOfBoundsException` is
+thrown when accessing these groups. See JDK-8312976 for an example.
+
+The issue is resolved in this release by calculating a minimum start
+location as part of the match result and using this in constructing
+String objects, rather than the location of the first match.
+
+JDK-8314960: Added Certigna Root CA Certificate
+===============================================
+The following root certificate has been added to the cacerts
+truststore:
+
+Name: Certigna (Dhimyotis)
+Alias Name: certignarootca
+Distinguished Name: CN=Certigna Root CA, OU=0002 48146308100036, O=Dhimyotis, C=FR
+
+JDK-8312489: Increase Default Value of the System Property `jdk.jar.maxSignatureFileSize`
+=========================================================================================
+A maximum signature file size property, jdk.jar.maxSignatureFileSize,
+was introduced in the 21.0.0 release of OpenJDK by JDK-8300596 to
+control the maximum size of signature files in a signed JAR.  The
+default value of 8MB proved to be too small for some JAR files. This
+release, 21.0.1, increases it to 16MB.
+
+New in release OpenJDK 21.0.0 (2023-09-XX):
 ===========================================
 Major changes are listed below.  Some changes may have been backported
-to earlier releases following their first appearance in OpenJDK 20.
-
-The full list of changes in 20u can be found at:
-  * https://builds.shipilev.net/backports-monitor/release-notes-20.txt
+to earlier releases following their first appearance in OpenJDK 18
+through to 21.

 NEW FEATURES
 ============
@ -61,6 +630,7 @@ https://openjdk.org/jeps/406
 https://openjdk.org/jeps/420
 https://openjdk.org/jeps/427
 https://openjdk.org/jeps/433
+https://openjdk.org/jeps/441

 Enhance the Java programming language with pattern matching for
 `switch` expressions and statements, along with extensions to the
@ -69,38 +639,84 @@ expression to be tested against a number of patterns, each with a
 specific action, so that complex data-oriented queries can be
 expressed concisely and safely.

-This is a preview feature (http://openjdk.java.net/jeps/12) introduced
-in OpenJDK 17 (JEP 406), which saw a second preview in OpenJDK 18 (JEP
-420) and a third in OpenJDK 19 (JEP 427).  It reaches its fourth
-preview (JEP 427) in OpenJDK 20.
+This was a preview feature (http://openjdk.java.net/jeps/12)
+introduced in OpenJDK 17 (JEP 406), which saw a second preview in
+OpenJDK 18 (JEP 420), a third in OpenJDK 19 (JEP 427) and a fourth
+(JEP 427) in OpenJDK 20.  It became final with OpenJDK 21 (JEP 441).

 Record Patterns
 ===============
 https://openjdk.org/jeps/405
 https://openjdk.org/jeps/432
+https://openjdk.org/jeps/440

 Enhance the Java programming language with record patterns to
 deconstruct record values. Record patterns and type patterns can be
 nested to enable a powerful, declarative, and composable form of data
 navigation and processing.

+This was a preview feature (http://openjdk.java.net/jeps/12) introduced
+in OpenJDK 19 (JEP 405) with a second preview (JEP 432) in OpenJDK 20.
+It became final with OpenJDK 21 (JEP 440).
+
+String Templates
+================
+https://openjdk.org/jeps/430
+
+Enhance the Java programming language with string templates. String
+templates complement Java's existing string literals and text blocks
+by coupling literal text with embedded expressions and template
+processors to produce specialized results.
+
 This is a preview feature (http://openjdk.java.net/jeps/12) introduced
-in OpenJDK 19 (JEP 405). It reaches its second preview (JEP 432) in
-OpenJDK 20.
+in OpenJDK 21 (JEP 430).
+
+Unnamed Patterns and Variables
+==============================
+https://openjdk.org/jeps/443
+
+Enhance the Java language with unnamed patterns, which match a record
+component without stating the component's name or type, and unnamed
+variables, which can be initialized but not used. Both are denoted by
+an underscore character, _.
+
+This is a preview feature (http://openjdk.java.net/jeps/12) introduced
+in OpenJDK 21 (JEP 443).
+
+Unnamed Classes and Instance Main Methods (Preview)
+===================================================
+https://openjdk.org/jeps/445
+
+Evolve the Java language so that students can write their first
+programs without needing to understand language features designed for
+large programs. Far from using a separate dialect of Java, students
+can write streamlined declarations for single-class programs and then
+seamlessly expand their programs to use more advanced features as
+their skills grow.
+
+This is a preview feature (http://openjdk.java.net/jeps/12) introduced
+in OpenJDK 21 (JEP 445).

 Library Features
 ================

-Scoped Values
-=============
-https://openjdk.org/jeps/429
+UTF-8 by Default
+================
+https://openjdk.org/jeps/400

-Introduce scoped values, which enable the sharing of immutable data
-within and across threads. They are preferred to thread-local
-variables, especially when using large numbers of virtual threads.
+Specify UTF-8 as the default charset of the standard Java APIs. With
+this change, APIs that depend upon the default charset will behave
+consistently across all implementations, operating systems, locales,
+and configurations.

-This is an incubation feature (https://openjdk.java.net/jeps/11)
-introduced in OpenJDK 20 (JEP 429).
+Reimplement Core Reflection with Method Handles
+===============================================
+https://openjdk.org/jeps/416
+
+Reimplement java.lang.reflect.Method, Constructor, and Field on top of
+java.lang.invoke method handles. Making method handles the underlying
+mechanism for reflection will reduce the maintenance and development
+cost of both the java.lang.reflect and java.lang.invoke APIs.

 Vector API
 ==========
@ -109,6 +725,7 @@ https://openjdk.org/jeps/414
 https://openjdk.org/jeps/417
 https://openjdk.org/jeps/426
 https://openjdk.org/jeps/438
+https://openjdk.org/jeps/448

 Introduce an API to express vector computations that reliably compile
 at runtime to optimal vector hardware instructions on supported CPU
@ -118,7 +735,16 @@ scalar computations.
 This is an incubation feature (https://openjdk.java.net/jeps/11)
 introduced in OpenJDK 16 (JEP 338). A second round of incubation took
 place in OpenJDK 17 (JEP 414), OpenJDK 18 (JEP 417) saw a third,
-OpenJDK 19 a fourth (JEP 426) and OpenJDK 20 (JEP 438) sees its fifth.
+OpenJDK 19 a fourth (JEP 426), OpenJDK 20 (JEP 438) a fifth and
+OpenJDK 21 a sixth (JEP 448).
+
+Internet-Address Resolution SPI
+===============================
+https://openjdk.org/jeps/418
+
+Define a service-provider interface (SPI) for host name and address
+resolution, so that java.net.InetAddress can make use of resolvers
+other than the platform's built-in resolver.

 Foreign Function & Memory API
 =============================
@ -126,6 +752,7 @@ https://openjdk.org/jeps/412
 https://openjdk.org/jeps/419
 https://openjdk.org/jeps/424
 https://openjdk.org/jeps/434
+https://openjdk.org/jeps/442

 Introduce an API by which Java programs can interoperate with code and
 data outside of the Java runtime. By efficiently invoking foreign
@ -140,26 +767,29 @@ It was first introduced in incubation
 evolution of the Foreign Memory Access API (OpenJDK 14 through 16) and
 Foreign Linker API (OpenJDK 16) (see release notes for
 java-17-openjdk). OpenJDK 18 saw a second round of incubation (JEP
-419) before its inclusion as a preview in OpenJDK 19 (JEP 424).  It
-reaches a second preview in OpenJDK 20 (JEP 434).
+419) before its inclusion as a preview in OpenJDK 19 (JEP 424) and a
+second in OpenJDK 20 (JEP 434). It reaches a third preview in OpenJDK
+21 (JEP 442).

 Virtual Threads
 ===============
 https://openjdk.org/jeps/425
 https://openjdk.org/jeps/436
+https://openjdk.org/jeps/444

 Introduce virtual threads to the Java Platform. Virtual threads are
 lightweight threads that dramatically reduce the effort of writing,
 maintaining, and observing high-throughput concurrent applications.

-This is a preview feature (http://openjdk.java.net/jeps/12) introduced
-in OpenJDK 19 (JEP 425) and reaching its second preview in OpenJDK 20
-(JEP 436).
+This was a preview feature (http://openjdk.java.net/jeps/12)
+introduced in OpenJDK 19 (JEP 425) and reaching its second preview in
+OpenJDK 20 (JEP 436).  It became final with OpenJDK 21 (JEP 444).

 Structured Concurrency
 ======================
 https://openjdk.org/jeps/428
 https://openjdk.org/jeps/437
+https://openjdk.org/jeps/453

 Simplify multithreaded programming by introducing an API for
 structured concurrency. Structured concurrency treats multiple tasks
@ -167,6 +797,115 @@ running in different threads as a single unit of work, thereby
 streamlining error handling and cancellation, improving reliability,
 and enhancing observability.

-This is an incubation feature (https://openjdk.java.net/jeps/11)
-introduced in OpenJDK 19 (JEP 428). A second round of incubation takes
-place in OpenJDK 20 (JEP 437).
+This API is now a preview feature (http://openjdk.java.net/jeps/12) in
+OpenJDK 21 (JEP 453). It was first introduced in incubation
+(https://openjdk.java.net/jeps/11) in OpenJDK 19 (JEP 428) and had a
+second round of incubation in OpenJDK 20 (JEP 437).
+
+Scoped Values
+=============
+https://openjdk.org/jeps/429
+
+Introduce scoped values, which enable the sharing of immutable data
+within and across threads. They are preferred to thread-local
+variables, especially when using large numbers of virtual threads.
+
+This API is now a preview feature (http://openjdk.java.net/jeps/12)
+in OpenJDK 21 (JEP 429). It was first introduced in incubation
+(https://openjdk.java.net/jeps/11) in OpenJDK 20 (JEP 429).
+
+Sequenced Collections
+=====================
+https://openjdk.org/jeps/431
+
+Introduce new interfaces to represent collections with a defined
+encounter order. Each such collection has a well-defined first
+element, second element, and so forth, up to the last element. It also
+provides uniform APIs for accessing its first and last elements, and
+for processing its elements in reverse order.
+
+Key Encapsulation Mechanism API
+===============================
+https://openjdk.org/jeps/452
+
+Introduce an API for key encapsulation mechanisms (KEMs), an
+encryption technique for securing symmetric keys using public key
+cryptography.
+
+Virtual Machine Enhancements
+============================
+
+Generational ZGC
+================
+https://openjdk.org/jeps/439
+
+Improve application performance by extending the Z Garbage Collector
+(ZGC) to maintain separate generations for young and old objects. This
+will allow ZGC to collect young objects — which tend to die young —
+more frequently.
+
+Tools
+=====
+
+Simple Web Server
+=================
+https://openjdk.org/jeps/408
+
+Provide a command-line tool, `jwebserver`, to start a minimal web
+server that serves static files only. No CGI or servlet-like
+functionality is available. This tool will be useful for prototyping,
+ad-hoc coding, and testing purposes, particularly in educational
+contexts.
+
+Code Snippets in Java API Documentation
+=======================================
+https://openjdk.org/jeps/413
+
+Introduce an @snippet tag for JavaDoc's Standard Doclet, to simplify
+the inclusion of example source code in API documentation.
+
+Ports
+=====
+
+Linux/RISC-V Port
+=================
+https://openjdk.org/jeps/422
+
+RISC-V is a free and open-source RISC instruction set architecture
+(ISA) designed originally at the University of California, Berkeley,
+and now developed collaboratively under the sponsorship of RISC-V
+International. It is already supported by a wide range of language
+toolchains. With the increasing availability of RISC-V hardware, a
+port of the JDK would be valuable.
+
+DEPRECATIONS
+============
+
+Deprecate Finalization for Removal
+==================================
+https://openjdk.org/jeps/421
+
+Deprecate finalization for removal in a future release. Finalization
+remains enabled by default for now, but can be disabled to facilitate
+early testing. In a future release it will be disabled by default, and
+in a later release it will be removed. Maintainers of libraries and
+applications that rely upon finalization should consider migrating to
+other resource management techniques such as the try-with-resources
+statement and cleaners.
+
+Deprecate the Windows 32-bit x86 Port for Removal
+=================================================
+https://openjdk.org/jeps/449
+
+Deprecate the Windows 32-bit x86 port, with the intent to remove it in
+a future release.
+
+Prepare to Disallow the Dynamic Loading of Agents
+=================================================
+https://openjdk.org/jeps/451
+
+Issue warnings when agents are loaded dynamically into a running
+JVM. These warnings aim to prepare users for a future release which
+disallows the dynamic loading of agents by default in order to improve
+integrity by default. Serviceability tools that load agents at startup
+will not cause warnings to be issued in any release.
--- a/README.md
+++ b/README.md
@ -1,16 +1,16 @@
 # java-latest-openjdk-portable

-The java-latest-openjdk-portable package
-=======
-Rolling release of (usually) STSs  OpenJDK
-OpenJDK has release cadence of 6 months, but 3/4 of them are Short Term Supported for 6 months only. This package is designed to harbor them. Currently it is build of OpenJDK 12. LTSs will go also as separate packages. 
+This package contains the latest rolling release of OpenJDK. OpenJDK
+has a release cadence of six months, with a new release in March and
+September each year.

-JDK12 is current release of Java platform. It is bringing many cool improvements - https://openjdk.java.net/projects/jdk/12/ and is landing to your Fedora. Where it will be maintained for f28 and newer. Unluckily, this package is STS (short term support) version. Between individual LTS there will be always several STS. Again, please see announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html and See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf . So this is rolling release of all STSs to come. Its fate during the release of fresh LTS is yet to be decided. You will always be allowed to install LTS in fedora build root, alongside with latest STS via alternatives. 
+The current release is OpenJDK 22. For a list of major changes from
+OpenJDK 21, see the NEWS file included in this package and the
+upstream release page:

+https://openjdk.java.net/projects/jdk/22/

-See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html
-See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1557371#c0
-https://fedoraproject.org/wiki/Changes/java-openjdk-10
-https://fedoraproject.org/wiki/Changes/java-11-openjdk-TechPreview
+This package is intended for those who want to follow the latest
+OpenJDK releases. Long term support versions of OpenJDK are available
+in the java-1.8.0-openjdk, java-11-openjdk, java-17-openjdk  and java-21-openjdk
+packages.
--- a/alt-java.c
+++ b/alt-java.c
@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2023 Red Hat, Inc.
+ * 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.  Red Hat designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Red Hat in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ *
+ */
+
+#include <errno.h>
+#include <libgen.h>
+#include <linux/limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/prctl.h>
+#include <unistd.h>
+
+/* Per task speculation control */
+#ifndef PR_GET_SPECULATION_CTRL
+# define PR_GET_SPECULATION_CTRL    52
+#endif
+#ifndef PR_SET_SPECULATION_CTRL
+# define PR_SET_SPECULATION_CTRL    53
+#endif
+/* Speculation control variants */
+#ifndef PR_SPEC_STORE_BYPASS
+# define PR_SPEC_STORE_BYPASS          0
+#endif
+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
+
+#ifndef PR_SPEC_NOT_AFFECTED
+# define PR_SPEC_NOT_AFFECTED          0
+#endif
+#ifndef PR_SPEC_PRCTL
+# define PR_SPEC_PRCTL                 (1UL << 0)
+#endif
+#ifndef PR_SPEC_ENABLE
+# define PR_SPEC_ENABLE                (1UL << 1)
+#endif
+#ifndef PR_SPEC_DISABLE
+# define PR_SPEC_DISABLE               (1UL << 2)
+#endif
+#ifndef PR_SPEC_FORCE_DISABLE
+# define PR_SPEC_FORCE_DISABLE         (1UL << 3)
+#endif
+#ifndef PR_SPEC_DISABLE_NOEXEC
+# define PR_SPEC_DISABLE_NOEXEC        (1UL << 4)
+#endif
+
+static void set_speculation() {
+#if defined(__linux__) && defined(__x86_64__)
+  // PR_SPEC_DISABLE_NOEXEC doesn't survive execve, so we can't use it
+  //  if ( prctl(PR_SET_SPECULATION_CTRL,
+  //           PR_SPEC_STORE_BYPASS,
+  //           PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
+  //  return;
+  // }
+  prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
+#else
+#warning alt-java requested but SSB mitigation not available on this platform.
+#endif
+}
+
+int main(int argc, char **argv) {
+  set_speculation();
+
+  char our_name[PATH_MAX], java_name[PATH_MAX];
+  ssize_t len = readlink("/proc/self/exe", our_name, PATH_MAX - 1);
+  if (len < 0) {
+    perror("I can't find myself");
+    exit(2);
+  }
+
+  our_name[len] = '\0'; // readlink(2) doesn't append a null byte
+  char *path = dirname(our_name);
+  strncpy(java_name, path, PATH_MAX - 1);
+
+  size_t remaining_bytes = PATH_MAX - strlen(path) - 1;
+  strncat(java_name, "/java", remaining_bytes);
+
+  execv(java_name, argv);
+  fprintf(stderr, "%s failed to launch: %s\n", java_name, strerror(errno));
+
+  exit(1);
+}
+
--- a/discover_trees.sh
+++ b/discover_trees.sh
@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Copyright (C) 2020 Red Hat, Inc.
+# Written by Andrew John Hughes <gnu.andrew@redhat.com>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+TREE=${1}
+
+if test "x${TREE}" = "x"; then
+    TREE=${PWD}
+fi
+
+if [ -e ${TREE}/nashorn/.hg -o -e ${TREE}/nashorn/merge.changeset ] ; then
+    NASHORN="nashorn" ;
+fi
+
+if [ -e ${TREE}/corba/.hg -o -e ${TREE}/corba/merge.changeset ] ; then
+    CORBA="corba";
+fi
+
+if [ -e ${TREE}/jaxp/.hg -o -e ${TREE}/jaxp/merge.changeset ] ; then
+    JAXP="jaxp";
+fi
+
+if [ -e ${TREE}/jaxws/.hg -o -e ${TREE}/jaxws/merge.changeset ] ; then
+    JAXWS="jaxws";
+fi
+
+if [ -e ${TREE}/langtools/.hg -o -e ${TREE}/langtools/merge.changeset ] ; then
+    LANGTOOLS="langtools";
+fi
+
+if [ -e ${TREE}/jdk/.hg -o -e ${TREE}/jdk/merge.changeset ] ; then
+    JDK="jdk";
+fi
+
+if [ -e ${TREE}/hotspot/.hg -o -e ${TREE}/hotspot/merge.changeset ] ; then
+    HOTSPOT="hotspot";
+fi
+
+SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
+echo ${SUBTREES}
--- a/fips-21u-75ffdc48eda.patch
+++ b/fips-21u-75ffdc48eda.patch
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@ -1,75 +1,146 @@
 #!/bin/bash
+
+# Copyright (C) 2024 Red Hat, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 # Generates the 'source tarball' for JDK projects.
 #
-# Example:
-# When used from local repo set REPO_ROOT pointing to file:// with your repo
-# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
+# Example 1:
+# When used from local repo set REPO_ROOT pointing to file:// with your repo.
+# If your local repo follows upstream forests conventions, it may be enough to
+# set OPENJDK_URL.
+#
+# Example 2:
+# This will read the OpenJDK feature version from the spec file, then create a
+# tarball from the most recent tag for that version in the upstream Git
+# repository.
+#
+# $ OPENJDK_LATEST=1 ./generate_source_tarball.sh
+# [...]
+# Tarball is: temp-generated-source-tarball-ujD/openjdk-17.0.10+6-ea.tar.xz
+#
+# Unless you use OPENJDK_LATEST, you have to set PROJECT_NAME, REPO_NAME and
+# VERSION, e.g.:
 #
-# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
 # PROJECT_NAME=openjdk
-# REPO_NAME=jdk18u
-# VERSION=jdk-18.0.1+10
-# or to eg prepare systemtap:
-# icedtea7's jstack and other tapsets
+# REPO_NAME=jdk22u
+# VERSION=jdk-22+36
+#
+# or to e.g., prepare systemtap, icedtea7's jstack and other tapsets:
+#
 # VERSION=6327cf1cea9e
 # REPO_NAME=icedtea7-2.6
 # PROJECT_NAME=release
 # OPENJDK_URL=http://icedtea.classpath.org/hg/
 # TO_COMPRESS="*/tapset"
 #
-# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
-
-# This script creates a single source tarball out of the repository
-# based on the given tag and removes code not allowed in fedora/rhel. For
-# consistency, the source tarball will always contain 'openjdk' as the top
-# level folder, name is created, based on parameter
+# They are used to create correct name and are used in construction of sources
+# URL (unless REPO_ROOT is set).
 #
+# This script creates a single source tarball out of the repository based on the
+# given tag and removes code not allowed in Fedora/RHEL.

 set -e

 OPENJDK_URL_DEFAULT=https://github.com
 COMPRESSION_DEFAULT=xz
-# Corresponding IcedTea version
-ICEDTEA_VERSION=15.0

-if [ "x$1" = "xhelp" ] ; then
-    echo -e "Behaviour may be specified by setting the following variables:\n"
-    echo "VERSION - the version of the specified OpenJDK project"
-    echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
-    echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
-    echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
-    echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
-    echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
-    echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
-    echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
-    echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
+if [ "$1" = "help" ] ; then
+    echo "Behaviour may be specified by setting the following variables:"
+    echo
+    echo "VERSION        - the version of the specified OpenJDK project"
+    echo "                 (required unless OPENJDK_LATEST is set)"
+    echo "PROJECT_NAME   - the name of the OpenJDK project being archived"
+    echo "                 (needed to compute REPO_ROOT and/or"
+    echo "                  FILE_NAME_ROOT automatically;"
+    echo "                  optional if they are set explicitly)"
+    echo "REPO_NAME      - the name of the OpenJDK repository"
+    echo "                 (needed to compute REPO_ROOT automatically;"
+    echo "                  optional if REPO_ROOT is set explicitly)"
+    echo "OPENJDK_URL    - the URL to retrieve code from"
+    echo "                 (defaults to ${OPENJDK_URL_DEFAULT})"
+    echo "COMPRESSION    - the compression type to use"
+    echo "                 (defaults to ${COMPRESSION_DEFAULT})"
+    echo "FILE_NAME_ROOT - name of the archive, minus extensions"
+    echo "                 (defaults to PROJECT_NAME-VERSION)"
+    echo "REPO_ROOT      - the location of the Git repository to archive"
+    echo "                 (defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME.git)"
+    echo "TO_COMPRESS    - what part of clone to pack"
+    echo "                 (defaults to ${VERSION})"
+    echo "BOOT_JDK       - the bootstrap JDK to satisfy the configure run"
+    echo "                 (defaults to packaged JDK version)"
+    echo "WITH_TEMP      - run in a temporary directory"
+    echo "                 (defaults to disabled)"
+    echo "OPENJDK_LATEST - deduce VERSION from most recent upstream tag"
+    echo "                 (implies WITH_TEMP, computes everything else"
+    echo "                  automatically; Note: accesses network to read"
+    echo "                  tag list from remote Git repository)"
    exit 1;
 fi

+if [ "$OPENJDK_LATEST" != "" ] ; then
+    FEATURE_VERSION=$(echo '%featurever' \
+                          | rpmspec --shell ./*.spec 2>/dev/null \
+                          | grep --after-context 1 featurever \
+                          | tail --lines 1)
+    PROJECT_NAME=openjdk
+    REPO_NAME=jdk"${FEATURE_VERSION}"u
+    # Skip -ga tags since those are the same as the most recent non-ga tag, and
+    # the non-ga tag is the one that is used to generated the official source
+    # tarball.  For example:
+    # ca760c86642aa2e0d9b571aaabac054c0239fbdc  refs/tags/jdk-17.0.10-ga^{}
+    # 25a2e6c20c9a96853714284cabc6b456eb095070  refs/tags/jdk-17.0.10-ga
+    # ca760c86642aa2e0d9b571aaabac054c0239fbdc  refs/tags/jdk-17.0.10+7^{}
+    # e49c5749b10f3e90274b72e9279f794fdd191d27  refs/tags/jdk-17.0.10+7
+    VERSION=$(git ls-remote --tags --refs --sort=-version:refname \
+                  "${OPENJDK_URL_DEFAULT}/${PROJECT_NAME}/${REPO_NAME}.git" \
+                  "jdk-${FEATURE_VERSION}*" \
+                  | grep --invert-match '\-ga$' \
+                  | head --lines 1 | cut --characters 52-)
+    FILE_NAME_ROOT=open${VERSION}
+    WITH_TEMP=1
+fi

-if [ "x$VERSION" = "x" ] ; then
+if [ "$WITH_TEMP" != "" ] ; then
+    pushd "$(mktemp --directory temp-generated-source-tarball-XXX)"
+fi
+
+if [ "$VERSION" = "" ] ; then
    echo "No VERSION specified"
    exit 2
 fi
 echo "Version: ${VERSION}"
+
 NUM_VER=${VERSION##jdk-}
 RELEASE_VER=${NUM_VER%%+*}
 BUILD_VER=${NUM_VER##*+}
 MAJOR_VER=${RELEASE_VER%%.*}
 echo "Major version is ${MAJOR_VER}, release ${RELEASE_VER}, build ${BUILD_VER}"

-if [ "x$BOOT_JDK" = "x" ] ; then
+if [ "$BOOT_JDK" = "" ] ; then
    echo "No boot JDK specified".
    BOOT_JDK=/usr/lib/jvm/java-${MAJOR_VER}-openjdk;
    echo -n "Checking for ${BOOT_JDK}...";
-    if [ -d ${BOOT_JDK} -a -x ${BOOT_JDK}/bin/java ] ; then
+    if [ -d "${BOOT_JDK}" ] && [ -x "${BOOT_JDK}"/bin/java ] ; then
        echo "Boot JDK found at ${BOOT_JDK}";
    else
        echo "Not found";
-        PREV_VER=$((${MAJOR_VER} - 1));
+        PREV_VER=$((MAJOR_VER - 1));
        BOOT_JDK=/usr/lib/jvm/java-${PREV_VER}-openjdk;
        echo -n "Checking for ${BOOT_JDK}...";
-        if [ -d ${BOOT_JDK} -a -x ${BOOT_JDK}/bin/java ] ; then
+        if [ -d ${BOOT_JDK} ] && [ -x ${BOOT_JDK}/bin/java ] ; then
            echo "Boot JDK found at ${BOOT_JDK}";
        else
            echo "Not found";
@ -80,45 +151,43 @@ else
    echo "Boot JDK: ${BOOT_JDK}";
 fi

-# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
-if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
-  if [ "x$PROJECT_NAME" = "x" ] ; then
-    echo "No PROJECT_NAME specified"
-    exit 1
-  fi
-  echo "Project name: ${PROJECT_NAME}"
-  if [ "x$REPO_NAME" = "x" ] ; then
-    echo "No REPO_NAME specified"
-    exit 3
-  fi
-  echo "Repository name: ${REPO_NAME}"
-fi
-
-if [ "x$OPENJDK_URL" = "x" ] ; then
+if [ "$OPENJDK_URL" = "" ] ; then
    OPENJDK_URL=${OPENJDK_URL_DEFAULT}
    echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
 else
    echo "OpenJDK URL: ${OPENJDK_URL}"
 fi

-if [ "x$COMPRESSION" = "x" ] ; then
+if [ "$COMPRESSION" = "" ] ; then
    # rhel 5 needs tar.gz
    COMPRESSION=${COMPRESSION_DEFAULT}
 fi
 echo "Creating a tar.${COMPRESSION} archive"

-if [ "x$FILE_NAME_ROOT" = "x" ] ; then
-    FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
+if [ "$FILE_NAME_ROOT" = "" ] ; then
+    if [ "$PROJECT_NAME" = "" ] ; then
+        echo "No PROJECT_NAME specified, needed by FILE_NAME_ROOT"
+        exit 1
+    fi
+    FILE_NAME_ROOT=${PROJECT_NAME}-${VERSION}
    echo "No file name root specified; default to ${FILE_NAME_ROOT}"
 fi
-if [ "x$REPO_ROOT" = "x" ] ; then
+if [ "$REPO_ROOT" = "" ] ; then
+    if [ "$PROJECT_NAME" = "" ] ; then
+        echo "No PROJECT_NAME specified, needed by REPO_ROOT"
+        exit 1
+    fi
+    if [ "$REPO_NAME" = "" ] ; then
+        echo "No REPO_NAME specified, needed by REPO_ROOT"
+        exit 3
+    fi
    REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}.git"
    echo "No repository root specified; default to ${REPO_ROOT}"
 fi;

-if [ "x$TO_COMPRESS" = "x" ] ; then
-    TO_COMPRESS="openjdk"
-    echo "No targets to be compressed specified, ; default to ${TO_COMPRESS}"
+if [ "$TO_COMPRESS" = "" ] ; then
+    TO_COMPRESS="${VERSION}"
+    echo "No targets to be compressed specified ; default to ${TO_COMPRESS}"
 fi;

 echo -e "Settings:"
@ -132,52 +201,74 @@ echo -e "\tREPO_ROOT: ${REPO_ROOT}"
 echo -e "\tTO_COMPRESS: ${TO_COMPRESS}"
 echo -e "\tBOOT_JDK: ${BOOT_JDK}"

-if [ -d ${FILE_NAME_ROOT} ] ; then
-  echo "exists exists exists exists exists exists exists "
-  echo "reusing reusing reusing reusing reusing reusing "
-  echo ${FILE_NAME_ROOT}
+if [ -d "${FILE_NAME_ROOT}" ] ; then
+    echo "exists exists exists exists exists exists exists "
+    echo "reusing reusing reusing reusing reusing reusing "
+    echo "${FILE_NAME_ROOT}"
+    STAT_TIME="$(stat --format=%Y "${FILE_NAME_ROOT}")"
+    TAR_TIME="$(date --date=@"${STAT_TIME}" --iso-8601=seconds)"
 else
-  mkdir "${FILE_NAME_ROOT}"
-  pushd "${FILE_NAME_ROOT}"
-    echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
-    git clone -b ${VERSION} ${REPO_ROOT} openjdk
-  popd
+    mkdir "${FILE_NAME_ROOT}"
+    pushd "${FILE_NAME_ROOT}"
+        echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
+        git clone --depth=1 -b "${VERSION}" "${REPO_ROOT}" "${VERSION}"
+        pushd "${VERSION}"
+            TAR_TIME="$(git log --max-count 1 --format=%cI)"
+        popd
+    popd
 fi
 pushd "${FILE_NAME_ROOT}"
-    # Generate .src-rev so build has knowledge of the revision the tarball was created from
+    # Generate .src-rev so build has knowledge of the revision the tarball was
+    # created from
    mkdir build
    pushd build
-    sh ${PWD}/../openjdk/configure --with-boot-jdk=${BOOT_JDK}
-    make store-source-revision
+        sh "${PWD}"/../"${VERSION}"/configure --with-boot-jdk="${BOOT_JDK}"
+        make store-source-revision
    popd
    rm -rf build

-    # Remove commit checks
-    echo "Removing $(find openjdk -name '.jcheck' -print)"
-    find openjdk -name '.jcheck' -print0 | xargs -0 rm -rf
-
-    # Remove history and GHA
-    echo "find openjdk -name '.hgtags'"
-    find openjdk -name '.hgtags' -exec rm -fv '{}' '+'
-    echo "find openjdk -name '.hgignore'"
-    find openjdk -name '.hgignore' -exec rm -fv '{}' '+'
-    echo "find openjdk -name '.gitattributes'"
-    find openjdk -name '.gitattributes' -exec rm -fv '{}' '+'
-    echo "find openjdk -name '.gitignore'"
-    find openjdk -name '.gitignore' -exec rm -fv '{}' '+'
-    echo "find openjdk -name '.git'"
-    find openjdk -name '.git' -exec rm -rfv '{}' '+'
-    echo "find openjdk -name '.github'"
-    find openjdk -name '.github' -exec rm -rfv '{}' '+'
-
+    EA_PART="$(awk -F= \
+               '/^DEFAULT_PROMOTED_VERSION_PRE/ { if ($2) print "-"$2 }' \
+               "${VERSION}"/make/conf/version-numbers.conf)"
+    TARBALL_BASE=${FILE_NAME_ROOT}${EA_PART}.tar
+    pushd "${VERSION}"
+        # Omit commit checks, history, and GHA from archive.
+        for skip in .jcheck .hgtags .hgignore .gitattributes .gitignore .github
+        do
+            echo "${skip}"" export-ignore" >> .git/info/attributes
+        done
+        # Do not bother with --mtime here; specify it to tar below.
+        # Unforunately, git-archive sorts added files like .src-rev at the end;
+        # retar below to use GNU tar --sort=name ordering which sorts .src-rev
+        # at the start.
+        git archive --output "${TARBALL_BASE}" --prefix="${VERSION}"/ \
+            --add-file=.src-rev --format=tar "${VERSION}"
+    popd
+    mv "${VERSION}" "${VERSION}".git
+    tar xf "${VERSION}".git/"${TARBALL_BASE}"
    echo "Compressing remaining forest"
-    if [ "X$COMPRESSION" = "Xxz" ] ; then
+    if [ "$COMPRESSION" = "xz" ] ; then
        SWITCH=cJf
    else
        SWITCH=czf
    fi
-    TARBALL_NAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
-    tar --exclude-vcs -$SWITCH ${TARBALL_NAME} $TO_COMPRESS
-    mv ${TARBALL_NAME} ..
+    TARBALL_NAME=${TARBALL_BASE}.${COMPRESSION}
+    XZ_OPT=${XZ_OPT-"-T0"} \
+          tar --mtime="${TAR_TIME}" --owner=root --group=root --sort=name \
+          -$SWITCH "${TARBALL_NAME}" "${TO_COMPRESS}"
+    mv "${TARBALL_NAME}" ..
 popd
-echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
+if [ "$WITH_TEMP" != "" ] ; then
+    echo "Tarball is: $(realpath --relative-to=.. .)/${TARBALL_NAME}"
+    popd
+else
+    echo -n "Done. You may want to remove the uncompressed version"
+    echo " - $FILE_NAME_ROOT"
+fi
+
+# Local Variables:
+# compile-command: "shellcheck generate_source_tarball.sh"
+# fill-column: 80
+# indent-tabs-mode: nil
+# sh-basic-offset: 4
+# End:
--- a/icedtea_sync.sh
+++ b/icedtea_sync.sh
@ -1,192 +1 @@
-#!/bin/bash
-
-# Copyright (C) 2019 Red Hat, Inc.
-# Written by Andrew John Hughes <gnu.andrew@redhat.com>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program 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 Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-ICEDTEA_USE_VCS=true
-
-ICEDTEA_VERSION=3.15.0
-ICEDTEA_URL=https://icedtea.classpath.org/download/source
-ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
-
-ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
-
-set -e
-
-RPM_DIR=${PWD}
-if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
-    echo "Not in RPM source tree.";
-    exit 1;
-fi
-
-if test "x${TMPDIR}" = "x"; then
-    TMPDIR=/tmp;
-fi
-WORKDIR=${TMPDIR}/it.sync
-
-echo "Using working directory ${WORKDIR}"
-mkdir ${WORKDIR}
-pushd ${WORKDIR}
-
-if test "x${WGET}" = "x"; then
-    WGET=$(which wget);
-    if test "x${WGET}" = "x"; then
-	echo "wget not found";
-	exit 1;
-    fi
-fi
-
-if test "x${TAR}" = "x"; then
-    TAR=$(which tar)
-    if test "x${TAR}" = "x"; then
-	echo "tar not found";
-	exit 2;
-    fi
-fi
-
-echo "Dependencies:";
-echo -e "\tWGET: ${WGET}";
-echo -e "\tTAR: ${TAR}\n";
-
-if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
-    echo "Mode: Using VCS";
-
-    if test "x${GREP}" = "x"; then
-	GREP=$(which grep);
-	if test "x${GREP}" = "x"; then
-	    echo "grep not found";
-	    exit 3;
-	fi
-    fi
-
-    if test "x${CUT}" = "x"; then
-	CUT=$(which cut);
-	if test "x${CUT}" = "x"; then
-	    echo "cut not found";
-	    exit 4;
-	fi
-    fi
-
-    if test "x${TR}" = "x"; then
-	TR=$(which tr);
-	if test "x${TR}" = "x"; then
-	    echo "tr not found";
-	    exit 5;
-	fi
-    fi
-
-    if test "x${HG}" = "x"; then
-	HG=$(which hg);
-	if test "x${HG}" = "x"; then
-	    echo "hg not found";
-	    exit 6;
-	fi
-    fi
-
-    echo "Dependencies:";
-    echo -e "\tGREP: ${GREP}";
-    echo -e "\tCUT: ${CUT}";
-    echo -e "\tTR: ${TR}";
-    echo -e "\tHG: ${HG}";
-
-    echo "Checking out repository from VCS...";
-    ${HG} clone ${ICEDTEA_HG_URL} icedtea
-
-    echo "Obtaining version from configure.ac...";
-    ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
-    echo "Root version from configure: ${ROOT_VER}";
-
-    VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
-    echo "VCS revision: ${VCS_REV}";
-
-    ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
-    echo "Creating icedtea-${ICEDTEA_VERSION}";
-    mkdir icedtea-${ICEDTEA_VERSION}
-    echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
-    # Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
-    #cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
-    cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
-    cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
-
-    rm -rf icedtea
-else
-    echo "Mode: Using tarball";
-
-    if test "x${ICEDTEA_VERSION}" = "x"; then
-	echo "No IcedTea version specified for tarball download.";
-	exit 3;
-    fi
-
-    if test "x${CHECKSUM}" = "x"; then
-	CHECKSUM=$(which sha256sum)
-	if test "x${CHECKSUM}" = "x"; then
-	    echo "sha256sum not found";
-	    exit 4;
-	fi
-    fi
-
-    if test "x${PGP}" = "x"; then
-	PGP=$(which gpg)
-	if test "x${PGP}" = "x"; then
-	    echo "gpg not found";
-	    exit 5;
-	fi
-    fi
-
-    echo "Dependencies:";
-    echo -e "\tCHECKSUM: ${CHECKSUM}";
-    echo -e "\tPGP: ${PGP}\n";
-
-    echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
-    if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
-	echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
-	exit 6;
-    fi
-
-    echo "Downloading IcedTea release tarball...";
-    ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
-    echo "Downloading IcedTea tarball signature...";
-    ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-    echo "Downloading IcedTea tarball checksums...";
-    ${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
-
-    echo "Verifying checksums...";
-    ${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
-
-    echo "Checking signature...";
-    ${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-
-    echo "Extracting files...";
-    ${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
-       icedtea-${ICEDTEA_VERSION}/tapset \
-       icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
-
-    rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
-    rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
-    rm -vf icedtea-${ICEDTEA_VERSION}.sha256
-fi
-
-echo "Replacing desktop files...";
-mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
-
-echo "Creating new tapset tarball...";
-mv -v icedtea-${ICEDTEA_VERSION} openjdk
-${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
-
-rm -rvf openjdk
-
-popd
-rm -rf ${WORKDIR}
+# this file is intentionally not here, as portable builds do not have desktop integration
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
--- a/jconsole.desktop.in
+++ b/jconsole.desktop.in
@ -1,10 +1 @@
-[Desktop Entry]
-Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
-Comment=Monitor and manage OpenJDK applications
-Exec=_SDKBINDIR_/jconsole
-Icon=java-@JAVA_VER@-@JAVA_VENDOR@
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Profiling;Java;
-Version=1.0
+# this file is intentionally not here, as portable builds do not have desktop integration
--- a/jdk8296108-tzdata2022f.patch
+++ b/jdk8296108-tzdata2022f.patch
@ -1 +0,0 @@
-
--- a/jdk8296715-cldr2022f.patch
+++ b/jdk8296715-cldr2022f.patch
@ -1 +0,0 @@
-
--- a/nss.cfg.in
+++ b/nss.cfg.in
@ -1,5 +0,0 @@
-name = NSS
-nssLibraryDirectory = @NSS_LIBDIR@
-nssDbMode = noDb
-attributes = compatibility
-handleStartupErrors = ignoreMultipleInitialisation
--- a/nss.fips.cfg.in
+++ b/nss.fips.cfg.in
@ -1,8 +0,0 @@
-name = NSS-FIPS
-nssLibraryDirectory = @NSS_LIBDIR@
-nssSecmodDirectory = sql:/etc/pki/nssdb
-nssDbMode = readOnly
-nssModule = fips
-
-attributes(*,CKO_SECRET_KEY,CKK_GENERIC_SECRET)={ CKA_SIGN=true }
-
--- a/openjdk_news.sh
+++ b/openjdk_news.sh
@ -18,8 +18,8 @@

 OLD_RELEASE=$1
 NEW_RELEASE=$2
-SUBDIR=$3
-REPO=$4
+REPO=$3
+SUBDIR=$4
 SCRIPT_DIR=$(dirname ${0})

 if test "x${SUBDIR}" = "x"; then
@ -58,12 +58,12 @@ for repos in . $(${SCRIPT_DIR}/discover_trees.sh ${REPO});
 do
    if test "x$TYPE" = "xhg"; then
 	hg log -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R $REPO/$repos -G -M ${REPO}/${SUBDIR} | \
-	    egrep '^[o:| ]*summary'|grep -v 'Added tag'|sed -r 's#^[o:| ]*summary:\W*([0-9])#  - JDK-\1#'| \
+	    grep -E '^[o:| ]*summary'|grep -v 'Added tag'|sed -r 's#^[o:| ]*summary:\W*([0-9])#  - JDK-\1#'| \
 	    sed 's#^[o:| ]*summary:\W*#  - #' >> ${TMPDIR}/fixes2;
 	hg log -v -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R $REPO/$repos -G -M ${REPO}/${SUBDIR} | \
-	    egrep '^[o:| ]*[0-9]{7}'|sed -r 's#^[o:| ]*([0-9]{7})#  - JDK-\1#' >> ${TMPDIR}/fixes3;
+	    grep -E '^[o:| ]*[0-9]{7}'|sed -r 's#^[o:| ]*([0-9]{7})#  - JDK-\1#' >> ${TMPDIR}/fixes3;
    else
-	git -C ${REPO} log --no-merges --pretty=format:%B ${NEW_RELEASE}...${OLD_RELEASE} -- ${SUBDIR} |egrep '^[0-9]{7}' | \
+	git -C ${REPO} log --no-merges --pretty=format:%B ${NEW_RELEASE}...${OLD_RELEASE} -- ${SUBDIR} |grep -E '^[0-9]{7}' | \
 	    sed -r 's#^([0-9])#  - JDK-\1#' >> ${TMPDIR}/fixes2;
 	touch ${TMPDIR}/fixes3 ; # unused
    fi
--- a/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
+++ b/rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
@ -1,16 +0,0 @@
-diff -r 618ad1237e73 src/java.desktop/share/classes/java/awt/Toolkit.java
--- a/src/java.desktop/share/classes/java/awt/Toolkit.java	Thu Jun 13 19:37:49 2019 +0200
-+++ b/src/java.desktop/share/classes/java/awt/Toolkit.java	Thu Jul 04 10:35:42 2019 +0200
-@@ -595,7 +595,11 @@
-                 toolkit = new HeadlessToolkit(toolkit);
-             }
-             if (!GraphicsEnvironment.isHeadless()) {
-                loadAssistiveTechnologies();
-+                try {
-+                    loadAssistiveTechnologies();
-+                } catch (AWTError error) {
-+                    // ignore silently
-+                }
-             }
-         }
-         return toolkit;
--- a/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
+++ b/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
@ -1,12 +0,0 @@
-diff --git openjdk.orig/src/java.base/share/conf/security/java.security openjdk/src/java.base/share/conf/security/java.security
-index 68a9c1a2d08..7aa25eb2cb7 100644
--- openjdk.orig/src/java.base/share/conf/security/java.security
-+++ openjdk/src/java.base/share/conf/security/java.security
-@@ -78,6 +78,7 @@ security.provider.tbd=SunMSCAPI
- security.provider.tbd=Apple
- #endif
- security.provider.tbd=SunPKCS11
-+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
- 
- #
- # Security providers used when FIPS mode support is active
--- a/rh1648644-java_access_bridge_privileged_security.patch
+++ b/rh1648644-java_access_bridge_privileged_security.patch
@ -1,20 +0,0 @@
--- openjdk/src/java.base/share/conf/security/java.security
-+++ openjdk/src/java.base/share/conf/security/java.security
-@@ -304,6 +304,8 @@
- #
- package.access=sun.misc.,\
-                sun.reflect.,\
-+               org.GNOME.Accessibility.,\
-+               org.GNOME.Bonobo.,\
- 
- #
- # List of comma-separated packages that start with or equal this string
-@@ -316,6 +318,8 @@
- #
- package.definition=sun.misc.,\
-                    sun.reflect.,\
-+                   org.GNOME.Accessibility.,\
-+                   org.GNOME.Bonobo.,\
- 
- #
- # Determines whether this properties file can be appended to
--- a/rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
+++ b/rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
@ -1,15 +0,0 @@
-diff --git a/openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
-index bacff32efbc..ff7b3dcc81c 100644
--- openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
-+++ openjdk/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
-@@ -46,8 +46,8 @@ class PlatformPCSC {
- 
-     private static final String PROP_NAME = "sun.security.smartcardio.library";
- 
-    private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so";
-    private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
-+    private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so.1";
-+    private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so.1";
-     private static final String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
- 
-     PlatformPCSC() {
--- a/rh1750419-redhat_alt_java.patch
+++ b/rh1750419-redhat_alt_java.patch
@ -1,117 +0,0 @@
-diff --git openjdk.orig/make/modules/java.base/Launcher.gmk openjdk/make/modules/java.base/Launcher.gmk
-index 700ddefda49..2882de68eb2 100644
--- openjdk.orig/make/modules/java.base/Launcher.gmk
-+++ openjdk/make/modules/java.base/Launcher.gmk
-@@ -41,6 +41,14 @@ $(eval $(call SetupBuildLauncher, java, \
-     OPTIMIZATION := HIGH, \
- ))
- 
-+#Wno-error=cpp is present to allow commented warning in ifdef part of main.c
-+$(eval $(call SetupBuildLauncher, alt-java, \
-+    CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES -DREDHAT_ALT_JAVA -Wno-error=cpp, \
-+    EXTRA_RCFLAGS := $(JAVA_RCFLAGS), \
-+    VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
-+    OPTIMIZATION := HIGH, \
-+))
-+
- ifeq ($(call isTargetOs, windows), true)
-   $(eval $(call SetupBuildLauncher, javaw, \
-       CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
-diff --git openjdk.orig/src/java.base/share/native/launcher/alt_main.h openjdk/src/java.base/share/native/launcher/alt_main.h
-new file mode 100644
-index 00000000000..697df2898ac
--- /dev/null
-+++ openjdk/src/java.base/share/native/launcher/alt_main.h
-@@ -0,0 +1,73 @@
-+/*
-+ * Copyright (c) 2019, Red Hat, Inc. 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.  Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * 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.
-+ */
-+
-+#ifdef REDHAT_ALT_JAVA
-+
-+#include <sys/prctl.h>
-+
-+
-+/* Per task speculation control */
-+#ifndef PR_GET_SPECULATION_CTRL
-+# define PR_GET_SPECULATION_CTRL    52
-+#endif
-+#ifndef PR_SET_SPECULATION_CTRL
-+# define PR_SET_SPECULATION_CTRL    53
-+#endif
-+/* Speculation control variants */
-+#ifndef PR_SPEC_STORE_BYPASS
-+# define PR_SPEC_STORE_BYPASS          0
-+#endif
-+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
-+
-+#ifndef PR_SPEC_NOT_AFFECTED
-+# define PR_SPEC_NOT_AFFECTED          0
-+#endif
-+#ifndef PR_SPEC_PRCTL
-+# define PR_SPEC_PRCTL                 (1UL << 0)
-+#endif
-+#ifndef PR_SPEC_ENABLE
-+# define PR_SPEC_ENABLE                (1UL << 1)
-+#endif
-+#ifndef PR_SPEC_DISABLE
-+# define PR_SPEC_DISABLE               (1UL << 2)
-+#endif
-+#ifndef PR_SPEC_FORCE_DISABLE
-+# define PR_SPEC_FORCE_DISABLE         (1UL << 3)
-+#endif
-+#ifndef PR_SPEC_DISABLE_NOEXEC
-+# define PR_SPEC_DISABLE_NOEXEC        (1UL << 4)
-+#endif
-+
-+static void set_speculation() __attribute__((constructor));
-+static void set_speculation() {
-+  if ( prctl(PR_SET_SPECULATION_CTRL,
-+             PR_SPEC_STORE_BYPASS,
-+             PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
-+    return;
-+  }
-+  prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
-+}
-+
-+#endif // REDHAT_ALT_JAVA
-diff --git openjdk.orig/src/java.base/share/native/launcher/main.c openjdk/src/java.base/share/native/launcher/main.c
-index b734fe2ba78..79dc8307650 100644
--- openjdk.orig/src/java.base/share/native/launcher/main.c
-+++ openjdk/src/java.base/share/native/launcher/main.c
-@@ -34,6 +34,14 @@
- #include "jli_util.h"
- #include "jni.h"
- 
-+#ifdef REDHAT_ALT_JAVA
-+#if defined(__linux__) && defined(__x86_64__)
-+#include "alt_main.h"
-+#else
-+#warning alt-java requested but SSB mitigation not available on this platform.
-+#endif
-+#endif
-+
- /*
-  * Entry point.
-  */
--- a/rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
+++ b/rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
@ -1,19 +0,0 @@
-Remove uses of FAR in jpeg code
-
-Upstream libjpeg-trubo removed the (empty) FAR macro:
-http://sourceforge.net/p/libjpeg-turbo/code/1312/
-
-Adjust our code to not use the undefined FAR macro anymore.
-
-diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
--- openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
-+++ openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
-@@ -1385,7 +1385,7 @@
-     /* and fill it in */
-     dst_ptr = icc_data;
-     for (seq_no = first; seq_no < last; seq_no++) {
-        JOCTET FAR *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
-+        JOCTET *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
-         unsigned int length =
-             icc_markers[seq_no]->data_length - ICC_OVERHEAD_LEN;
- 
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (openjdk-jdk20u-jdk-20.0.1+9.tar.xz) = 41585ff383497464e5d6c278b39bed9eeddc80add72b65bd2ab8c95867ce5bc8bfb0ea860fcaf7c4cc5d41122fd62cf3348fa6c788a1978bdc7f20c3d0289b9b
+SHA512 (openjdk-jdk-22+36-ea.tar.xz) = ecc6e6b6fd10eb6c16d9eba03fe4dbf5f5b5406b166e0e24d9d4b8e339d148da4a7b551e5669f7c9327821837988696990886e55f1045ea20b54bb1ac6ef0fc6