Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o formatting 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774348 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-05-13 13:22:39 +00:00
parent 26e3763a58
commit 861244fe51
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
View File

@ -324,8 +324,16 @@ public class DefaultArtifactResolver
List<ConflictResolver> conflictResolvers ) List<ConflictResolver> conflictResolvers )
throws ArtifactResolutionException, ArtifactNotFoundException throws ArtifactResolutionException, ArtifactNotFoundException
{ {
ArtifactResolutionRequest request = new ArtifactResolutionRequest().setArtifact( originatingArtifact ).setManagedVersionMap( managedVersions ) ArtifactResolutionRequest request = new ArtifactResolutionRequest()
.setLocalRepository( localRepository ).setRemoteRepostories( remoteRepositories ).setMetadataSource( source ).setFilter( filter ).setListeners( listeners ); .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 ); return resolveWithExceptions( request );
} }
@ -507,7 +515,7 @@ public class DefaultArtifactResolver
// Add the root artifact // Add the root artifact
result.addArtifact( rootArtifact ); result.addArtifact( rootArtifact );
} }
return result; return result;
} }