guide
guide copied to clipboard
Section on sponsoring
Copied and updated the text from the old sponsoring page: https://openjdk.org/sponsor/ The purpose is to have the sponsor link on the OpenJDK page lead here instead.
Also updated the contributing section with some parts taken from the old contributing page: https://openjdk.org/contribute/ Again, the intention is to change the link on the OpenJDK page to lead here.
Progress
- [ ] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
- [x] Change must not contain extraneous whitespace
Reviewing
Using git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/guide.git pull/97/head:pull/97
$ git checkout pull/97
Update a local copy of the PR:
$ git checkout pull/97
$ git pull https://git.openjdk.org/guide.git pull/97/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 97
View PR using the GUI difftool:
$ git pr show -t 97
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/guide/pull/97.diff
Webrev
:wave: Welcome back jwilhelm! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.
Webrevs
- 13: Full - Incremental (2f3067a8)
- 12: Full - Incremental (851c658c)
- 11: Full - Incremental (b4d9dc4e)
- 10: Full (821e54c9)
- 09: Full - Incremental (9f83b708)
- 08: Full - Incremental (e528eda8)
- 07: Full - Incremental (db08921e)
- 06: Full - Incremental (654678ce)
- 05: Full (e2c5ad1f)
- 04: Full - Incremental (e65a2585)
- 03: Full - Incremental (bd8c28b9)
- 02: Full - Incremental (7b3e38e7)
- 01: Full - Incremental (f8701085)
- 00: Full (e3c82e3e)
Thank you for reviewing @dholmes-ora!
@JesperIRL this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:
git checkout contribute
git fetch https://git.openjdk.org/guide.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push
⚠️ @JesperIRL This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).
Reworked the entire sponsoring section into a "Review and Sponsor"-section. Hopefully all concerns regarding the old text is addressed now. Hopefully the text is also intact after me trying to bring in changes from the master branch... It looks good as far as I can see.
Thank you @dholmes-ora for your review! Much appreciated. I have made changes based on your comments. The only comment I don't know how to handle is the one about comments in PR vs mailing lists. As you point out, all comments made in a PR will be sent to the mailing list as well, so saying that one is preferred and the other is not seems weird. Keeping design discussions in JBS has it's challenges. In general in this guide we tend to refer to the mailing lists for all such discussions. I need more input from others to get that paragraph right.
@JesperIRL This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!
@JesperIRL This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.
/open
I still intend to get these changes integrated in some form.
@JesperIRL This pull request is now open
@JesperIRL This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!
@JesperIRL This change now passes all automated pre-integration checks.
After integration, the commit message for the final commit will be:
Section on sponsoring
Reviewed-by: iris
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 13 new commits pushed to the master branch:
- dfc39a11b85ff7a4a65308d67237b3364e52b98c: Remove legacy section on mercurial
- 1e8d97817564b269ccc3493c17fc93600ab893f0: Various cleanups in the JBS section
- d45be2e795f518bb9b471f7fb671c9e7092c5d56: More details for Skara backports
- 1f992d8aabdc1b5de054125a610794db4965610f: Changes due to stabilization branches
- 3fe24972db19c982340912208e93c2dbe3f3f7a2: Changes around JBS resolution Delivered
- 02db5af4d8d61937aa844eacd471eda10d0b67cd: updated affects versions example image to be thinner
- e528248cab1f843cccdf68bb82e33e30f812b13b: clarify how to set the affects versions
- 6924d27f10685ea9b3083b2d882ad4bf12c9734c: Updated codeowners
- 61f93e4efb0d788c0c0e19767749e5cdec4fabb8: Clarifications and X-wnf label
- 0eebc913f3ba3d181faa7f5538d8f127d5e3e514: Minor bugfixes
- ... and 3 more: https://git.openjdk.org/guide/compare/84d736ee73405cb7e9d9281542f2d0c303228640...master
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.
➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.
/integrate
Going to push as commit 5c20ad68e962338b1219a1e07fd09f8f17afa3ec.
Since your change was applied there have been 13 commits pushed to the master branch:
- dfc39a11b85ff7a4a65308d67237b3364e52b98c: Remove legacy section on mercurial
- 1e8d97817564b269ccc3493c17fc93600ab893f0: Various cleanups in the JBS section
- d45be2e795f518bb9b471f7fb671c9e7092c5d56: More details for Skara backports
- 1f992d8aabdc1b5de054125a610794db4965610f: Changes due to stabilization branches
- 3fe24972db19c982340912208e93c2dbe3f3f7a2: Changes around JBS resolution Delivered
- 02db5af4d8d61937aa844eacd471eda10d0b67cd: updated affects versions example image to be thinner
- e528248cab1f843cccdf68bb82e33e30f812b13b: clarify how to set the affects versions
- 6924d27f10685ea9b3083b2d882ad4bf12c9734c: Updated codeowners
- 61f93e4efb0d788c0c0e19767749e5cdec4fabb8: Clarifications and X-wnf label
- 0eebc913f3ba3d181faa7f5538d8f127d5e3e514: Minor bugfixes
- ... and 3 more: https://git.openjdk.org/guide/compare/84d736ee73405cb7e9d9281542f2d0c303228640...master
Your commit was automatically rebased without conflicts.
@JesperIRL Pushed as commit 5c20ad68e962338b1219a1e07fd09f8f17afa3ec.
:bulb: You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.