Retrieve effective instead of raw model when importing projects

This will also interpolate correctly.
Use ProjectBuilder instead of ModelProcessor to parse the POM.
Encapsulate in a dedicated MavenExecutionContext.

This closes #1948

Author: kwin

org.eclipse.m2e.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.m2e.core;singleton:=true
-Bundle-Version: 2.7.600.qualifier
+Bundle-Version: 2.8.600.qualifier
 Bundle-Activator: org.eclipse.m2e.core.internal.MavenPluginActivator
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin

org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/MavenModelManager.java

@@ -20,9 +20,7 @@
 import java.io.InputStream;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -71,9 +69,10 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.Model;
-import org.apache.maven.model.building.FileModelSource;
-import org.apache.maven.model.building.ModelProcessor;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectBuilder;
+import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.ProjectBuildingResult;
 
 import org.eclipse.m2e.core.internal.IMavenToolbox;
 import org.eclipse.m2e.core.internal.MavenPluginActivator;
@@ -106,13 +105,26 @@ public org.apache.maven.model.Model readMavenModel(InputStream reader) throws Co
   }
 
   /**
-   * Read the model from the provided pom file (might not exits) pointer
+   * Shortcut for {@link #readMavenModel(File, IProgressMonitor) with 2nd argument being {@code null}.
    * 
-   * @param pomFile the file pointer
-   * @return a maven model, or <code>null</code> if the pointer do not point to any valid maven directory
-   * @throws CoreException if the file points to a valid maven directory but the pom could not be read
+   * @deprecated Use {@link #readMavenModel(File, IProgressMonitor)} instead.
    */
+  @Deprecated
   public org.apache.maven.model.Model readMavenModel(File pomFile) throws CoreException {
+    return readMavenModel(pomFile, null);
+  }
+
+  /**
+   * Read the (effective) model from the provided POM file
+   * 
+   * @param pomFile either the path to the directory containing a pom.xml or the path to the pom.xml itself
+   * @param progressMonitor the progress monitor, may be {@code null}
+   * @return the effective maven model, or <code>null</code> if the pomFile does not point to an existing pom.file or
+   *         container directory
+   * @throws CoreException if the file points to a valid maven directory but the pom could not be read
+   */
+  public org.apache.maven.model.Model readMavenModel(File pomFile, IProgressMonitor progressMonitor)
+      throws CoreException {
     File baseDir = pomFile.isDirectory() ? pomFile : pomFile.getParentFile();
     Objects.requireNonNull(baseDir, "not a directory and not a parent, invalid file?");
     IComponentLookup lookup = containerManager.getComponentLookup(baseDir);
@@ -121,17 +133,20 @@ public org.apache.maven.model.Model readMavenModel(File pomFile) throws CoreExce
     if(locatePom.isEmpty()) {
       return null;
     }
-    ModelProcessor modelProcessor = lookup.lookup(ModelProcessor.class);
 
     File pom = locatePom.get();
-    Model model;
-    try {
-      model = modelProcessor.read(pom, new HashMap<>(Map.of(ModelProcessor.SOURCE, new FileModelSource(pom))));
-    } catch(IOException ex) {
-      throw new CoreException(Status.error(ex.getMessage(), ex));
-    }
-    model.setPomFile(pom);
-    return model;
+    IMavenExecutionContext context = maven.createExecutionContext();
+    return context.execute((IMavenExecutionContext innerContext, IProgressMonitor monitor) -> {
+      ProjectBuilder projectBuilder = lookup.lookup(ProjectBuilder.class);
+
+      try {
+        ProjectBuildingResult result = projectBuilder.build(pom, innerContext.getExecutionRequest()
+            .getProjectBuildingRequest().setRepositorySession(innerContext.getRepositorySession()));
+        return result.getProject().getModel();
+      } catch(ProjectBuildingException ex) {
+        throw new CoreException(Status.error(ex.getMessage(), ex));
+      }
+    }, progressMonitor);
   }
 
   public org.apache.maven.model.Model readMavenModel(IFile pomFile) throws CoreException {

org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/LocalProjectScanner.java

@@ -91,7 +91,7 @@ private void scanFolder(File baseDir, String rootRelPath, IProgressMonitor m) th
       return;
     }
 
-    MavenProjectInfo projectInfo = readMavenProjectInfo(baseDir, rootRelPath, null);
+    MavenProjectInfo projectInfo = readMavenProjectInfo(baseDir, rootRelPath, null, m);
     if(projectInfo != null) {
       addProject(projectInfo);
       monitor.done();
@@ -114,15 +114,16 @@ private void scanFolder(File baseDir, String rootRelPath, IProgressMonitor m) th
     }
   }
 
-  private MavenProjectInfo readMavenProjectInfo(File baseDir, String modulePath, MavenProjectInfo parentInfo) {
+  private MavenProjectInfo readMavenProjectInfo(File baseDir, String modulePath, MavenProjectInfo parentInfo,
+      IProgressMonitor progressMonitor) {
     try {
       baseDir = baseDir.getCanonicalFile();
 
       if(!scannedFolders.add(baseDir)) {
         return null; // we already know this project
         //mkleint: well, if the project is first scanned standalone and later scanned via parent reference, the parent ref gets thrown away??
       }
-      Model model = modelManager.readMavenModel(new File(baseDir, IMavenConstants.POM_FILE_NAME));
+      Model model = modelManager.readMavenModel(new File(baseDir, IMavenConstants.POM_FILE_NAME), progressMonitor);
       if(model == null) {
         return null;
       }

org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenProjectCheckoutJob.java

@@ -125,7 +125,7 @@ public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
         for(MavenProjectInfo projectInfo : projects) {
           Model model = projectInfo.getModel();
           if(model == null) {
-            model = modelManager.readMavenModel(projectInfo.getPomFile());
+            model = modelManager.readMavenModel(projectInfo.getPomFile(), null);
             projectInfo.setModel(model);
           }
 

org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractMavenProjectTestCase.java

@@ -496,7 +496,7 @@ protected IProject[] importProjects(String basedir, String[] pomNames, ResolverC
     final List<MavenProjectInfo> projectInfos = new ArrayList<>();
     for(String pomName : pomNames) {
       File pomFile = new File(dst, pomName);
-      Model model = mavenModelManager.readMavenModel(pomFile);
+      Model model = mavenModelManager.readMavenModel(pomFile, null);
       MavenProjectInfo projectInfo = new MavenProjectInfo(pomName, pomFile, model, null);
       setBasedirRename(projectInfo);
       projectInfos.add(projectInfo);
@@ -562,7 +562,7 @@ protected IProject importProject(String projectName, String projectLocation,
     copyDir(new File(projectLocation), dir);
 
     File pomFile = new File(dir, IMavenConstants.POM_FILE_NAME);
-    Model model = MavenPlugin.getMavenModelManager().readMavenModel(pomFile);
+    Model model = MavenPlugin.getMavenModelManager().readMavenModel(pomFile, null);
     final MavenProjectInfo projectInfo = new MavenProjectInfo(projectName, pomFile, model, null);
     setBasedirRename(projectInfo);