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

[MNG-4960] [regression] Make-like reactor mode does not build selected project when resuming from one of its prerequisites 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1056770 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2011-01-08 19:18:43 +00:00
parent e45d82e196
commit 7de8eaac48
1 changed files with 66 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -694,48 +694,59 @@ public class DefaultMaven
{
ProjectDependencyGraph graph = new DefaultProjectDependencyGraph( sorter );
Collection<MavenProject> activeProjects = sorter.getSortedProjects();
List<MavenProject> activeProjects = sorter.getSortedProjects();
File reactorDirectory;
activeProjects = trimSelectedProjects( activeProjects, graph, request );
activeProjects = trimResumedProjects( activeProjects, request );
if ( activeProjects.size() != sorter.getSortedProjects().size() )
{
graph = new FilteredProjectDependencyGraph( graph, activeProjects );
}
return graph;
}
private List<MavenProject> trimSelectedProjects( List<MavenProject> projects, ProjectDependencyGraph graph,
MavenExecutionRequest request )
throws MavenExecutionException
{
List<MavenProject> result = projects;
if ( !request.getSelectedProjects().isEmpty() )
{
File reactorDirectory = null;
if ( request.getBaseDirectory() != null )
{
reactorDirectory = new File( request.getBaseDirectory() );
}
else
{
reactorDirectory = null;
}
if ( !request.getSelectedProjects().isEmpty() )
{
List<MavenProject> selectedProjects = new ArrayList<MavenProject>( request.getSelectedProjects().size() );
Collection<MavenProject> selectedProjects = new LinkedHashSet<MavenProject>( projects.size() );
for ( String selectedProject : request.getSelectedProjects() )
for ( String selector : request.getSelectedProjects() )
{
MavenProject project = null;
MavenProject selectedProject = null;
for ( MavenProject activeProject : activeProjects )
for ( MavenProject project : projects )
{
if ( isMatchingProject( activeProject, selectedProject, reactorDirectory ) )
if ( isMatchingProject( project, selector, reactorDirectory ) )
{
project = activeProject;
selectedProject = project;
break;
}
}
if ( project != null )
if ( selectedProject != null )
{
selectedProjects.add( project );
selectedProjects.add( selectedProject );
}
else
{
throw new MavenExecutionException( "Could not find the selected project in the reactor: "
+ selectedProject, request.getPom() );
+ selector, request.getPom() );
}
}
activeProjects = selectedProjects;
boolean makeUpstream = false;
boolean makeDownstream = false;
@ -760,58 +771,73 @@ public class DefaultMaven
if ( makeUpstream || makeDownstream )
{
activeProjects = new LinkedHashSet<MavenProject>( selectedProjects );
for ( MavenProject selectedProject : selectedProjects )
for ( MavenProject selectedProject : new ArrayList<MavenProject>( selectedProjects ) )
{
if ( makeUpstream )
{
activeProjects.addAll( graph.getUpstreamProjects( selectedProject, true ) );
selectedProjects.addAll( graph.getUpstreamProjects( selectedProject, true ) );
}
if ( makeDownstream )
{
activeProjects.addAll( graph.getDownstreamProjects( selectedProject, true ) );
selectedProjects.addAll( graph.getDownstreamProjects( selectedProject, true ) );
}
}
}
result = new ArrayList<MavenProject>( selectedProjects.size() );
for ( MavenProject project : projects )
{
if ( selectedProjects.contains( project ) )
{
result.add( project );
}
}
}
return result;
}
private List<MavenProject> trimResumedProjects( List<MavenProject> projects, MavenExecutionRequest request )
throws MavenExecutionException
{
List<MavenProject> result = projects;
if ( StringUtils.isNotEmpty( request.getResumeFrom() ) )
{
String selectedProject = request.getResumeFrom();
File reactorDirectory = null;
if ( request.getBaseDirectory() != null )
{
reactorDirectory = new File( request.getBaseDirectory() );
}
List<MavenProject> projects = new ArrayList<MavenProject>( activeProjects.size() );
String selector = request.getResumeFrom();
result = new ArrayList<MavenProject>( projects.size() );
boolean resumed = false;
for ( MavenProject project : activeProjects )
for ( MavenProject project : projects )
{
if ( !resumed && isMatchingProject( project, selectedProject, reactorDirectory ) )
if ( !resumed && isMatchingProject( project, selector, reactorDirectory ) )
{
resumed = true;
}
if ( resumed )
{
projects.add( project );
result.add( project );
}
}
if ( !resumed )
{
throw new MavenExecutionException( "Could not find project to resume reactor build from: "
+ selectedProject + " vs " + activeProjects, request.getPom() );
throw new MavenExecutionException( "Could not find project to resume reactor build from: " + selector
+ " vs " + projects, request.getPom() );
}
}
activeProjects = projects;
}
if ( activeProjects.size() != sorter.getSortedProjects().size() )
{
graph = new FilteredProjectDependencyGraph( graph, activeProjects );
}
return graph;
return result;
}
private boolean isMatchingProject( MavenProject project, String selector, File reactorDirectory )