mirror of https://github.com/apache/maven.git
o if we are given a base directory, set the actual POM file in the populator, we can eventually move a lot of the logic that is in the CLI there because it's not CLI specific
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572237 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
08ed903945
commit
01f970117a
|
@ -19,6 +19,7 @@ package org.apache.maven.embedder.execution;
|
|||
* under the License.
|
||||
*/
|
||||
|
||||
import org.apache.maven.Maven;
|
||||
import org.apache.maven.SettingsConfigurationException;
|
||||
import org.apache.maven.artifact.manager.WagonManager;
|
||||
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
|
||||
|
@ -29,8 +30,8 @@ import org.apache.maven.embedder.MavenEmbedderException;
|
|||
import org.apache.maven.execution.MavenExecutionRequest;
|
||||
import org.apache.maven.monitor.event.DefaultEventMonitor;
|
||||
import org.apache.maven.plugin.Mojo;
|
||||
import org.apache.maven.profiles.ProfileManager;
|
||||
import org.apache.maven.profiles.DefaultProfileManager;
|
||||
import org.apache.maven.profiles.ProfileManager;
|
||||
import org.apache.maven.settings.Mirror;
|
||||
import org.apache.maven.settings.Proxy;
|
||||
import org.apache.maven.settings.Server;
|
||||
|
@ -72,6 +73,13 @@ public class DefaultMavenExecutionRequestPopulator
|
|||
MavenEmbedder embedder )
|
||||
throws MavenEmbedderException
|
||||
{
|
||||
// Actual POM File
|
||||
|
||||
if ( request.getBaseDirectory() != null )
|
||||
{
|
||||
request.setPomFile( new File( request.getBaseDirectory(), Maven.POMv4 ).getAbsolutePath() );
|
||||
}
|
||||
|
||||
if ( request.getSettings() == null )
|
||||
{
|
||||
request.setSettings( embedder.getSettings() );
|
||||
|
|
Loading…
Reference in New Issue