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-17+35 #2

Merged
merged 7,580 commits into from Sep 28, 2021
Merged

Merge jdk-17+35 #2

merged 7,580 commits into from Sep 28, 2021

Conversation

@AntonKozlov
Copy link
Member

@AntonKozlov AntonKozlov commented Sep 24, 2021

Merge tag jdk-17+35. All CRaC-specific tests pass, although there are only few of them.


Progress

  • Change must not contain extraneous whitespace

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/crac pull/2/head:pull/2
$ git checkout pull/2

Update a local copy of the PR:
$ git checkout pull/2
$ git pull https://git.openjdk.java.net/crac pull/2/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/crac/pull/2.diff

pconcannon and others added 30 commits Jun 17, 2021
…bug-id

8249897: jdk/javadoc/tool/LangVers.java uses @ignore w/o bug-id
8249898: jdk/javadoc/tool/6176978/T6176978.java uses @ignore w/o bug-id

Reviewed-by: hannesw
…th "RuntimeException: java.net.SocketException: Connection reset"

Reviewed-by: xuelei, rhalade
…ght) failed: avoid overflow

Reviewed-by: tschatzl, iwalulya
…nconsistent klass hierarchy

Reviewed-by: kvn, roland, neliasso
…p is no longer needed

Reviewed-by: roland, kvn
…ortedOperationExc for unsupported modes

Reviewed-by: xuelei
…al VM flags

Reviewed-by: dholmes, mseledtsov
…iled with "SocketException: Cannot allocate memory"

Reviewed-by: dfuchs, michaelm, chegar
…n java stack' missing from stdout/stderr

Reviewed-by: dcubed
Daniel D. Daugherty and others added 17 commits Jul 28, 2021
8271413: ProblemList 2 locale tests on macOS-x64

Reviewed-by: naoto
Reviewed-by: iris, kcr, naoto, bpb
Reviewed-by: kvn, thartmann, chagedorn
…C promotion on Aug 5, 2021(B34)

Reviewed-by: iris, mikael
Reviewed-by: darcy, mr, iris, naoto
Added tag jdk-17+35 for changeset dfacda4
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 24, 2021

👋 Welcome back akozlov! 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 openjdk bot commented Sep 24, 2021

⚠️ @AntonKozlov a branch with the same name as the source branch for this pull request (crac) is present in the target repository. If you eventually integrate this pull request then the branch crac in your personal fork will diverge once you sync your personal fork with the upstream repository.

To avoid this situation, create a new branch for your changes and reset the crac branch. You can do this by running the following commands in a local repository for your personal fork. Note: you do not have to name the new branch NEW-BRANCH-NAME.

$ git checkout -b NEW-BRANCH-NAME
$ git branch -f crac c53fb564145ae10db2b878de6b10ee2c83d81501
$ git push -f origin crac

Then proceed to create a new pull request with NEW-BRANCH-NAME as the source branch and close this one.

@AntonKozlov AntonKozlov changed the title Merge: jdk-17+35 Merge jdk-17+35 Sep 24, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 24, 2021

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

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

Merge jdk-17+35

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.

➡️ To integrate this PR with the above commit message to the crac branch, type /integrate in a new comment.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 24, 2021

@AntonKozlov
Copy link
Member Author

@AntonKozlov AntonKozlov commented Sep 24, 2021

I'm going to tag the merge as crac-17+1. That is, first build of JDK17 with CRaC.

@DanHeidinga
Copy link
Collaborator

@DanHeidinga DanHeidinga commented Sep 27, 2021

@AntonKozlov What's the preferred process on this kind of change? I'm new to managing merges of the JDK mainline into project specific repos so not yet clear on what level of review something like this would need.

All CRaC-specific tests pass, although there are only few of them.

As this is a merge of mainline (well, 17) I'm OK with giving this the +1 assuming that's the process we typically follow for this?

Do projects typically follow the releases or the mainline development? Still learning the norms here :)

@AntonKozlov
Copy link
Member Author

@AntonKozlov AntonKozlov commented Sep 27, 2021

What's the preferred process on this kind of change? I'm new to managing merges of the JDK mainline into project specific repos so not yet clear on what level of review something like this would need.

I'm not sure also :) But I wanted to provide a heads up at least for the bump of the major version. Merges of minor versions probably are OK without review, if we'll do them often.

All CRaC-specific tests pass, although there are only few of them.

As this is a merge of mainline (well, 17) I'm OK with giving this the +1 assuming that's the process we typically follow for this?

Yeah, I think this would be useful, a simple acknowledgment from other member(s).

Do projects typically follow the releases or the mainline development? Still learning the norms here :)

We are free to choose something most suitable for us. I think having both makes sense: following mainline development for fast resolution of the problems with merges and a stable release for users to try. However, it is an additional burden in maintenance. Having 17, the merge of the early pre-18 state should be simple, the opposite looks harder. So for following 17 looks useful but simple enough. We can extend this any time we'd want, I think.

@DanHeidinga
Copy link
Collaborator

@DanHeidinga DanHeidinga commented Sep 27, 2021

Seems like a reasonable starting point.

github repeatedly fails to load the "files" tab with a "This page is taking too long to load." so I'm unable to actually review the PR in the UI. Anyone know of a workaround for this? Otherwise, please consider this reviewed.

@AntonKozlov
Copy link
Member Author

@AntonKozlov AntonKozlov commented Sep 28, 2021

github repeatedly fails to load the "files" tab with a "This page is taking too long to load." so I'm unable to actually review the PR in the UI. Anyone know of a workaround for this?

Funny enough, it's actually impossible to provide review (e.g. after checking out changes locally) without github attempt to show the diff.

Otherwise, please consider this reviewed.

OK, thanks!

@AntonKozlov AntonKozlov merged commit 9e54b02 into openjdk:crac Sep 28, 2021
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment