Fixes condition-activated profiles not considered in effective model (#481)

* Fixes condition-activated profiles not considered in effective model

Fixes #91, #244, #316

Signed-off-by: Glenn <[email protected]>
Co-authored-by: Glenn <[email protected]>

Author: oldhen

src/it/projects/profile-with-conditional-depMgmt/pom.xml

@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.codehaus.mojo.flatten.its</groupId>
+  <artifactId>profile-with-conditional-depMgmt</artifactId>
+  <version>0.1-SNAPSHOT</version>
+  
+  <dependencies>
+    <dependency>
+      <groupId>jakarta.json</groupId>
+      <artifactId>jakarta.json-api</artifactId>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <activation>
+        <file>
+          <missing>file-does-not-exist</missing>
+        </file>
+      </activation>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
+            <version>2.1.3</version>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+    </profile>
+  </profiles>
+</project>

src/it/projects/profile-with-conditional-depMgmt/verify.groovy

@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import groovy.xml.XmlSlurper
+
+File originalPom = new File( basedir, 'pom.xml' )
+assert originalPom.exists()
+
+def originalProject = new XmlSlurper().parse( originalPom )
+assert 1 == originalProject.dependencies.size()
+assert 1 == originalProject.dependencies[0].dependency.size()
+assert originalProject.dependencies[0].dependency[0].version.empty
+
+File flattendPom = new File( basedir, '.flattened-pom.xml' )
+assert flattendPom.exists()
+
+def flattendProject = new XmlSlurper().parse( flattendPom )
+assert 1 == flattendProject.dependencies.size()
+assert 1 == flattendProject.dependencies[0].dependency.size()
+assert 1 == flattendProject.dependencies[0].dependency[0].version.size()
+assert '2.1.3' == flattendProject.dependencies[0].dependency[0].version[0].text()
+

src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java

@@ -66,8 +66,8 @@
 import org.apache.maven.model.interpolation.ModelInterpolator;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
-import org.apache.maven.model.profile.DefaultProfileSelector;
 import org.apache.maven.model.profile.ProfileInjector;
+import org.apache.maven.model.profile.ProfileSelector;
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -416,6 +416,9 @@ public class FlattenMojo extends AbstractFlattenMojo {
     @Inject
     private RepositorySystem repositorySystem;
 
+    @Inject
+    private ProfileSelector profileSelector;
+
     /**
      * The constructor.
      */
@@ -963,8 +966,7 @@ protected Model createEffectivePomImpl(ModelBuildingRequest buildingRequest) thr
                 }
             };
 
-            buildingResult = modelBuilderThreadSafetyWorkaround.build(
-                    buildingRequest, customInjector, new DefaultProfileSelector());
+            buildingResult = modelBuilderThreadSafetyWorkaround.build(buildingRequest, customInjector, profileSelector);
         } catch (ModelBuildingException e) {
             throw new MojoExecutionException(e.getMessage(), e);
         }