Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge jdk:jdk-24+25 #184

Open
wants to merge 175 commits into
base: crac
Choose a base branch
from
Open

Merge jdk:jdk-24+25 #184

wants to merge 175 commits into from

Conversation

dimitryc
Copy link
Contributor

@dimitryc dimitryc commented Jan 14, 2025

Merge jdk:jdk-24+25


Progress

  • Change must not contain extraneous whitespace

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/crac.git pull/184/head:pull/184
$ git checkout pull/184

Update a local copy of the PR:
$ git checkout pull/184
$ git pull https://git.openjdk.org/crac.git pull/184/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 184

View PR using the GUI difftool:
$ git pr show -t 184

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/crac/pull/184.diff

Using Webrev

Link to Webrev Comment

xmas92 and others added 30 commits November 14, 2024 06:13
Reviewed-by: jsikstro, eosterlund, stefank
Reviewed-by: vromero, abimpoudis, mcimadamore, alanb
…stead of uncommon traps

Reviewed-by: epeter, thartmann
…d DataFrames from closed streams

Reviewed-by: jpai
Reviewed-by: chagedorn, dfenacci, dlunden
…ransitive java.base;

Co-authored-by: Mark Reinhold <[email protected]>
Co-authored-by: Alex Buckley <[email protected]>
Reviewed-by: hannesw, asotona
… MethodData on failure

Reviewed-by: shade, dholmes, tschatzl
…ot/jtreg/ProblemList.txt

Reviewed-by: chagedorn, kvn
…nCollectionSetRegionClosure

Reviewed-by: iwalulya, ayang, sangheki
…eam().read() wasn't preempted

Reviewed-by: dfuchs, msheppar, syan, alanb
… failed

8344046: Tests under cds/appcds/jvmti/redefineClasses should have @requires vm.cds

Reviewed-by: iklam, matsaave
coleenp and others added 20 commits November 20, 2024 12:22
….URLClassLoader after JEP 486 integration

Reviewed-by: alanb, yzheng
….Socket and java.net.ServerSocket after JEP 486 integration

Reviewed-by: dfuchs, alanb, jpai
…d-forwarding failures

Reviewed-by: chagedorn, qamai
…ry input to at least one load/store

Co-authored-by: Roberto Castañeda Lozano <[email protected]>
Reviewed-by: thartmann, chagedorn
Reviewed-by: kevinw, lmesnik, cjplummer
…n the java.desktop module

Reviewed-by: kizune
Co-authored-by: Fei Yang <[email protected]>
Reviewed-by: mli, fyang
@bridgekeeper
Copy link

bridgekeeper bot commented Jan 14, 2025

👋 Welcome back dcherepanov! A progress list of the required criteria for merging this PR into crac will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Jan 14, 2025

@dimitryc This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

Merge jdk:jdk-24+25

Reviewed-by: rvansa

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the crac branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@rvansa) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 14, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 14, 2025

@dimitryc
Copy link
Contributor Author

As a part of the merge with jdk-24+25 (with the patch for JDK-8344056), CRaC options moved from src/java.base/share/man/java.1 (deleted now) to src/java.base/share/man/java.md

Copy link
Collaborator

@rvansa rvansa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@dimitryc
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jan 15, 2025
@openjdk
Copy link

openjdk bot commented Jan 15, 2025

@dimitryc
Your change (at version bde2a2f) is now ready to be sponsored by a Committer.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored
Development

Successfully merging this pull request may close these issues.