Author: brett
Date: Fri Mar 13 02:25:40 2009
New Revision: 753089
URL: http://svn.apache.org/viewvc?rev=753089&view=rev
Log:
[MNG-4084] Unnecessary Warning for an activate profile in child project
Modified:
maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Modified:
maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=753089&r1=753088&r2=753089&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/branches/maven-2.1.0-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Fri Mar 13 02:25:40 2009
@@ -368,11 +368,16 @@
for ( Iterator i = projects.iterator(); i.hasNext(); )
{
MavenProject project = (MavenProject) i.next();
-
- for ( Iterator j = project.getActiveProfiles().iterator();
j.hasNext(); )
+
+ do
{
- activeProfileIds.add( ( (Profile) j.next() ).getId() );
+ for ( Iterator j = project.getActiveProfiles().iterator();
j.hasNext(); )
+ {
+ activeProfileIds.add( ( (Profile) j.next() ).getId() );
+ }
+ project = project.getParent();
}
+ while ( project != null );
}
for ( Iterator i =
globalProfileManager.getExplicitlyActivatedIds().iterator(); i.hasNext(); )
