Solve problem when artifact has version range
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@568258 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java b/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java
index 169c9d2..6442d96 100644
--- a/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java
+++ b/src/main/java/org/apache/maven/shared/dependency/tree/DependencyNode.java
@@ -552,7 +552,20 @@
this.relatedArtifact = relatedArtifact;
- boolean duplicate = getArtifact().getVersion().equals( relatedArtifact.getVersion() );
+ boolean duplicate = false;
+ if ( getArtifact().getVersion() != null )
+ {
+ duplicate = getArtifact().getVersion().equals( relatedArtifact.getVersion() );
+ }
+ else if ( getArtifact().getVersionRange() != null )
+ {
+ duplicate = getArtifact().getVersionRange().equals( relatedArtifact.getVersionRange() );
+ }
+ else
+ {
+ throw new RuntimeException( "Artifact version and version range is null: " + getArtifact() );
+ }
+
state = duplicate ? OMITTED_FOR_DUPLICATE : OMITTED_FOR_CONFLICT;
removeAllChildren();