You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/02/20 00:31:43 UTC
svn commit: r746055 - in /maven/components/branches/maven-2.1.x:
apache-maven/
maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
maven-settings/src/main/mdo/settings.mdo
Author: bentmann
Date: Thu Feb 19 23:31:42 2009
New Revision: 746055
URL: http://svn.apache.org/viewvc?rev=746055&view=rev
Log:
[MNG-3701] ClassCastException when building settings.xml with profiles that have activeByDefault set
o Merged proper fix from r746038 and synced up with r509744
Modified:
maven/components/branches/maven-2.1.x/apache-maven/ (props changed)
maven/components/branches/maven-2.1.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
maven/components/branches/maven-2.1.x/maven-settings/src/main/mdo/settings.mdo
Propchange: maven/components/branches/maven-2.1.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 19 23:31:42 2009
@@ -1,5 +1,5 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven:679193-679867,680477-688882,708790-728809,728834
-/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,649903,657432,659677,679552-679867,693956-728820,728836,728940,736543
+/maven/components/branches/maven-2.0.x/apache-maven:533160,636838,649903,657432,659677,679552-679867,693956-728820,728836,728940,736543,746038
/maven/components/branches/maven-2.1.0-M1-RC/apache-maven:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC/apache-maven:688883,689695,689976,689990
/maven/components/trunk/apache-maven:720001,721902,726845,727688
Modified: maven/components/branches/maven-2.1.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?rev=746055&r1=746054&r2=746055&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java (original)
+++ maven/components/branches/maven-2.1.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java Thu Feb 19 23:31:42 2009
@@ -192,11 +192,6 @@
for ( Iterator profiles = settings.getProfiles().iterator(); profiles.hasNext(); )
{
Profile profile = (Profile) profiles.next();
- if ( profile.getId() == null )
- {
- profile.setId( "default" );
- }
-
if ( profile.getActivation() != null && profile.getActivation().isActiveByDefault()
&& !activeProfiles.contains( profile.getId() ) )
{
Modified: maven/components/branches/maven-2.1.x/maven-settings/src/main/mdo/settings.mdo
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-settings/src/main/mdo/settings.mdo?rev=746055&r1=746054&r2=746055&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-settings/src/main/mdo/settings.mdo (original)
+++ maven/components/branches/maven-2.1.x/maven-settings/src/main/mdo/settings.mdo Thu Feb 19 23:31:42 2009
@@ -101,7 +101,7 @@
<name>id</name>
<version>1.0.0</version>
<type>String</type>
- <default>default</default>
+ <defaultValue>default</defaultValue>
<required>true</required>
</field>
</fields>