svn commit: r812914 - in /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven: DefaultProjectDependenciesResolver.java lifecycle/DefaultLifecycleExecutor.java

[bentmann]

Author: bentmann
Date: Wed Sep  9 12:08:26 2009
New Revision: 812914

URL: http://svn.apache.org/viewvc?rev=812914&view=rev
Log:
[MNG-4348] [regression] Unnecessary remote repo access for POMs while execution 
plugin that does not require dependency resolution

Modified:
    
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
    
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java?rev=812914&r1=812913&r2=812914&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
 Wed Sep  9 12:08:26 2009
@@ -84,6 +84,12 @@
             return resolved;
         }
 
+        if ( ( scopesToCollect == null || scopesToCollect.isEmpty() )
+            && ( scopesToResolve == null || scopesToResolve.isEmpty() ) )
+        {
+            return resolved;
+        }
+
         /*
         
         Logic for transitve global exclusions

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=812914&r1=812913&r2=812914&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
 Wed Sep  9 12:08:26 2009
@@ -181,6 +181,8 @@
     {
         logger.debug( "=== PROJECT BUILD PLAN 
================================================" );
         logger.debug( "Project:       " + getKey( currentProject ) );
+        logger.debug( "Dependencies (collect): " + 
executionPlan.getRequiredCollectionScopes() );
+        logger.debug( "Dependencies (resolve): " + 
executionPlan.getRequiredResolutionScopes() );
 
         for ( MojoExecution mojoExecution : executionPlan.getExecutions() )
         {