svn commit: r1573444 - /incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/NPandayDependencyResolution.java

[br...@apache.org]

Author: brett
Date: Mon Mar  3 04:52:57 2014
New Revision: 1573444

URL: http://svn.apache.org/r1573444
Log:
[NPANDAY-231] use Maven API for resolving

The maven-project API in 2.x did some magic to populate the artifacts,
such as setting up files for system dependencies. To ensure those all
continue to work, use the existing Maven 2.x API to populate the artifacts
rather than creating them by hand.

Modified:
    incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/NPandayDependencyResolution.java

Modified: incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/NPandayDependencyResolution.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/NPandayDependencyResolution.java?rev=1573444&r1=1573443&r2=1573444&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/NPandayDependencyResolution.java (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/java/npanday/resolver/NPandayDependencyResolution.java Mon Mar  3 04:52:57 2014
@@ -21,23 +21,17 @@ package npanday.resolver;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Sets;
-import npanday.LocalRepositoryUtil;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
 import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 
 import java.util.Set;
@@ -119,7 +113,7 @@ public class NPandayDependencyResolution
         {
             throw new ArtifactResolutionException( "NPANDAY-148-002: Could not resolve project dependencies", project.getArtifact(), e  );
         }
-        catch ( InvalidVersionSpecificationException e )
+        catch ( InvalidDependencyVersionException e )
         {
             throw new ArtifactResolutionException( "NPANDAY-148-003: Could not resolve project dependencies", project.getArtifact(), e  );
         }
@@ -145,22 +139,11 @@ public class NPandayDependencyResolution
         
     }
 
-    private void createArtifactsForMaven2BackCompat( MavenProject project ) throws InvalidVersionSpecificationException
-    {
+    private void createArtifactsForMaven2BackCompat( MavenProject project ) throws InvalidDependencyVersionException {
         if (getLogger().isDebugEnabled()) {
             getLogger().debug( "NPANDAY-148-008: creating dependency collection for maven 2 projects" );
         }
 
-        project.setDependencyArtifacts( Sets.newHashSet() );
-        for ( Object o : project.getDependencies() )
-        {
-            Dependency d = (Dependency) o;
-            project.getDependencyArtifacts().add(
-                artifactFactory.createDependencyArtifact(
-                    d.getGroupId(), d.getArtifactId(), VersionRange.createFromVersionSpec( d.getVersion() ),
-                    d.getType(), d.getClassifier(), d.getScope()
-                )
-            );
-        }
+        project.setDependencyArtifacts( project.createArtifacts( artifactFactory, null, null ) );
     }
 }