You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/02/04 20:37:38 UTC
svn commit: r618393 -
/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Author: jdcasey
Date: Mon Feb 4 11:37:37 2008
New Revision: 618393
URL: http://svn.apache.org/viewvc?rev=618393&view=rev
Log:
[MNG-3099] Port fix to 2.0.x branch, from revId: 618391
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=618393&r1=618392&r2=618393&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Mon Feb 4 11:37:37 2008
@@ -31,7 +31,6 @@
import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
-import org.apache.maven.model.Profile;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents;
import org.apache.maven.profiles.ProfileManager;
@@ -45,7 +44,6 @@
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
-import org.apache.maven.settings.SettingsUtils;
import org.apache.maven.usability.SystemWarnings;
import org.apache.maven.usability.diagnostics.ErrorDiagnostics;
import org.apache.maven.wagon.repository.RepositoryPermissions;
@@ -341,7 +339,7 @@
MavenProject superProject;
try
{
- superProject = projectBuilder.buildStandaloneSuperProject( request.getLocalRepository() );
+ superProject = projectBuilder.buildStandaloneSuperProject( request.getLocalRepository(), request.getGlobalProfileManager() );
}
catch ( ProjectBuildingException e )
@@ -462,7 +460,7 @@
project.setExecutionRoot( true );
}
- if ( project.getPrerequisites() != null && project.getPrerequisites().getMaven() != null )
+ if ( ( project.getPrerequisites() != null ) && ( project.getPrerequisites().getMaven() != null ) )
{
DefaultArtifactVersion version = new DefaultArtifactVersion( project.getPrerequisites().getMaven() );
if ( runtimeInformation.getApplicationVersion().compareTo( version ) < 0 )
@@ -472,7 +470,7 @@
}
}
- if ( project.getModules() != null && !project.getModules().isEmpty() && recursive )
+ if ( ( project.getModules() != null ) && !project.getModules().isEmpty() && recursive )
{
// TODO: Really should fail if it was not? What if it is aggregating - eg "ear"?
project.setPackaging( "pom" );