Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Bricon2019-05-28 16:50:54 +0000
committerFred Bricon2019-05-28 16:50:54 +0000
commit81fb0bf89fd97c1df247a78de88dff716aac32ec (patch)
tree74654e32967afdbcc20ec87eb9b162775a7db8d1 /org.eclipse.m2e.editor
parent1b8ff2daeb2f78d32cabc068efad772a705fd350 (diff)
downloadm2e-core-81fb0bf89fd97c1df247a78de88dff716aac32ec.tar.gz
m2e-core-81fb0bf89fd97c1df247a78de88dff716aac32ec.tar.xz
m2e-core-81fb0bf89fd97c1df247a78de88dff716aac32ec.zip
Bug 501493 : Fixed unnecessary version conflict label
Change-Id: I433320fcf3fb1688f2a5072f1e2ca199e385505e Signed-off-by: Fred Bricon <fbricon@gmail.com>
Diffstat (limited to 'org.eclipse.m2e.editor')
-rw-r--r--org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java
index 5b1fa25c..02196de3 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/DependencyTreePage.java
@@ -833,17 +833,21 @@ public class DependencyTreePage extends FormPage implements IMavenProjectChanged
label.append(a.getArtifactId()).append(" : ");
- label.append(a.getBaseVersion());
+ String nodeVersion = a.getBaseVersion();
+ label.append(nodeVersion);
String premanagedVersion = DependencyManagerUtils.getPremanagedVersion(node);
- if(premanagedVersion != null && !premanagedVersion.equals(a.getBaseVersion())) {
+ if(premanagedVersion != null && !premanagedVersion.equals(nodeVersion)) {
label.append(" (managed from ").append(premanagedVersion).append(")");
}
DependencyNode winner = (DependencyNode) node.getData().get(ConflictResolver.NODE_DATA_WINNER);
if(winner != null) {
- label.append(" (omitted for conflict with ").append(winner.getArtifact().getVersion()).append(")");
+ String winnerVersion = winner.getArtifact().getVersion();
+ if(!nodeVersion.equals(winnerVersion)) {
+ label.append(" (omitted for conflict with ").append(winnerVersion).append(")");
+ }
}
if(a.getClassifier().length() > 0) {

Back to the top