Author: jvanzyl Date: Mon May 11 20:59:54 2009 New Revision: 773694 URL: http://svn.apache.org/viewvc?rev=773694&view=rev Log: o put the workspace respository impl in earlier so poms can be resolved from the workspace.
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=773694&r1=773693&r2=773694&view=diff ============================================================================== --- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original) +++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Mon May 11 20:59:54 2009 @@ -90,6 +90,12 @@ DelegatingLocalArtifactRepository delegatingLocalArtifactRepository = new DelegatingLocalArtifactRepository(); delegatingLocalArtifactRepository.addToEndOfSearchOrder( new UserLocalArtifactRepository( request.getLocalRepository() ) ); + + if ( localArtifactRepositories != null && localArtifactRepositories.size() > 0 ) + { + delegatingLocalArtifactRepository.addToBeginningOfSearchOrder( localArtifactRepositories.get( 0 ) ); + } + request.setLocalRepository( delegatingLocalArtifactRepository ); MavenSession session; @@ -141,12 +147,7 @@ // Reactor // Workspace // User Local Repository - - if ( localArtifactRepositories != null && localArtifactRepositories.size() > 0 ) - { - delegatingLocalArtifactRepository.addToBeginningOfSearchOrder( localArtifactRepositories.get( 0 ) ); - } - + delegatingLocalArtifactRepository.addToBeginningOfSearchOrder( new ReactorArtifactRepository( projects ) ); if ( result.hasExceptions() )