From 87226eab2eee91bce6faf44888361ad3936c86d4 Mon Sep 17 00:00:00 2001 From: John Dennis Casey Date: Thu, 18 Jan 2007 20:07:23 +0000 Subject: [PATCH] Stop re-applying profiles to models that have already had profiles applied. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497556 13f79535-47bb-0310-9956-ffa450edef68 --- .../project/DefaultMavenProjectBuilder.java | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index b2e536bfc2..ee9e0ce86a 100644 --- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -885,29 +885,7 @@ public class DefaultMavenProjectBuilder { Model model = project.getModel(); - List explicitlyActive; - List explicitlyInactive; - - if ( profileMgr != null ) - { - explicitlyActive = profileMgr.getExplicitlyActivatedIds(); - explicitlyInactive = profileMgr.getExplicitlyDeactivatedIds(); - } - else - { - explicitlyActive = Collections.EMPTY_LIST; - explicitlyInactive = Collections.EMPTY_LIST; - } - - List active = profileAdvisor.applyActivatedProfiles( model, projectDir, explicitlyActive, explicitlyInactive ); - - LinkedHashSet activated = new LinkedHashSet(); - - activated.addAll( project.getActiveProfiles() ); - activated.addAll( active ); - - List activeProfiles = new ArrayList( activated ); - project.setActiveProfiles( activeProfiles ); + List activeProfiles = project.getActiveProfiles(); // TODO: Clean this up...we're using this to 'jump' the interpolation step for model properties not expressed in XML. // [BP] - Can this above comment be explained?