You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/03/05 05:56:47 UTC
svn commit: r633766 -
/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Author: brett
Date: Tue Mar 4 20:56:46 2008
New Revision: 633766
URL: http://svn.apache.org/viewvc?rev=633766&view=rev
Log:
[MNG-2234] activate profiles that are not present in the settings so that they can be defined in the POM
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=633766&r1=633765&r2=633766&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Tue Mar 4 20:56:46 2008
@@ -247,12 +247,12 @@
List settingsProfiles = settings.getProfiles();
- if ( ( settingsProfiles != null ) && !settingsProfiles.isEmpty() )
- {
- List settingsActiveProfileIds = settings.getActiveProfiles();
+ List settingsActiveProfileIds = settings.getActiveProfiles();
- profileManager.explicitlyActivate( settingsActiveProfileIds );
+ profileManager.explicitlyActivate( settingsActiveProfileIds );
+ if ( ( settingsProfiles != null ) && !settingsProfiles.isEmpty() )
+ {
for ( Iterator it = settings.getProfiles().iterator(); it.hasNext(); )
{
org.apache.maven.settings.Profile rawProfile = (org.apache.maven.settings.Profile) it.next();