mirror of https://github.com/apache/maven.git
o Restored compat with 2.x where the root is not resolved for ArtifactResolver.resolveTransitively()
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749968 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
fd7b2b7985
commit
5ad4dc1cc6
|
@ -308,7 +308,7 @@ public class DefaultArtifactResolver
|
|||
List<ConflictResolver> conflictResolvers )
|
||||
throws ArtifactResolutionException, ArtifactNotFoundException
|
||||
{
|
||||
ArtifactResolutionRequest request = new ArtifactResolutionRequest().setArtifact( originatingArtifact ).setArtifactDependencies( artifacts ).setManagedVersionMap( managedVersions )
|
||||
ArtifactResolutionRequest request = new ArtifactResolutionRequest().setArtifact( originatingArtifact ).setResolveRoot( false ).setArtifactDependencies( artifacts ).setManagedVersionMap( managedVersions )
|
||||
.setLocalRepository( localRepository ).setRemoteRepostories( remoteRepositories ).setMetadataSource( source ).setFilter( filter ).setListeners( listeners );
|
||||
|
||||
return resolveWithExceptions( request );
|
||||
|
@ -388,7 +388,7 @@ public class DefaultArtifactResolver
|
|||
// file reference. But this may be a Maven Plugin that we need to resolve from a remote repository
|
||||
// as well as its dependencies.
|
||||
|
||||
if ( rootArtifact.getFile() == null )
|
||||
if ( request.isResolveRoot() && rootArtifact.getFile() == null )
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue