From 62e2d40504c0932881d47fb596dbf58a3850b093 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Tue, 13 Jan 2009 14:33:39 +0000 Subject: [PATCH] [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 --- .../apache/maven/project/DefaultMavenProjectBuilder.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 1a7806c58c..664236697c 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 @@ -330,9 +330,11 @@ public class DefaultMavenProjectBuilder } List projectProfiles = new ArrayList(); - - 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 ) ); project.setActiveProfiles( projectProfiles );