Fix loading POMs manipulated by Maven extensions

(cherry picked from commit 468fae0)

Author: aloubyansky

devtools/cli/src/test/java/io/quarkus/cli/MavenProjectInfoAndUpdateTest.java

@@ -104,14 +104,17 @@ void testMisalignedPlatformExtensionVersion() throws Exception {
         assertRegistryExtensions(infoResult.stdout, "registry.acme.org",
                 UP_TO_DATE_ICON.iconOrMessage() + "       org.acme:acme-quarkiverse-extension:1.0");
 
-        final CliDriver.Result rectifyResult = run(projectDir, "update", "--platform-version=1.0.0", "--no-rewrite");
-        assertThat(rectifyResult.getExitCode()).isEqualTo(0);
+        CliDriver.Result updateResult = run(projectDir, "update", "--platform-version=1.0.0", "--no-rewrite");
+        assertThat(updateResult.getExitCode()).isEqualTo(0);
 
-        assertThat(rectifyResult.stdout)
+        assertThat(updateResult.stdout)
                 .contains(
                         "-       org.acme.quarkus.platform:acme-quarkus-subatomic:[1.0.0 -> managed]");
+        assertQuarkusPlatformBomUpdates(updateResult.stdout,
+                ArtifactCoords.pom("org.acme.quarkus.platform", "quarkus-bom", "[2.0.0 -> 1.0.0]"),
+                ArtifactCoords.pom("org.acme.quarkus.platform", "acme-bom", "[2.0.0 -> 1.0.0]"));
 
-        final CliDriver.Result updateResult = run(projectDir, "update", "-Dquarkus.platform.version=1.0.0", "--no-rewrite");
+        updateResult = run(projectDir, "update", "-Dquarkus.platform.version=1.0.0", "--no-rewrite");
         assertThat(updateResult.getExitCode()).isEqualTo(0);
         assertQuarkusPlatformBomUpdates(updateResult.stdout,
                 ArtifactCoords.pom("org.acme.quarkus.platform", "quarkus-bom", "[1.0.0 -> 2.0.0]"),

devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java

@@ -91,14 +91,14 @@ static Map<Path, Model> getProjectMap(MavenSession session) {
             model.setPomFile(mp.getFile());
             // activated profiles or custom extensions may have overridden the build defaults
             model.setBuild(mp.getModel().getBuild());
-            projectModels.put(mp.getBasedir().toPath(), model);
+            projectModels.put(mp.getFile().toPath(), model);
             // The Maven Model API determines the project directory as the directory containing the POM file.
             // However, in case when plugins manipulating POMs store their results elsewhere
             // (such as the flatten plugin storing the flattened POM under the target directory),
             // both the base directory and the directory containing the POM file should be added to the map.
             var pomDir = mp.getFile().getParentFile();
             if (!pomDir.equals(mp.getBasedir())) {
-                projectModels.put(pomDir.toPath(), model);
+                projectModels.put(mp.getBasedir().toPath().resolve("pom.xml"), model);
             }
         }
         return projectModels;
@@ -210,7 +210,7 @@ private MavenArtifactResolver artifactResolver(QuarkusBootstrapMojo mojo, Launch
                                     .setUserSettings(mojo.mavenSession().getRequest().getUserSettingsFile())
                                     .setCurrentProject(mojo.mavenProject().getFile().toString())
                                     .setPreferPomsFromWorkspace(true)
-                                    .setProjectModelProvider(getProjectMap(mojo.mavenSession())::get)
+                                    .setProjectModelProvider(getProjectMap(mojo.mavenSession()))
                                     // pass the repositories since Maven extensions could manipulate repository configs
                                     .setRemoteRepositories(mojo.remoteRepositories())
                                     .setEffectiveModelBuilder(BootstrapMavenContextConfig

independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java

@@ -14,7 +14,6 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
@@ -378,7 +377,7 @@ private boolean getLocalRepoTailIgnoreAvailability() {
                 : localRepoTailIgnoreAvailability;
     }
 
-    private LocalProject resolveCurrentProject(Function<Path, Model> modelProvider) throws BootstrapMavenException {
+    private LocalProject resolveCurrentProject(Map<Path, Model> modelProvider) throws BootstrapMavenException {
         try {
             return LocalProject.loadWorkspace(this, modelProvider);
         } catch (Exception e) {

independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContextConfig.java

@@ -6,8 +6,8 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
-import java.util.function.Function;
 
 import org.apache.maven.model.Model;
 import org.apache.maven.settings.crypto.SettingsDecrypter;
@@ -58,7 +58,7 @@ public static boolean getEffectiveModelBuilderProperty(Properties props) {
     protected boolean preferPomsFromWorkspace;
     protected Boolean effectiveModelBuilder;
     protected Boolean wsModuleParentHierarchy;
-    protected Function<Path, Model> modelProvider;
+    protected Map<Path, Model> modelProvider;
     protected List<String> excludeSisuBeanPackages;
     protected List<String> includeSisuBeanPackages;
     protected Boolean warnOnFailedWorkspaceModules;
@@ -374,7 +374,7 @@ public T setWorkspaceModuleParentHierarchy(boolean wsModuleParentHierarchy) {
      * @return this instance
      */
     @SuppressWarnings("unchecked")
-    public T setProjectModelProvider(Function<Path, Model> modelProvider) {
+    public T setProjectModelProvider(Map<Path, Model> modelProvider) {
         this.modelProvider = modelProvider;
         return (T) this;
     }

independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/MavenModelBuilder.java

@@ -2,8 +2,11 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.apache.maven.model.Model;
@@ -17,6 +20,7 @@
 import org.eclipse.aether.artifact.DefaultArtifact;
 
 import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions;
+import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
 import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace;
 import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils;
 import io.quarkus.maven.dependency.ArtifactCoords;
@@ -29,10 +33,23 @@ public class MavenModelBuilder implements ModelBuilder {
 
     private final ModelBuilder builder;
     private final BootstrapMavenContext ctx;
+    // This mapping is particularly useful when POM files do not exactly match the Model present in the LocalWorkspace.
+    // This may happen when Maven extensions manipulate the original POMs by changing versions, etc.
+    private final Map<File, Model> poms;
 
     public MavenModelBuilder(BootstrapMavenContext ctx) {
         builder = BootstrapModelBuilderFactory.getDefaultModelBuilder();
         this.ctx = ctx;
+        if (ctx != null && ctx.getWorkspace() != null) {
+            final Collection<LocalProject> projects = ctx.getWorkspace().getProjects().values();
+            final Map<File, Model> tmp = new HashMap<>(projects.size());
+            for (var p : projects) {
+                tmp.put(p.getRawModel().getPomFile(), p.getRawModel());
+            }
+            poms = tmp;
+        } else {
+            poms = Map.of();
+        }
     }
 
     @Override
@@ -65,17 +82,25 @@ public ModelBuildingResult build(ModelBuildingRequest request) throws ModelBuild
 
     private Model getModel(ModelBuildingRequest request) {
         Model requestModel = request.getRawModel();
-        if (requestModel == null) {
-            if (request.getModelSource() != null) {
-                try {
-                    requestModel = ModelUtils.readModel(request.getModelSource().getInputStream());
-                    request.setRawModel(requestModel);
-                    if (request.getPomFile() != null) {
-                        requestModel.setPomFile(request.getPomFile());
-                    }
-                } catch (IOException e) {
-                    // ignore
+        if (requestModel != null) {
+            return requestModel;
+        }
+        if (request.getPomFile() != null) {
+            requestModel = poms.get(request.getPomFile());
+            if (requestModel != null) {
+                request.setRawModel(requestModel);
+                return requestModel;
+            }
+        }
+        if (request.getModelSource() != null) {
+            try {
+                requestModel = ModelUtils.readModel(request.getModelSource().getInputStream());
+                request.setRawModel(requestModel);
+                if (request.getPomFile() != null) {
+                    requestModel.setPomFile(request.getPomFile());
                 }
+            } catch (IOException e) {
+                // ignore
             }
         }
         return requestModel;

independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java

@@ -104,7 +104,7 @@ public static LocalProject loadWorkspace(BootstrapMavenContext ctx) throws Boots
         return loadWorkspace(ctx, null);
     }
 
-    public static LocalProject loadWorkspace(BootstrapMavenContext ctx, Function<Path, Model> modelProvider)
+    public static LocalProject loadWorkspace(BootstrapMavenContext ctx, Map<Path, Model> modelProvider)
             throws BootstrapMavenException {
         final Path currentProjectPom = ctx.getCurrentProjectPomOrNull();
         if (currentProjectPom == null) {
@@ -163,6 +163,9 @@ static Path locateCurrentProjectPom(Path path, boolean required) throws Bootstra
         this.workspace = workspace;
         if (workspace != null) {
             workspace.addProject(this);
+            if (!version.equals(ModelUtils.getRawVersion(rawModel))) {
+                workspace.setResolvedVersion(version);
+            }
         }
     }