Prefer conflict-resolved maven dependencies

hinerm · hinerm · commit 37508f4749a9 · 2014-12-16T10:52:41.000-06:00
The AbstractResolveDependencies class, when building a list of Maven
dependencies to check, will now use the "getRelatedArtifact" method if
it is available. This will return the coalesced version of an artifact
when there is a conflict between dependencies with the same groupId and
artifactId, but different versions.

This fixes the BanDuplicateClasses to no longer detect conflicts between
multiple versions of the same GA combination.
diff --git a/src/main/java/org/scijava/maven/plugin/enforcer/AbstractResolveDependencies.java b/src/main/java/org/scijava/maven/plugin/enforcer/AbstractResolveDependencies.java
@@ -119,7 +119,7 @@ else if ( node.getChildren() != null )
                 dependencies = new HashSet<Artifact>();
                 for( DependencyNode depNode : node.getChildren() )
                 {
-                    dependencies.add( depNode.getArtifact() );
+                    dependencies.add( getResolvedArtifact(depNode) );
                 }
             }
         }
@@ -141,7 +141,7 @@ private Set<Artifact> getAllDescendants( DependencyNode node )
             {
                 try
                 {
-                    Artifact artifact = depNode.getArtifact();
+                    Artifact artifact = getResolvedArtifact(depNode);
     
                     resolver.resolve( artifact, remoteRepositories, localRepository );
                     
@@ -167,6 +167,12 @@ private Set<Artifact> getAllDescendants( DependencyNode node )
         return children;
     }
 
+    private Artifact getResolvedArtifact(DependencyNode depNode) {
+      // Use the getRelatedArtifact if there was a resolved conflict.
+      return depNode.getRelatedArtifact() == null ? 
+        depNode.getArtifact() : depNode.getRelatedArtifact();
+    }
+
     protected Log getLog()
     {
         return helper.getLog();

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ else if ( node.getChildren() != null )`
`119`	`119`	`dependencies = new HashSet<Artifact>();`
`120`	`120`	`for( DependencyNode depNode : node.getChildren() )`
`121`	`121`	`{`
`122`		`- dependencies.add( depNode.getArtifact() );`
	`122`	`+ dependencies.add( getResolvedArtifact(depNode) );`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`	`}`
`@@ -141,7 +141,7 @@ private Set<Artifact> getAllDescendants( DependencyNode node )`
`141`	`141`	`{`
`142`	`142`	`try`
`143`	`143`	`{`
`144`		`- Artifact artifact = depNode.getArtifact();`
	`144`	`+ Artifact artifact = getResolvedArtifact(depNode);`
`145`	`145`
`146`	`146`	`resolver.resolve( artifact, remoteRepositories, localRepository );`
`147`	`147`
`@@ -167,6 +167,12 @@ private Set<Artifact> getAllDescendants( DependencyNode node )`
`167`	`167`	`return children;`
`168`	`168`	`}`
`169`	`169`
	`170`	`+ private Artifact getResolvedArtifact(DependencyNode depNode) {`
	`171`	`+ // Use the getRelatedArtifact if there was a resolved conflict.`
	`172`	`+ return depNode.getRelatedArtifact() == null ?`
	`173`	`+ depNode.getArtifact() : depNode.getRelatedArtifact();`
	`174`	`+ }`
	`175`	`+`
`170`	`176`	`protected Log getLog()`
`171`	`177`	`{`
`172`	`178`	`return helper.getLog();`