Merge master

[openjdk-bot]

Hi all,

this is an automatically generated pull request to notify you that there are 152 commits from the branch masterthat can not be merged into the branch concise-method-declarations:

The following file contains merge conflicts:

• src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java

All Committers in this project have access to my personal fork and can therefore help resolve these merge conflicts (you may want to coordinate who should do this).
The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request.
The below commands should be run in a local clone of your personal fork of the openjdk/amber repository.

# Ensure target branch is up to date
$ git checkout concise-method-declarations
$ git pull https://github.com/openjdk/amber concise-method-declarations

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber +53:openjdk-bot-53
$ git checkout openjdk-bot-53

# Merge the target branch
$ git merge concise-method-declarations

When you have resolved the conflicts resulting from the git merge command above, run the following commands to create a merge commit:

$ git add paths/to/files/with/conflicts
$ git commit -m 'Merge master'

When you have created the merge commit, run the following command to push the merge commit to this pull request:

$ git push https://github.com/openjdk-bot/amber openjdk-bot-53:53

Note: if you are using SSH to push commits to GitHub, then change the URL in the above git push command accordingly.

Thanks,
J. Duke

---

Progress

• Change must not contain extraneous whitespace

Error

 ⚠️ A merge PR must contain at least one commit that is not already present in the target.

Download

$ git fetch https://git.openjdk.java.net/amber pull/31/head:pull/31
$ git checkout pull/31

[bridgekeeper]

👋 Welcome back duke! A progress list of the required criteria for merging this PR into concise-method-declarations will be added to the body of your pull request.

[mlbridge]

Webrevs

• 01: Full - Incremental (0a463e9)
• 00: Merge conflicts (concise-method-declarations) (6341f8c)

[openjdk]

@openjdk-bot This change is no longer ready for integration - check the PR body for details.

[vicente-romero-oracle]

/integrate