[MNG-2234] activate profiles that are not present in the settings so that they can be defined in the POM

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633766 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2008-03-05 04:56:46 +00:00
parent 28e658a172
commit 97e9f53ac3
1 changed files with 4 additions and 4 deletions

View File

@ -247,12 +247,12 @@ public class DefaultMavenExecutionRequestPopulator
List settingsProfiles = settings.getProfiles(); List settingsProfiles = settings.getProfiles();
List settingsActiveProfileIds = settings.getActiveProfiles();
profileManager.explicitlyActivate( settingsActiveProfileIds );
if ( ( settingsProfiles != null ) && !settingsProfiles.isEmpty() ) if ( ( settingsProfiles != null ) && !settingsProfiles.isEmpty() )
{ {
List settingsActiveProfileIds = settings.getActiveProfiles();
profileManager.explicitlyActivate( settingsActiveProfileIds );
for ( Iterator it = settings.getProfiles().iterator(); it.hasNext(); ) for ( Iterator it = settings.getProfiles().iterator(); it.hasNext(); )
{ {
org.apache.maven.settings.Profile rawProfile = (org.apache.maven.settings.Profile) it.next(); org.apache.maven.settings.Profile rawProfile = (org.apache.maven.settings.Profile) it.next();