[crac] RFR: Merge jdk:jdk-27+7
Timofei Pushkin
tpushkin at openjdk.org
Tue Feb 3 14:55:53 UTC 2026
Merge of mainline up to tag `jdk-27+7`.
Essentially clean, the only conflict was in copyright years. Output of `git show --remerge-diff`:
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
remerge CONFLICT (content): Merge conflict in src/hotspot/share/gc/parallel/psParallelCompact.cpp
index 40fea755cf7..27f1c7a8afb 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -1,12 +1,6 @@
/*
-<<<<<<< 2f0af59e4d3 (Merge jdk:jdk-27+5)
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2019, 2021, Azul Systems, Inc. All rights reserved.
-||||||| f6d26c6b32a
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
-=======
* Copyright (c) 2005, 2026, Oracle and/or its affiliates. All rights reserved.
->>>>>>> 62c7e9aefd4 (8376423: Test javax/swing/plaf/metal/MetalUtils/bug6190373.java failed: ClassCastException: class java.lang.Character cannot be cast to class javax.swing.Painter)
+ * Copyright (c) 2019, 2021, Azul Systems, 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
-------------
Commit messages:
- Merge jdk:jdk-27+7
- 8376423: Test javax/swing/plaf/metal/MetalUtils/bug6190373.java failed: ClassCastException: class java.lang.Character cannot be cast to class javax.swing.Painter
- 8376169: JPopupMenu.setInvoker(null) causes NPE
- 8376531: Genshen: Convert ShenandoahOldGeneration to use Atomic<T>
- 8376433: Remove AppContext from Swing Windows L&F implementation
- 8376434: Remove AppContext from awt ImageFetcher implementation
- 8376432: Remove AppContext from sun/swing/DefaultLookup.java
- 8376419: (fs) Minor improvement of java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java
- 8376402: Dependencies::print_statistics() and AbstractClassHierarchyWalker::print_statistics() are not called from PRODUCT code
- 8375433: jar should validate automatic module names
- ... and 187 more: https://git.openjdk.org/crac/compare/2f0af59e...288267ab
The webrevs contain the adjustments done while merging with regards to each parent branch:
- crac: https://webrevs.openjdk.org/?repo=crac&pr=290&range=00.0
- jdk:jdk-27+7: https://webrevs.openjdk.org/?repo=crac&pr=290&range=00.1
Changes: https://git.openjdk.org/crac/pull/290/files
Stats: 29091 lines in 852 files changed: 13593 ins; 5386 del; 10112 mod
Patch: https://git.openjdk.org/crac/pull/290.diff
Fetch: git fetch https://git.openjdk.org/crac.git pull/290/head:pull/290
PR: https://git.openjdk.org/crac/pull/290
More information about the crac-dev
mailing list