You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/04/06 13:00:20 UTC
svn commit: r931086 - in
/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven:
execution/MavenSession.java project/DefaultProjectBuilder.java
Author: bentmann
Date: Tue Apr 6 11:00:19 2010
New Revision: 931086
URL: http://svn.apache.org/viewvc?rev=931086&view=rev
Log:
[MNG-4618] maven-javadoc-plugin aggregate-jar fails with maven3 and multiple modules
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?rev=931086&r1=931085&r2=931086&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java Tue Apr 6 11:00:19 2010
@@ -124,11 +124,23 @@ public class MavenSession
public void setProjects( List<MavenProject> projects )
{
- //TODO: Current for testing classes creating the session
- if ( projects.size() > 0 )
+ if ( !projects.isEmpty() )
{
this.currentProject = projects.get( 0 );
- this.topLevelProject = projects.get( 0 );
+ this.topLevelProject = currentProject;
+ for ( MavenProject project : projects )
+ {
+ if ( project.isExecutionRoot() )
+ {
+ topLevelProject = project;
+ break;
+ }
+ }
+ }
+ else
+ {
+ this.currentProject = null;
+ this.topLevelProject = null;
}
this.projects = projects;
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=931086&r1=931085&r2=931086&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Tue Apr 6 11:00:19 2010
@@ -451,18 +451,16 @@ public class DefaultProjectBuilder
MavenProject project = interimResult.listener.getProject();
initProject( project, result );
- projects.add( project );
-
- results.add( new DefaultProjectBuildingResult( project, result.getProblems(), null ) );
-
- project.setExecutionRoot( interimResult.root );
-
List<MavenProject> modules = new ArrayList<MavenProject>();
noErrors = build( results, modules, interimResult.modules, config ) && noErrors;
projects.addAll( modules );
+ projects.add( project );
+ project.setExecutionRoot( interimResult.root );
project.setCollectedProjects( modules );
+
+ results.add( new DefaultProjectBuildingResult( project, result.getProblems(), null ) );
}
catch ( ModelBuildingException e )
{