Skip to content

Commit 265123a

Browse files
committed
[MNG-8360] Fix parent profiles not reported as activated
1 parent 8584e94 commit 265123a

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1199,10 +1199,14 @@ private Model readEffectiveModel() throws ModelBuilderException {
11991199

12001200
// profile injection
12011201
List<Profile> activePomProfiles = getActiveProfiles(interpolatedProfiles, profileActivationContext);
1202-
result.setActivePomProfiles(activePomProfiles);
12031202
model = profileInjector.injectProfiles(model, activePomProfiles, request, this);
12041203
model = profileInjector.injectProfiles(model, activeExternalProfiles, request, this);
12051204

1205+
List<Profile> allProfiles = new ArrayList<>(parentActivePomProfiles.size() + activePomProfiles.size());
1206+
allProfiles.addAll(parentActivePomProfiles);
1207+
allProfiles.addAll(activePomProfiles);
1208+
result.setActivePomProfiles(allProfiles);
1209+
12061210
// model interpolation
12071211
Model resultModel = model;
12081212
resultModel = interpolateModel(resultModel, request, this);

0 commit comments

Comments
 (0)