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

8276573: Use blessed modifier order in jdk.javadoc #6239

Closed
wants to merge 1 commit into from

Conversation

pavelrappo
Copy link
Member

@pavelrappo pavelrappo commented Nov 3, 2021

This PR is to jdk.javadoc as JDK-8276348 (#6213) to java.base. This change was produced by running the below command:

$ sh ./bin/blessed-modifier-order.sh src/jdk.javadoc

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8276573: Use blessed modifier order in jdk.javadoc

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6239

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 3, 2021

👋 Welcome back prappo! 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.

@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 3, 2021
@openjdk
Copy link

openjdk bot commented Nov 3, 2021

@pavelrappo The following label will be automatically applied to this pull request:

  • javadoc

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the javadoc javadoc-dev@openjdk.org label Nov 3, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 3, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Nov 3, 2021

@pavelrappo 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:

8276573: Use blessed modifier order in jdk.javadoc

Reviewed-by: jjg

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 1 new commit pushed to the master branch:

  • 32895ac: 8275650: Problemlist java/io/File/createTempFile/SpecialTempFile.java for Windows 11

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 3, 2021
@pavelrappo
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 4, 2021

Going to push as commit b57715a.
Since your change was applied there have been 19 commits pushed to the master branch:

  • bf4ddf9: 8276338: Minor improve of wording for String.to(Lower|Upper)Case
  • afb502e: 8276550: Use SHA256 hash in build.tools.depend.Depend
  • 49b7b2e: 8276640: Use blessed modifier order in jfr code
  • 5acff75: 8276429: CodeHeapState::print_names() fails with "assert(klass->is_loader_alive()) failed: must be alive"
  • a6fa6ed: 8268779: ZGC: runtime/InternalApi/ThreadCpuTimesDeadlock.java#id1 failed with "OutOfMemoryError: Java heap space"
  • 19075b3: 8275788: Create code element with suitable attributes for code snippets
  • 7de653e: 8276301: G1: Refine implementation of G1CardSetFreePool::memory_sizes()
  • ee49963: 8275534: com.sun.net.httpserver.BasicAuthenticator should check whether "realm" is a quoted string
  • 3613ce7: 8275586: Zero: Simplify interpreter initialization
  • c62b347: 8276623: JDK-8275650 accidentally pushed "out" file
  • ... and 9 more: https://git.openjdk.java.net/jdk/compare/c7f070f5f17dad661cc3296f2e3cd7a1cd5fc742...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 4, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 4, 2021
@openjdk
Copy link

openjdk bot commented Nov 4, 2021

@pavelrappo Pushed as commit b57715a.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated javadoc javadoc-dev@openjdk.org
2 participants