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-8274311: Make build.tools.jigsaw.GenGraphs more configurable #5690

Closed
wants to merge 1 commit into from

Conversation

mlchung
Copy link
Member

@mlchung mlchung commented Sep 24, 2021

GenGraphs tool generates the module graph. It currently supports the configuration via javadoc-graphs.properties. However, make/jdk/src/classes/build/tools/jigsaw/javadoc-graphs.properties only documents two properties. It should be updated to cover all configurable properties.

There are a couple other properties not configurable such as nodesep and node margin. This extends the configuration to allow to set additional properties.

This also fixes requiresMandatedColor in javadoc-graphs.properties to light gray to match the default configuration in the implementation, i.e. the color of the edge to java.base. It seems a bug that was unnoticed until Alex and Iris spotted it.


Progress

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

Issue

  • JDK-8274311: Make build.tools.jigsaw.GenGraphs more configurable

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5690

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 24, 2021

👋 Welcome back mchung! 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 label Sep 24, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 24, 2021

@mlchung The following labels will be automatically applied to this pull request:

  • build
  • core-libs

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

@openjdk openjdk bot added build core-libs labels Sep 24, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 24, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Sep 25, 2021

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

8274311: Make build.tools.jigsaw.GenGraphs more configurable

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

  • 5756385: 8274273: Update testing docs for MacOS with Non-US locale

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 label Sep 25, 2021
@mlchung
Copy link
Member Author

@mlchung mlchung commented Sep 27, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Sep 27, 2021

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

  • 2cffe4c: 8274326: [macos] Ensure initialisation of sun/lwawt/macosx/CAccessibility in JavaComponentAccessibility.m
  • 172900d: 8274255: Update javac messages to use "enum class" rather than "enum type"
  • b0983df: 8274074: SIGFPE with C2 compiled code with -XX:+StressGCM
  • 7436a77: 8274317: Unnecessary reentrant synchronized block in java.awt.Cursor
  • 7426fd4: 8274325: C4819 warning at vm_version_x86.cpp on Windows after JDK-8234160
  • e3aff8f: 8274289: jdk/jfr/api/consumer/TestRecordedFrameType.java failed with "RuntimeException: assertNotEquals: expected Interpreted to not equal Interpreted"
  • 252aaa9: 8274293: Build failure on macOS with Xcode 13.0 as vfork is deprecated
  • 7700b25: 8273401: Disable JarIndex support in URLClassPath
  • 5ec1cdc: 8274321: Standardize values of @SInCE tags in javax.lang.model
  • 4838a2c: 8274143: Disable "invalid entry for security.provider.X" error message in log file when security.provider.X is empty
  • ... and 4 more: https://git.openjdk.java.net/jdk/compare/61ac53f6e5a149c6ec68a8df43106e72bfd1ebb2...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 27, 2021
@openjdk openjdk bot added integrated and removed ready labels Sep 27, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 27, 2021

@mlchung Pushed as commit daaa47e.

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

@openjdk openjdk bot removed the rfr label Sep 27, 2021
@mlchung mlchung deleted the gengraphs branch Nov 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build core-libs integrated
3 participants