diff --git a/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java b/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java index e70b8c52b5..cc09b180d3 100644 --- a/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java +++ b/maven-settings/src/main/java/org/apache/maven/settings/SettingsUtils.java @@ -163,9 +163,9 @@ public static org.apache.maven.model.Profile convertFromSettingsProfile( Profile 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 static org.apache.maven.model.Profile convertFromSettingsProfile( Profile 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 static org.apache.maven.model.Profile convertFromSettingsProfile( Profile activation.setFile( file ); } + + profile.setActivation( activation ); } profile.setProperties( settingsProfile.getProperties() );