mirror of https://github.com/apache/maven.git
o remove dead code, this is being done elsewhere and has been for a while
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573472 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
791c2bf164
commit
a0439b3e05
|
@ -89,8 +89,6 @@ public class DefaultMavenSettingsBuilder
|
|||
|
||||
SettingsUtils.merge( userSettings, globalSettings, TrackableBase.GLOBAL_LEVEL );
|
||||
|
||||
activateDefaultProfiles( userSettings );
|
||||
|
||||
userSettings = interpolate( userSettings );
|
||||
|
||||
return userSettings;
|
||||
|
@ -184,21 +182,6 @@ public class DefaultMavenSettingsBuilder
|
|||
return settings;
|
||||
}
|
||||
|
||||
private void activateDefaultProfiles( Settings settings )
|
||||
{
|
||||
List activeProfiles = settings.getActiveProfiles();
|
||||
|
||||
for ( Iterator profiles = settings.getProfiles().iterator(); profiles.hasNext(); )
|
||||
{
|
||||
Profile profile = (Profile) profiles.next();
|
||||
if ( ( profile.getActivation() != null ) && profile.getActivation().isActiveByDefault()
|
||||
&& !activeProfiles.contains( profile.getId() ) )
|
||||
{
|
||||
settings.addActiveProfile( profile.getId() );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void validateSettings( Settings settings, File location )
|
||||
throws IOException
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue