[crac] RFR: Merge jdk:jdk-25+14

[Radim Vansa]

On Tue, 3 Jun 2025 10:07:02 GMT, Dmitry Cherepanov <dcherepanov at openjdk.org> wrote:

> This PR includes merges for tags between jdk-25+11 and jdk-25+14, attaching output of --diff-merges=remerge for each merge
> 
> <details>
> 
> <summary>jdk-25+11</summary>
> 
> 
> commit e16e79c9aa23cbb795bfe44f3562ced6261841f3
> Merge: 19d203aee40 0131c1bfd8c
> Author: Dmitry Cherepanov <dcherepanov at azul.com>
> Date:   Mon Jun 2 14:36:10 2025 +0400
> 
>     Merge with jdk-25+11
> 
> diff --git a/make/test/BuildTestLib.gmk b/make/test/BuildTestLib.gmk
> remerge CONFLICT (content): Merge conflict in make/test/BuildTestLib.gmk
> index a37fbf7dd26..2a7ffaa525e 100644
> --- a/make/test/BuildTestLib.gmk
> +++ b/make/test/BuildTestLib.gmk
> @@ -53,17 +53,13 @@ $(eval $(call SetupJavaCompilation, BUILD_WB_JAR, \
>  TARGETS += $(BUILD_WB_JAR)
>  
>  ifeq ($(call isTargetOs, linux), false)
> -    BUILD_TEST_LIB_JAR_EXCLUDES := jdk/test/lib/containers
> +    BUILD_TEST_LIB_JAR_EXCLUDES := jdk/test/lib/containers/cgroup jdk/test/lib/containers/systemd
>  endif
>  
>  $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
>      TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
>      SRC := $(TEST_LIB_SOURCE_DIR), \
> -<<<<<<< 19d203aee40 (8357984: [CRaC] Improve new properties installation code)
> -    EXCLUDES := jdk/test/lib/containers/cgroup jdk/test/lib/containers/systemd jdk/test/lib/security, \
> -=======
>      EXCLUDES := $(BUILD_TEST_LIB_JAR_EXCLUDES), \
> ->>>>>>> 0131c1bfd8c (8349953: Avoid editing AOTConfiguration file in "make test JTREG=AOT_JDK=true")
>      BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
>      HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \
>      JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
> 
> 
> </details>
> 
> Resolved conflict after [JDK-8346050](https://bugs.openjdk.org/browse/JDK-8346050)
> 
> <details>
> 
> <summary>jdk-25+12</summary>
> 
> 
> commit 5d7098526ef5333eb8002ef7611c0e2441bccef8
> Merge: e16e79c9aa2 78c18cfbcee
> Author: Dmitry Cherepanov <dcherepanov at azul.com>
> Date:   Tue Jun 3 00:05:47 2025 +0400
> 
>     Merge with jdk-25+12
> 
> diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
> remerge CONFLICT (content): Merge conflict in src/hotspot/share/classfile/classLoader.cpp
> index 2963d66d561..2449dbc46b4 100644
> --- a/src/hotspot/share/classfile/classLoader.cpp
> +++ b/src/hotspot/share/classfile/classLoader.cpp
> @@ -745,7 +745,6 @@ void ClassLoader::add_to_boot_append_entries(ClassPathEntry *new_entry) {
>    }
>  }
>  
> -<<<<<<< e16e79c9aa2 (Merge with jdk-25+11)
>  GrowableArray<int> ClassLoader::get_classpath_entry_fds() {
>    GrowableArray<int> fds;
>    assert(Thread::curren...

Conflict resolution looks OK, please fix the check failure.

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

PR Comment: https://git.openjdk.org/crac/pull/236#issuecomment-2934871944