Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 21615 invoked from network); 18 May 2010 15:49:36 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 18 May 2010 15:49:36 -0000 Received: (qmail 16129 invoked by uid 500); 18 May 2010 15:49:36 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 16060 invoked by uid 500); 18 May 2010 15:49:36 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 16053 invoked by uid 99); 18 May 2010 15:49:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 May 2010 15:49:36 +0000 X-ASF-Spam-Status: No, hits=-1389.1 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 May 2010 15:49:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E8EE3238890A; Tue, 18 May 2010 15:49:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r945715 - in /maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven: artifact/resolver/DefaultArtifactResolver.java repository/legacy/resolver/DefaultLegacyArtifactCollector.java Date: Tue, 18 May 2010 15:49:14 -0000 To: commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100518154914.E8EE3238890A@eris.apache.org> Author: bentmann Date: Tue May 18 15:49:14 2010 New Revision: 945715 URL: http://svn.apache.org/viewvc?rev=945715&view=rev Log: [MNG-4679] [regression] command line option "-update-snapshots" does not work for dependency:copy-dependencies Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=945715&r1=945714&r2=945715&view=diff ============================================================================== --- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original) +++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Tue May 18 15:49:14 2010 @@ -135,28 +135,25 @@ public class DefaultArtifactResolver } } - 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 class DefaultArtifactResolver 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 class DefaultArtifactResolver 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 class DefaultArtifactResolver .setCollectionFilter( filter ) .setListeners( listeners ); - injectSession( request ); + injectSession2( request, legacySupport.getSession() ); return resolveWithExceptions( request ); } Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java?rev=945715&r1=945714&r2=945715&view=diff ============================================================================== --- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java (original) +++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java Tue May 18 15:49:14 2010 @@ -79,6 +79,7 @@ public class DefaultLegacyArtifactCollec 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() );