Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-1509] fix profile activation from settings.xml 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379314 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2006-02-21 02:55:23 +00:00
parent ad38e46b4b
commit fa34c36025
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java
View File

@ -163,9 +163,9 @@ public final class SettingsUtils
activation.setProperty( prop );
}
ActivationOS settingsOs = settingsActivation.getOs();
if ( settingsOs != null )
{
org.apache.maven.model.ActivationOS os = new org.apache.maven.model.ActivationOS();
@ -174,8 +174,10 @@ public final class SettingsUtils
os.setFamily( settingsOs.getFamily() );
os.setName( settingsOs.getName() );
os.setVersion( settingsOs.getVersion() );
activation.setOs( os );
}
org.apache.maven.settings.ActivationFile settingsFile = settingsActivation.getFile();
if ( settingsFile != null )
@ -187,6 +189,8 @@ public final class SettingsUtils
activation.setFile( file );
}
profile.setActivation( activation );
}
profile.setProperties( settingsProfile.getProperties() );