Author: jdcasey
Date: Thu Jan 18 12:07:23 2007
New Revision: 497556
URL: http://svn.apache.org/viewvc?view=rev&rev=497556
Log:
Stop re-applying profiles to models that have already had profiles applied.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?view=diff&rev=497556&r1=497555&r2=497556
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Thu Jan 18 12:07:23 2007
@@ -885,29 +885,7 @@
{
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?
