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

MNG-4628 ReactorArtifactRepository is not setup soon enough for AbstractMavenLifecycleParticipant#afterProjectsRead 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@931641 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Igor Fedorenko 2010-04-07 18:58:53 +00:00
parent 1f9e91da55
commit fba6edc9ae
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
maven-core/src/main/java/org/apache/maven/DefaultMaven.java
View File

@ -181,6 +181,23 @@ private MavenExecutionResult doExecute( MavenExecutionRequest request )
result.setProject( session.getTopLevelProject() );
try
{
Map<String, MavenProject> projectMap;
projectMap = getProjectMap( session.getProjects() );
// Desired order of precedence for local artifact repositories
//
// Reactor
// Workspace
// User Local Repository
delegatingLocalArtifactRepository.setBuildReactor( new ReactorArtifactRepository( projectMap, session ) );
}
catch ( org.apache.maven.DuplicateProjectException e )
{
return processResult( result, e );
}
ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
try
{
@ -200,11 +217,8 @@ private MavenExecutionResult doExecute( MavenExecutionRequest request )
Thread.currentThread().setContextClassLoader( originalClassLoader );
}
Map<String, MavenProject> projectMap;
try
{
projectMap = getProjectMap( session.getProjects() );
ProjectSorter projectSorter = new ProjectSorter( session.getProjects() );
ProjectDependencyGraph projectDependencyGraph = createDependencyGraph( projectSorter, request );
@ -231,13 +245,6 @@ private MavenExecutionResult doExecute( MavenExecutionRequest request )
}
result.setTopologicallySortedProjects( session.getProjects() );
// Desired order of precedence for local artifact repositories
//
// Reactor
// Workspace
// User Local Repository
delegatingLocalArtifactRepository.setBuildReactor( new ReactorArtifactRepository( projectMap, session ) );
if ( result.hasExceptions() )
{