svn commit: r734808 - in /maven/components/branches/maven-2.1.x: ./ maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java

[bentmann]

Author: bentmann
Date: Thu Jan 15 12:26:50 2009
New Revision: 734808

URL: http://svn.apache.org/viewvc?rev=734808&view=rev
Log:
[MNG-2605] Profiles in profiles.xml are active by default

o Merged from r734803

Modified:
    maven/components/branches/maven-2.1.x/   (props changed)
    
maven/components/branches/maven-2.1.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java

Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 15 12:26:50 2009
@@ -1,5 +1,5 @@
 
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,708790-728809,728834
-/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631,734502
+/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631,734502,734803
 /maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
 /maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990
 /maven/components/trunk:720001,721902,726845,729292

Modified: 
maven/components/branches/maven-2.1.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java?rev=734808&r1=734807&r2=734808&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.1.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
 (original)
+++ 
maven/components/branches/maven-2.1.x/maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
 Thu Jan 15 12:26:50 2009
@@ -93,10 +93,6 @@
 
             profile.setActivation( activation );
         }
-        else
-        {
-            profile.setActivation( new AlwaysOnActivation() );
-        }
 
         profile.setProperties( profileXmlProfile.getProperties() );