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

7348: JMC preference options are duplicated #289

Closed
wants to merge 4 commits into from

Conversation

guruhb
Copy link
Contributor

@guruhb guruhb commented Jul 28, 2021

"General" , "Appearance" and "Keys" had duplicate entry . This was due to some in consistence "org.eclipse.ui.*" Components were used (one with older + latest version which is causing duplicate entry).

Solution : adding "resolution:=optional" resolves the duplicate entry. Restricted the Eclipse UI components to v3.2.0 and less than equal to 4.0.0.


Progress

  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JMC-7348: JMC preference options are duplicated

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 289

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 28, 2021

👋 Welcome back ghb! 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 Jul 28, 2021
@mlbridge
Copy link

mlbridge bot commented Jul 28, 2021

Webrevs

@@ -1,4 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
Copy link
Member

Choose a reason for hiding this comment

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

Comma after year.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed now.. Please re-check with latest commit

@guruhb
Copy link
Contributor Author

guruhb commented Jul 28, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Jul 28, 2021

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

7348: JMC preference options are duplicated

Reviewed-by: hirt

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:

  • bba7e41: 7349: JFR Parser struct types hashcode is not stable

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 Jul 28, 2021
@openjdk
Copy link

openjdk bot commented Jul 28, 2021

Going to push as commit 76f5a56.
Since your change was applied there has been 1 commit pushed to the master branch:

  • bba7e41: 7349: JFR Parser struct types hashcode is not stable

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 28, 2021

@guruhb Pushed as commit 76f5a56.

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

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

Successfully merging this pull request may close these issues.

2 participants