Author: brett
Date: Fri Mar 13 02:43:57 2009
New Revision: 753094
URL: http://svn.apache.org/viewvc?rev=753094&view=rev
Log:
[MNG-4084] Unnecessary Warning for an activate profile in child project
Modified:
maven/components/branches/maven-2.0.x/ (props changed)
maven/components/branches/maven-2.0.x/apache-maven/ (props changed)
maven/components/branches/maven-2.0.x/apache-maven/src/test/ (props
changed)
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/branches/maven-2.0.x/maven-integration-tests/ (props
changed)
maven/components/branches/maven-2.0.x/maven-model/src/test/ (props
changed)
Propchange: maven/components/branches/maven-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 13 02:43:57 2009
@@ -1,3 +1,4 @@
/maven/components/branches/maven-2.0.10-RC:708790-728809,728834
+/maven/components/branches/maven-2.1.0-RC:753089
/maven/components/branches/maven-2.1.x:720038,727670,727762,727868,728933,728937,737683,738723,738753,739385,741507,741518,741870,742819,744645,745836,747468,747683,747799,748102,748111,748146,748815,749997
/maven/components/trunk:720001,721902,726845,729292
Propchange: maven/components/branches/maven-2.0.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 13 02:43:57 2009
@@ -1,5 +1,6 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven:708790-728809,728834
/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,645583,645642,647357,649903,657432,659677,662033,662251,669665,670358,673499,673905,674059,675074,675087,675096,675375,675380,680604,682055
+/maven/components/branches/maven-2.1.0-RC/apache-maven:753089
/maven/components/branches/maven-2.1.x/apache-maven:720038,728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997
/maven/components/trunk/apache-maven:720001,721902,726845
/maven/components/trunk/maven-distribution:727688
Propchange: maven/components/branches/maven-2.0.x/apache-maven/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 13 02:43:57 2009
@@ -1,2 +1,3 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven/src/test:727009-728809,728834
+/maven/components/branches/maven-2.1.0-RC/apache-maven/src/test:753089
/maven/components/branches/maven-2.1.x/apache-maven/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=753094&r1=753093&r2=753094&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Fri Mar 13 02:43:57 2009
@@ -357,11 +357,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(); )
Propchange: maven/components/branches/maven-2.0.x/maven-integration-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 13 02:43:57 2009
@@ -1,2 +1,3 @@
/maven/components/branches/maven-2.0.10-RC/maven-integration-tests:709246-728809,728834
+/maven/components/branches/maven-2.1.0-RC/maven-integration-tests:753089
/maven/components/branches/maven-2.1.x/maven-integration-tests:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997
Propchange: maven/components/branches/maven-2.0.x/maven-model/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 13 02:43:57 2009
@@ -1,2 +1,3 @@
/maven/components/branches/maven-2.0.10-RC/maven-model/src/test:727009-728809,728834
+/maven/components/branches/maven-2.1.0-RC/maven-model/src/test:753089
/maven/components/branches/maven-2.1.x/maven-model/src/test:728933,728937,737683,738723,738753,741507,741518,742819,745836,747683,747799,748102,748111,748146,749997
