Author: bentmann
Date: Thu Jan 15 12:30:50 2009
New Revision: 734810
URL: http://svn.apache.org/viewvc?rev=734810&view=rev
Log:
[MNG-2605] Profiles in profiles.xml are active by default
o Merged from r734803
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java?rev=734810&r1=734809&r2=734810&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
Thu Jan 15 12:30:50 2009
@@ -96,10 +96,6 @@
profile.setActivation( activation );
}
- else
- {
- profile.setActivation( new AlwaysOnActivation() );
- }
profile.setProperties( profileXmlProfile.getProperties() );