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

8263445: Duplicate key compiler.err.expected.module in compiler.properties #4186

Closed
wants to merge 1 commit into from

Conversation

@asotona
Copy link
Member

@asotona asotona commented May 25, 2021

src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties contains duplicate key:
compiler.err.expected.module

This fix removes the first occurrence of the key to remove the duplicity and keep the actual content of the property.


Progress

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

Issue

  • JDK-8263445: Duplicate key compiler.err.expected.module in compiler.properties

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4186

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 25, 2021

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

Loading

@openjdk openjdk bot added the rfr label May 25, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 25, 2021

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

  • compiler

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.

Loading

@openjdk openjdk bot added the compiler label May 25, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 25, 2021

Webrevs

Loading

Copy link
Contributor

@vicente-romero-oracle vicente-romero-oracle left a comment

looks good

Loading

@openjdk
Copy link

@openjdk openjdk bot commented May 25, 2021

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

8263445: Duplicate key compiler.err.expected.module in compiler.properties

Reviewed-by: vromero, jlahoda

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:

  • 5a5b807: 8267633: Clarify documentation of (Doc)TreeScanner

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.

Loading

@openjdk openjdk bot added the ready label May 25, 2021
Copy link
Contributor

@lahodaj lahodaj left a comment

LGTM.

Loading

@asotona
Copy link
Member Author

@asotona asotona commented May 25, 2021

/integrate

Loading

@openjdk openjdk bot closed this May 25, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels May 25, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 25, 2021

@asotona Since your change was applied there have been 2 commits pushed to the master branch:

  • cc687fd: 8267575: Add new documentation group in HtmlStyle
  • 5a5b807: 8267633: Clarify documentation of (Doc)TreeScanner

Your commit was automatically rebased without conflicts.

Pushed as commit 2ef2450.

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

Loading

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants