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

JDK-8280835: jdk/javadoc/tool/CheckManPageOptions.java depends on source hierarchy #7240

Conversation

jonathan-gibbons
Copy link
Contributor

@jonathan-gibbons jonathan-gibbons commented Jan 27, 2022

Please review a small test update to have this test pass if the mainsrc/ directory cannot be found. (Yes, apparently that happens in some testing scenarios.)


Progress

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

Issue

  • JDK-8280835: jdk/javadoc/tool/CheckManPageOptions.java depends on source hierarchy

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7240

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 27, 2022

👋 Welcome back jjg! 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 Jan 27, 2022
@openjdk
Copy link

openjdk bot commented Jan 27, 2022

@jonathan-gibbons 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 Jan 27, 2022
@mlbridge
Copy link

mlbridge bot commented Jan 27, 2022

Webrevs

Copy link
Member

@hns hns left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@jonathan-gibbons jonathan-gibbons changed the title JDK-8279486: jdk/javadoc/tool/CheckManPageOptions.java depends on source hierarchy JDK-8280835: jdk/javadoc/tool/CheckManPageOptions.java depends on source hierarchy Jan 27, 2022
@openjdk
Copy link

openjdk bot commented Jan 27, 2022

@jonathan-gibbons 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:

8280835: jdk/javadoc/tool/CheckManPageOptions.java depends on source hierarchy

Reviewed-by: hannesw

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 9 new commits pushed to the master branch:

  • ece89c6: 8280366: (fs) Restore Files.createTempFile javadoc
  • b94ebaa: 8280686: Remove Compile::print_method_impl
  • a3a0dcd: 8280353: -XX:ArchiveClassesAtExit should print warning if base archive failed to load
  • cab5905: 8280583: Always build NMT
  • 7f68759: 8280719: G1: Remove outdated comment in RemoveSelfForwardPtrObjClosure::apply
  • 94380d0: 8278232: [macos] Wrong chars emitted when entering certain char-sequence of Indic language
  • 0dba170: 8278518: String(byte[], int, int, Charset) constructor and String.translateEscapes() miss bounds check elimination
  • 2ea0edf: 8279673: AudioClip.play doesn't work due to NullPointerException when creating DataPusher
  • 8908301: 8076089: Cleanup: Inline & remove sun.management.Util.newException

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 Jan 27, 2022
@jonathan-gibbons
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 27, 2022

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

  • ece89c6: 8280366: (fs) Restore Files.createTempFile javadoc
  • b94ebaa: 8280686: Remove Compile::print_method_impl
  • a3a0dcd: 8280353: -XX:ArchiveClassesAtExit should print warning if base archive failed to load
  • cab5905: 8280583: Always build NMT
  • 7f68759: 8280719: G1: Remove outdated comment in RemoveSelfForwardPtrObjClosure::apply
  • 94380d0: 8278232: [macos] Wrong chars emitted when entering certain char-sequence of Indic language
  • 0dba170: 8278518: String(byte[], int, int, Charset) constructor and String.translateEscapes() miss bounds check elimination
  • 2ea0edf: 8279673: AudioClip.play doesn't work due to NullPointerException when creating DataPusher
  • 8908301: 8076089: Cleanup: Inline & remove sun.management.Util.newException

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 27, 2022
@openjdk openjdk bot closed this Jan 27, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 27, 2022
@openjdk
Copy link

openjdk bot commented Jan 27, 2022

@jonathan-gibbons Pushed as commit 6d242e4.

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

@jonathan-gibbons jonathan-gibbons deleted the 8279486.CheckManPageOptions branch January 27, 2022 22:00
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
Development

Successfully merging this pull request may close these issues.

2 participants