[crac] Integrated: Merge jdk:jdk-27+7

Timofei Pushkin tpushkin at openjdk.org
Wed Feb 4 11:55:57 UTC 2026


On Tue, 3 Feb 2026 14:49:43 GMT, Timofei Pushkin <tpushkin at openjdk.org> wrote:

> 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

This pull request has now been integrated.

Changeset: 03b55647
Author:    Timofei Pushkin <tpushkin at openjdk.org>
URL:       https://git.openjdk.org/crac/commit/03b556479e69acf06610a671c342a3b900ed2a0f
Stats:     29091 lines in 852 files changed: 13593 ins; 5386 del; 10112 mod

Merge jdk:jdk-27+7

Reviewed-by: rvansa

-------------

PR: https://git.openjdk.org/crac/pull/290


More information about the crac-dev mailing list