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

[MNG-4679] [regression] command line option "-update-snapshots" does not work for dependency:copy-dependencies 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@945715 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-05-18 15:49:14 +00:00
parent bdecdcf64a
commit 40028e7a18
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,28 +135,25 @@ protected void finalize()
}
}
private void injectSession( RepositoryRequest request )
private void injectSession1( RepositoryRequest request, MavenSession session )
{
MavenSession session = legacySupport.getSession();
if ( session != null )
{
request.setOffline( session.isOffline() );
request.setForceUpdate( session.getRequest().isUpdateSnapshots() );
request.setTransferListener( session.getRequest().getTransferListener() );
}
}
private void injectSession( ArtifactResolutionRequest request )
private void injectSession2( ArtifactResolutionRequest request, MavenSession session )
{
MavenSession session = legacySupport.getSession();
injectSession1( request, session );
if ( session != null )
{
request.setOffline( session.isOffline() );
request.setServers( session.getRequest().getServers() );
request.setMirrors( session.getRequest().getMirrors() );
request.setProxies( session.getRequest().getProxies() );
request.setTransferListener( session.getRequest().getTransferListener() );
}
}
@ -164,7 +161,7 @@ public void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositor
throws ArtifactResolutionException, ArtifactNotFoundException
{
RepositoryRequest request = new DefaultRepositoryRequest();
injectSession( request );
injectSession1( request, legacySupport.getSession() );
request.setLocalRepository( localRepository );
request.setRemoteRepositories( remoteRepositories );
resolve( artifact, request, resolutionListener, false );
@ -174,7 +171,7 @@ public void resolveAlways( Artifact artifact, List<ArtifactRepository> remoteRep
throws ArtifactResolutionException, ArtifactNotFoundException
{
RepositoryRequest request = new DefaultRepositoryRequest();
injectSession( request );
injectSession1( request, legacySupport.getSession() );
request.setLocalRepository( localRepository );
request.setRemoteRepositories( remoteRepositories );
resolve( artifact, request, null, true );
@ -435,7 +432,7 @@ public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Ar
.setCollectionFilter( filter )
.setListeners( listeners );
injectSession( request );
injectSession2( request, legacySupport.getSession() );
return resolveWithExceptions( request );
}

1
maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
View File

@ -79,6 +79,7 @@ private void injectSession( ArtifactResolutionRequest request )
if ( session != null )
{
request.setOffline( session.isOffline() );
request.setForceUpdate( session.getRequest().isUpdateSnapshots() );
request.setServers( session.getRequest().getServers() );
request.setMirrors( session.getRequest().getMirrors() );
request.setProxies( session.getRequest().getProxies() );