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 2010/09/02 12:57:43 UTC

svn commit: r991886 - /maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java

Author: bentmann
Date: Thu Sep  2 10:57:43 2010
New Revision: 991886

URL: http://svn.apache.org/viewvc?rev=991886&view=rev
Log:
o Tweaked stub class to make Guice from within Eclipse more happy

Modified:
    maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java

Modified: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java?rev=991886&r1=991885&r2=991886&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java (original)
+++ maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java Thu Sep  2 10:57:43 2010
@@ -22,13 +22,13 @@ package org.apache.maven.project;
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import org.codehaus.plexus.component.annotations.Component;
 import org.sonatype.aether.RepositorySystemSession;
 import org.sonatype.aether.artifact.Artifact;
 import org.sonatype.aether.impl.ArtifactResolver;
-import org.sonatype.aether.impl.internal.DefaultArtifactResolver;
 import org.sonatype.aether.resolution.ArtifactRequest;
 import org.sonatype.aether.resolution.ArtifactResolutionException;
 import org.sonatype.aether.resolution.ArtifactResult;
@@ -39,7 +39,7 @@ import org.sonatype.aether.transfer.Arti
  */
 @Component( role = ArtifactResolver.class, hint = "classpath" )
 public class ClasspathArtifactResolver
-    extends DefaultArtifactResolver
+    implements ArtifactResolver
 {
 
     public List<ArtifactResult> resolveArtifacts( RepositorySystemSession session,
@@ -60,8 +60,9 @@ public class ClasspathArtifactResolver
 
                 try
                 {
-                    artifact = artifact.setFile( ProjectClasspathTest.getFileForClasspathResource( ProjectClasspathTest.dir
-                        + "transitive-" + scope + "-dep.xml" ) );
+                    artifact =
+                        artifact.setFile( ProjectClasspathTest.getFileForClasspathResource( ProjectClasspathTest.dir
+                            + "transitive-" + scope + "-dep.xml" ) );
                     result.setArtifact( artifact );
                 }
                 catch ( FileNotFoundException e )
@@ -79,4 +80,10 @@ public class ClasspathArtifactResolver
         return results;
     }
 
+    public ArtifactResult resolveArtifact( RepositorySystemSession session, ArtifactRequest request )
+        throws ArtifactResolutionException
+    {
+        return resolveArtifacts( session, Collections.singleton( request ) ).get( 0 );
+    }
+
 }