Update JBR to OpenJDK 21.0.10 #582
Open
+58,568
−29,509
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ract method for Windows specific test Backport-of: 49a82d8
…e after selecting one of L&F items, the test case automatically failed when clicking on L&F Menu button again Backport-of: 2b94b70
… cause disk full errors Backport-of: 2a53f5a
Backport-of: 762423d
…n Alpine Backport-of: 4152099
Backport-of: cabd7c1
…Windows 11 x64 because RBMenuItem's and CBMenuItem's checkmark on the left side are not visible Backport-of: c51bed7
…tGcResults.assertConsistency Backport-of: 310ef85
…outs Backport-of: f8c8bcf
…ls Thread::stop Backport-of: d288ca2
…e" property value for sun/net/www/protocol/file/FileURLTest.java Backport-of: d470594
…t underline Backport-of: 57553ca
…ative key code Backport-of: 640b71d
…plicit annotated type arg Backport-of: abcd23f
…mory machine Backport-of: 9093d3a
Backport-of: 55afcb5
…umbnail dimensions Backport-of: 60f3d60
…java timed out on macos-aarch64 Reviewed-by: phh Backport-of: 0dad3f1
Reviewed-by: phh Backport-of: 1e2bf07
…ary optional data Backport-of: ed153ee
…th stripped pdb files Backport-of: 98e1d2f
Reviewed-by: mdoerr Backport-of: bd25db1
… Ubuntu Backport-of: aec1388
…d out Backport-of: b0721e2
… Xcomp Backport-of: 7312eea
…plet test to main Backport-of: 256d48b
…itialization Backport-of: f169fc5
Reviewed-by: mbaesken, sgehwolf Backport-of: cb7fb728d4805ed4e9d62ce31cee7c948f3d5746
Backport-of: 1315d641edc5fd7619fed0998cb130cfc8162804
Backport-of: 76c1173ff5780b18cdb9ba3a519ee83abf651a3a
Backport-of: 79283a4b99d7bfff32674b4a29a75f706c9a9ba3
Backport-of: d8ea3bcf8597c7277d6b4bbe23afd33cc41d48fa
Backport-of: bc74f4a552f4bec37ee3cd870bacef4a0b186c53
Reviewed-by: jlu Backport-of: 5c7956fd9a56a00c8af2d3092ea5680843429b53
Backport-of: 3a925dcd8a7628ea9ad9092a9019198fa7a6f00d
Backport-of: 8d9541f8c907d10159d524fc00fce85a2d99e51d
Reviewed-by: ahgross, coffeys, rhalade, mullan, abarashev
Reviewed-by: mdoerr
sercher
force-pushed
the
update_21.0.10
branch
from
afcd0e7 to
46299e7
Compare
This was referenced Jan 21, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi,
Here's an update to JBR/jbr21 branch with OpenJDK release version 21.0.10 (jdk-21.0.10-ga).
All changes applied cleanly except for the cases listed below, that have been skipped or applied with modifications.
JDK-8324491: Keyboard layout didn't keep its state if it was changed when dialog was active
The patch fixes the same issue as the one in JBR-3785 (in a different way) and conflicts with JBR-3785. JBR-3785 was reverted in the proposed PR. JDK-8324491 Jira issue includes a manual test that can be run on Windows to ensure the identical behavior (keyboards switching) of the JBR-3785 and the post-8324491-reverted-JBR-3785 versions. JDK-8324491 applies cleanly after JBR-3785 is reverted. Please note that when/if there are issues with the 8324491 port and the reverted JBR-3785, this PR (or the target branch afterwards) could be updated to revert back JDK-8324491 and reapply JBR-3785.
Otherwise the upstream version should be preferred to minimize the future conflicts.
JDK-8317970: Bump target macosx-x64 version to 11.00.00
The patch isn't included in this PR. It is propsed to postpone changing MACOSX_VERSION_MIN to 11.00 to later releases (at least) or skip the patch completely for JDK 21 lifetime. The patch broke our build and test infrastructure and is questioinable for an LTS release, to say the least. Bellsoft's JDK 21.0.10 builds won't include that.
JDK-8367017: Remove legacy checks from WrappedToolkitTest and convert from bash
The patch applied cleanly, but required to modify the test/jdk/TEST.groups additionally, otherwise JTREG would be broken. The applied patch includes an additional fragment.
JDK-8140527-8139392: 8140527: JInternalFrame has incorrect title button width. 8139392: JInternalFrame has incorrect padding
The patch appplied without a fragment in the copyright header in WindowsIconFactory.java (already updated in JBR). Otherwise patch applies cleanly.
JDK-8358748: Large page size initialization fails with assert "page_size must be a power of 2"
Context conflicts with JBR-5183 dcevm17 squashed commits. The patch applied with the respect to the downstream changes.
JDK-8307160: Fix AWT/2D/A11Y to support the permissive- flag on the Microsoft Visual C compiler
The patch applied cleanly to JBR, but caused build failures. It enforces the strict C/C++ conformance using the 'permissive-' switch. There were fragments introduced in JBR over JDK 21 that are not strictly conformant. All the non-conformant fragments were located and modified without changing the program logic. 'goto' fragments were fixed in awt_Frame.cpp, awt_Window.cpp, jbr_CustomTitleBarControls.cpp. Also some minor changes required in awt_FileDialog.cpp in the SmartHolderBase class, otherwise it didn't compile in the strict conformance mode.
JDK-8328377: Convert java/awt/Cursor/MultiResolutionCursorTest test to main
The patch applied cleanly, but required to modify the test/jdk/TEST.groups additionally, otherwise JTREG would be broken. The applied patch includes an additional fragment.
JDK-8280482: Window transparency bug on Linux
The commit removes toGlobal() conversion introduced by JDK-8143295 (not in JBR). Respectively, the change is not needed in JBR, given that the test included in JDK-8280482 passes. The patch applied partially, only the test MultiScreenCheckScreenIDTest.java was added. The test passes in multi-display environment.
JDK-8353175: Eliminate double iteration of stream in FieldDescriptor
The patch applied cleanly with minor context conflicts due to JBR-5183 pre-dcevm17 squashed commits and a utility class Triple from JBR-6419, that are not related directly to JDK-8353175.
The patch changed the signature of fieldDescriptor::reinitialize() and caused build failures in JBR. It required additional modifications in InstanceKlass::find_local_field_by_name() and InstanceKlass::do_nonstatic_fields_dcevm(), where reinitialize() method was used in fragments, specific to DCEVM implementation and to JBR only.
JDK-8372534: Update Libpng to 1.6.51
The patch applied with conflict in Awt2dLibraries.gmk, modified with JBR-5965 "Wayland: implement SplashScreen" in a fragment, disabling unused-function warnings for png.c. The patch applied with respect to the downstream change.
TESTING