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

[MNG-4561] [regression] network settings are not applied to repositories from plugin dependencies 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@909830 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-02-13 14:27:02 +00:00
parent a1438752da
commit fd5683b936
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
View File

@ -38,7 +38,6 @@ import java.util.zip.ZipEntry;
import org.apache.maven.ArtifactFilterManager;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
@ -339,12 +338,15 @@ public class DefaultMavenPluginManager
MavenProject project = session.getCurrentProject();
RepositoryRequest request = new DefaultRepositoryRequest();
ArtifactResolutionRequest request = new ArtifactResolutionRequest();
request.setLocalRepository( session.getLocalRepository() );
request.setRemoteRepositories( project.getPluginArtifactRepositories() );
request.setCache( session.getRepositoryCache() );
request.setOffline( session.isOffline() );
request.setForceUpdate( session.getRequest().isUpdateSnapshots() );
request.setServers( session.getRequest().getServers() );
request.setMirrors( session.getRequest().getMirrors() );
request.setProxies( session.getRequest().getProxies() );
request.setTransferListener( session.getRequest().getTransferListener() );
ArtifactFilter dependencyFilter = project.getExtensionArtifactFilter();
@ -403,7 +405,7 @@ public class DefaultMavenPluginManager
*/
// FIXME: only exposed to allow workaround for MNG-4194
protected List<Artifact> resolvePluginArtifacts( Plugin plugin, Artifact pluginArtifact,
RepositoryRequest repositoryRequest,
ArtifactResolutionRequest request,
ArtifactFilter dependencyFilter )
throws PluginResolutionException
{
@ -435,7 +437,6 @@ public class DefaultMavenPluginManager
resolutionFilter = new AndArtifactFilter( Arrays.asList( resolutionFilter, dependencyFilter ) );
}
ArtifactResolutionRequest request = new ArtifactResolutionRequest( repositoryRequest );
request.setArtifact( pluginArtifact );
request.setArtifactDependencies( overrideArtifacts );
request.setCollectionFilter( collectionFilter );
@ -455,7 +456,7 @@ public class DefaultMavenPluginManager
List<Artifact> pluginArtifacts = new ArrayList<Artifact>( result.getArtifacts() );
addPlexusUtils( pluginArtifacts, plugin, repositoryRequest );
addPlexusUtils( pluginArtifacts, plugin, request );
return pluginArtifacts;
}