You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/05/13 15:22:39 UTC
svn commit: r774348 -
/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Author: jvanzyl
Date: Wed May 13 13:22:39 2009
New Revision: 774348
URL: http://svn.apache.org/viewvc?rev=774348&view=rev
Log:
o formatting
Modified:
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=774348&r1=774347&r2=774348&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Wed May 13 13:22:39 2009
@@ -324,8 +324,16 @@
List<ConflictResolver> conflictResolvers )
throws ArtifactResolutionException, ArtifactNotFoundException
{
- ArtifactResolutionRequest request = new ArtifactResolutionRequest().setArtifact( originatingArtifact ).setManagedVersionMap( managedVersions )
- .setLocalRepository( localRepository ).setRemoteRepostories( remoteRepositories ).setMetadataSource( source ).setFilter( filter ).setListeners( listeners );
+ ArtifactResolutionRequest request = new ArtifactResolutionRequest()
+ .setArtifact( originatingArtifact )
+ // This is required by the surefire plugin
+ .setArtifactDependencies( artifacts )
+ .setManagedVersionMap( managedVersions )
+ .setLocalRepository( localRepository )
+ .setRemoteRepostories( remoteRepositories )
+ .setMetadataSource( source )
+ .setFilter( filter )
+ .setListeners( listeners );
return resolveWithExceptions( request );
}
@@ -507,7 +515,7 @@
// Add the root artifact
result.addArtifact( rootArtifact );
}
-
+
return result;
}