[MNG-8360] Fix parent profiles not reported as activated (#1852)

apache · Oct 25, 2024 · c0866ec · c0866ec
1 parent a443928
commit c0866ec
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java
@@ -1199,10 +1199,14 @@ private Model readEffectiveModel() throws ModelBuilderException {
 
             // profile injection
             List<Profile> activePomProfiles = getActiveProfiles(interpolatedProfiles, profileActivationContext);
-            result.setActivePomProfiles(activePomProfiles);
             model = profileInjector.injectProfiles(model, activePomProfiles, request, this);
             model = profileInjector.injectProfiles(model, activeExternalProfiles, request, this);
 
+            List<Profile> allProfiles = new ArrayList<>(parentActivePomProfiles.size() + activePomProfiles.size());
+            allProfiles.addAll(parentActivePomProfiles);
+            allProfiles.addAll(activePomProfiles);
+            result.setActivePomProfiles(allProfiles);
+
             // model interpolation
             Model resultModel = model;
             resultModel = interpolateModel(resultModel, request, this);