JetBrainsRuntime icon indicating copy to clipboard operation
JetBrainsRuntime copied to clipboard

Update JBR/jbr17 to OpenJDK 17.0.13

Open sercher opened this issue 4 months ago • 0 comments

Update JBR/jbr17 branch with OpenJDK release version 17.0.13 (jdk-17.0.13-ga), merged and tested by BellSoft.

All changes applied cleanly except for 7 cases, that required manual merge. Please see the summary of the conflicts below.

JDK-8317288: [macos] java/awt/Window/Grab/GrabTest.java: Press on the outside area didn't cause ungrab

Patch overrides the code block updated with JBR-6125 (https://github.com/JetBrains/JetBrainsRuntime/commit/ca55622). It applies cleanly after JBR-6125 gets reverted. The resulting patch combines the reverted modification of GrabTest.java and the clean backport of JDK-8317288. The test passes after update.

JDK-8329126: No native wrappers generated anymore with -XX:-TieredCompilation after JDK-8251462

The conflicting code block is changed by reverting 8265360 with JBR-4986 (https://github.com/JetBrains/JetBrainsRuntime/commit/08f2bb48118a11e00a356283742c7ba75b095140). The updated condition combines || method->is_native() being added and the proper parameter type is passed to CompilationPolicy::is_trivial() method, that is changed in the reverted 8265360 from const MethodHandle& to Method* (returned by MethodHandle::operator()). Otherwise the patch applied cleanly.

JDK-8280993: [XWayland] Popup is not closed on click outside of area controlled by XWayland

Context conflict in UNIXToolkit.java due to absense of JBR-6376 (https://github.com/JetBrains/JetBrainsRuntime/commit/693fe435f71e366f7a8e7c959d7c1cd501e45c84). The patch applied with respect to the changed introduced by JBR-6376.

JDK-8280982: [Wayland] [XWayland] java.awt.Robot taking screenshots

Context conflict in the imports section of XRobotPeer.java due to absense of JBR-6264 (https://github.com/JetBrains/JetBrainsRuntime/commit/d4a3e05d36c9dbf894369e7ace9c1671d18699bf).

JDK-8317228: GC: Make TestXXXHeapSizeFlags use createTestJvm

Context conflict in tests, VMProps.java due to absense of JBR-3572 (https://github.com/JetBrains/JetBrainsRuntime/commit/c6ddafe42bf202b2f68fff7230c3aff727f864d3)

JDK-8320608: Many jtreg printing tests are missing the @printer keyword

Conflict in TEST.ROOT - due to "enabling dtrace-tests: added dtrace keyword" (https://github.com/JetBrains/JetBrainsRuntime/commit/0c86ae72f1a22d004c8cb57e0c80cf1478651bcd)

JDK-8329667: [macos] Issue with JTree related fix for JDK-8317771

Context conflict in CAccessibility.java due to lack of JBR-3775 (https://github.com/JetBrains/JetBrainsRuntime/commit/5a329c4000b41c900f2e069c3ccc1b96d981699c)

Testing:

We ran a standard JDK test groups in all available platforms. We observed no regressions in the standard tests. The extended test set in test/jdk/jb has been executed in Windows/MacOS without regressions as well.

sercher avatar Oct 16 '24 12:10 sercher