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

[MNG-3988] [regression] Profiles.xml is not processed 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@734142 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-01-13 14:33:39 +00:00
parent f1ba2636b4
commit 62e2d40504
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -330,9 +330,11 @@ public class DefaultMavenProjectBuilder
} }
List<Profile> projectProfiles = new ArrayList<Profile>(); List<Profile> projectProfiles = new ArrayList<Profile>();
projectProfiles.addAll( profileAdvisor.applyActivatedProfiles( project.getModel(), project.getFile(), isReactorProject, profileActivationContext ) ); projectProfiles.addAll( profileAdvisor.applyActivatedProfiles( project.getModel(),
isReactorProject ? projectDescriptor : null,
isReactorProject, profileActivationContext ) );
projectProfiles.addAll( profileAdvisor.applyActivatedExternalProfiles( project.getModel(), project.getFile(), externalProfileManager ) ); projectProfiles.addAll( profileAdvisor.applyActivatedExternalProfiles( project.getModel(), project.getFile(), externalProfileManager ) );
project.setActiveProfiles( projectProfiles ); project.setActiveProfiles( projectProfiles );