From rvansa at openjdk.org Fri Aug 30 11:26:43 2024 From: rvansa at openjdk.org (Radim Vansa) Date: Fri, 30 Aug 2024 11:26:43 GMT Subject: [crac] RFR: Merge jdk-23+37 Message-ID: This merges the release candidate tag 23+37 into CRaC, expecting that we will baseline on 23 soon. Most of the conflicts to resolve were trivial, one place worth attention is `LinuxAttachListener`+`LinuxAttachOperation` that were refactored in CRaC and in upstream renamed to `PosixAttachListener`+`PosixAttachOperation`. Second set of conflicts appeared in CPU features handling. ------------- Commit messages: - Fix PosixAttachListener macros - Build jdk/test/lib/containers/docker for tests - Merge tag 'jdk-23+37' into crac - 8338139: {ClassLoading,Memory}MXBean::isVerbose methods are inconsistent with their setVerbose methods - 8337831: Remove EA from the JDK 23 version string with first RC promotion - 8337716: ByteBuffer hashCode implementations are inconsistent - 8337054: JDK 23 RDP2 L10n resource files update - 8334167: Test java/lang/instrument/NativeMethodPrefixApp.java timed out - 8335967: "text-decoration: none" does not work with "A" HTML tags - 8334339: Test java/nio/file/attribute/BasicFileAttributeView/CreationTime.java fails on alinux3 - ... and 3926 more: https://git.openjdk.org/crac/compare/7d03b259...2051e8c6 The webrevs contain the adjustments done while merging with regards to each parent branch: - crac: https://webrevs.openjdk.org/?repo=crac&pr=156&range=00.0 - jdk-23+37: https://webrevs.openjdk.org/?repo=crac&pr=156&range=00.1 Changes: https://git.openjdk.org/crac/pull/156/files Stats: 1800280 lines in 17153 files changed: 522366 ins; 776857 del; 501057 mod Patch: https://git.openjdk.org/crac/pull/156.diff Fetch: git fetch https://git.openjdk.org/crac.git pull/156/head:pull/156 PR: https://git.openjdk.org/crac/pull/156 From rvansa at openjdk.org Fri Aug 30 11:26:43 2024 From: rvansa at openjdk.org (Radim Vansa) Date: Fri, 30 Aug 2024 11:26:43 GMT Subject: [crac] RFR: Merge jdk-23+37 In-Reply-To: References: Message-ID: On Thu, 29 Aug 2024 14:50:19 GMT, Radim Vansa wrote: > This merges the release candidate tag 23+37 into CRaC, expecting that we will baseline on 23 soon. > > Most of the conflicts to resolve were trivial, one place worth attention is `LinuxAttachListener`+`LinuxAttachOperation` that were refactored in CRaC and in upstream renamed to `PosixAttachListener`+`PosixAttachOperation`. Second set of conflicts appeared in CPU features handling. Some of the test failures (on x86_64 and macos) are intermittent failures, should be fixed independently. There are failures on x86 (32bit), I could reproduce some container related tests - there were some 32-bit libraries missing in the system (though the failure does not reproduce all the time). Also TestStackOverflowDuringInit has some fixes in the downstream; these will be applied as a follow-up. ------------- PR Comment: https://git.openjdk.org/crac/pull/156#issuecomment-2320901791