JDK-8255032: Conflict between recent pushes breaks the build

[jonathan-gibbons]

The patch resolves a bad merge between two recent changes.

The DocletEnvironment docEnv parameter no longer needs to be passed around.

---

Progress

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

Testing

	Linux x64	Windows x64	macOS x64
Build	⏳ (2/5 running)	⏳ (2/2 running)	⏳ (2/2 running)

Issue

• JDK-8255032: Conflict between recent pushes breaks the build

Reviewers

• Claes Redestad (@cl4es - Reviewer)
• Vicente Romero (@vicente-romero-oracle - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jdk pull/752/head:pull/752
$ git checkout pull/752

[bridgekeeper]

👋 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]

@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.

[mlbridge]

Webrevs

• 00: Full (0e89d55)

[vicente-romero-oracle]

looks good

[jonathan-gibbons]

/integrate

[openjdk]

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

8255032: Conflict between recent pushes breaks the build

Reviewed-by: redestad, vromero

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 master 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 master branch, type /integrate in a new comment.

[openjdk]

@jonathan-gibbons Pushed as commit 0f4fb36.

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