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

o fix for populator 

Submitted by: Igor Fedorenko


git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777796 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-05-23 05:20:59 +00:00
parent bc8ff5f600
commit c1af1323cd
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
View File

@ -57,15 +57,17 @@ public class DefaultMavenExecutionRequestPopulator
throws MavenEmbedderException
{
// copy configuration to request
if ( configuration.getGlobalSettingsFile() != null )
if ( request.getSettings() == null )
{
request.setGlobalSettingsFile( configuration.getGlobalSettingsFile() );
}
if ( configuration.getGlobalSettingsFile() != null )
{
request.setGlobalSettingsFile( configuration.getGlobalSettingsFile() );
}
if ( configuration.getUserSettingsFile() != null )
{
request.setUserSettingsFile( configuration.getUserSettingsFile() );
if ( configuration.getUserSettingsFile() != null )
{
request.setUserSettingsFile( configuration.getUserSettingsFile() );
}
}
String localRepositoryPath = null;
@ -80,6 +82,11 @@ public class DefaultMavenExecutionRequestPopulator
localRepositoryPath = configuration.getLocalRepository().getAbsolutePath();
}
if ( !StringUtils.isEmpty( localRepositoryPath ) )
{
request.setLocalRepositoryPath( localRepositoryPath );
}
// populate the defaults
return populateDefaults( request );