You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/08/31 21:41:30 UTC
svn commit: r690771 -
/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
Author: bentmann
Date: Sun Aug 31 12:41:29 2008
New Revision: 690771
URL: http://svn.apache.org/viewvc?rev=690771&view=rev
Log:
o Refactored code
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java?rev=690771&r1=690770&r2=690771&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java Sun Aug 31 12:41:29 2008
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
@@ -299,21 +300,30 @@
ArtifactRepository testRepository )
throws MojoExecutionException
{
+ // index available reactor projects
Map projects = new HashMap();
for ( Iterator it = reactorProjects.iterator(); it.hasNext(); )
{
MavenProject reactorProject = (MavenProject) it.next();
- projects.put( reactorProject.getId(), reactorProject );
+ String id = reactorProject.getGroupId() + ':' + reactorProject.getArtifactId();
+ projects.put( id, reactorProject );
}
+ // collect transitive dependencies
+ Collection dependencies = new HashSet();
+ for ( Iterator it = mvnProject.getArtifacts().iterator(); it.hasNext(); )
+ {
+ Artifact artifact = (Artifact) it.next();
+ String id = artifact.getGroupId() + ':' + artifact.getArtifactId();
+ dependencies.add( id );
+ }
+
+ // install dependencies available in reactor
try
{
- for ( Iterator it = mvnProject.getArtifacts().iterator(); it.hasNext(); )
+ for ( Iterator it = dependencies.iterator(); it.hasNext(); )
{
- Artifact artifact = (Artifact) it.next();
- String id =
- artifact.getGroupId() + ':' + artifact.getArtifactId() + ':' + artifact.getType() + ':'
- + artifact.getVersion();
+ String id = (String) it.next();
MavenProject requiredProject = (MavenProject) projects.remove( id );
if ( requiredProject != null )
{