You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2014/02/27 06:35:59 UTC

svn commit: r1572447 - /incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java

Author: brett
Date: Thu Feb 27 06:35:59 2014
New Revision: 1572447

URL: http://svn.apache.org/r1572447
Log:
Use the resolved artifacts for references

For some reason, the resolver is not including all of the artifacts in
project.getDependencyArtifacts. This might need some revision, but here we
can quite clearly obtain the right set and pass it on to the call that
requires it.

Modified:
    incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java

Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java?rev=1572447&r1=1572446&r2=1572447&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java (original)
+++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java Thu Feb 27 06:35:59 2014
@@ -21,6 +21,7 @@ package NPanday.Plugin.Msbuild;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -199,9 +200,10 @@ public class MsbuildMojo
     public boolean preExecute()
         throws MojoExecutionException, MojoFailureException
     {
+        Collection<Artifact> requiredArtifacts;
         try
         {
-            dependencyResolution.require( project, LocalRepositoryUtil.create( localRepository ), "test" );
+            requiredArtifacts = dependencyResolution.require( project, LocalRepositoryUtil.create( localRepository ), "test" );
         }
         catch ( ArtifactResolutionException e )
         {
@@ -219,7 +221,7 @@ public class MsbuildMojo
             }
             getLog().info( "projects = " + projects.keySet() );
 
-            for ( Object artifact : project.getDependencyArtifacts() )
+            for ( Object artifact : requiredArtifacts )
             {
                 Artifact a = (Artifact) artifact;