Move the computeMultiModuleProjectDirectory to MavenProperties

Author: laeubi

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenExecutionContext.java

@@ -116,7 +116,7 @@ public class MavenExecutionContext implements IMavenExecutionContext {
    */
   public MavenExecutionContext(IComponentLookup lookup, File baseDir,
       Function<? super MavenExecutionContext, MavenProject> projectSupplier) {
-    this(lookup, baseDir, PlexusContainerManager.computeMultiModuleProjectDirectory(baseDir), projectSupplier);
+    this(lookup, baseDir, MavenProperties.computeMultiModuleProjectDirectory(baseDir), projectSupplier);
   }
 
   public MavenExecutionContext(IComponentLookup lookup, File baseDir, File multiModuleProjectDirectory,

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenProperties.java

@@ -21,6 +21,7 @@
 
 package org.eclipse.m2e.core.internal.embedder;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
@@ -30,6 +31,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+
 import org.apache.maven.cli.MavenCli;
 import org.apache.maven.shared.utils.StringUtils;
 
@@ -133,4 +137,24 @@ public static void setProperties(Properties properties) {
       properties.setProperty("maven.build.version", mavenBuildVersion);
     }
   }
+
+  /**
+   * @param file a base file or directory, may be <code>null</code>
+   * @return the value for `maven.multiModuleProjectDirectory` as defined in Maven launcher
+   */
+  public static File computeMultiModuleProjectDirectory(File file) {
+    if(file == null) {
+      return null;
+    }
+    final File basedir = file.isDirectory() ? file : file.getParentFile();
+    IWorkspace workspace = ResourcesPlugin.getWorkspace();
+    File workspaceRoot = workspace.getRoot().getLocation().toFile();
+  
+    for(File root = basedir; root != null && !root.equals(workspaceRoot); root = root.getParentFile()) {
+      if(new File(root, IMavenPlexusContainer.MVN_FOLDER).isDirectory()) {
+        return root;
+      }
+    }
+    return null;
+  }
 }

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/PlexusContainerManager.java

@@ -38,7 +38,6 @@
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.Platform;
@@ -164,7 +163,7 @@ public IMavenPlexusContainer aquire(IResource basedir) throws Exception {
   }
 
   public IMavenPlexusContainer aquire(File basedir) throws Exception {
-    File directory = computeMultiModuleProjectDirectory(basedir);
+    File directory = MavenProperties.computeMultiModuleProjectDirectory(basedir);
     if(directory == null) {
       return aquire();
     }
@@ -443,26 +442,6 @@ private CoreException throwException() {
 
   }
 
-  /**
-   * @param file a base file or directory, may be <code>null</code>
-   * @return the value for `maven.multiModuleProjectDirectory` as defined in Maven launcher
-   */
-  public static File computeMultiModuleProjectDirectory(File file) {
-    if(file == null) {
-      return null;
-    }
-    final File basedir = file.isDirectory() ? file : file.getParentFile();
-    IWorkspace workspace = ResourcesPlugin.getWorkspace();
-    File workspaceRoot = workspace.getRoot().getLocation().toFile();
-
-    for(File root = basedir; root != null && !root.equals(workspaceRoot); root = root.getParentFile()) {
-      if(new File(root, IMavenPlexusContainer.MVN_FOLDER).isDirectory()) {
-        return root;
-      }
-    }
-    return null;
-  }
-
   public static IComponentLookup wrap(PlexusContainer container) {
     return wrap(container, container.getContainerRealm());
   }

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/MavenProjectFacade.java

@@ -57,6 +57,7 @@
 import org.eclipse.m2e.core.internal.Messages;
 import org.eclipse.m2e.core.internal.embedder.IMavenPlexusContainer;
 import org.eclipse.m2e.core.internal.embedder.MavenExecutionContext;
+import org.eclipse.m2e.core.internal.embedder.MavenProperties;
 import org.eclipse.m2e.core.internal.embedder.PlexusContainerManager;
 import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
@@ -135,7 +136,7 @@ public MavenProjectFacade(ProjectRegistryManager manager, IFile pom, MavenProjec
     // but https://github.com/eclipse-m2e/m2e-core/issues/904 will add support for a user to specify a custom root directory
     // and then we should really inherit this from the configuration!
     this.resolverConfiguration = new MavenProjectConfiguration(resolverConfiguration,
-        PlexusContainerManager.computeMultiModuleProjectDirectory(pomFile));
+        MavenProperties.computeMultiModuleProjectDirectory(pomFile));
 
     this.artifactKey = new ArtifactKey(mavenProject.getArtifact());
     this.packaging = mavenProject.getPackaging();

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java

@@ -95,6 +95,7 @@
 import org.eclipse.m2e.core.internal.Messages;
 import org.eclipse.m2e.core.internal.URLConnectionCaches;
 import org.eclipse.m2e.core.internal.embedder.MavenExecutionContext;
+import org.eclipse.m2e.core.internal.embedder.MavenProperties;
 import org.eclipse.m2e.core.internal.embedder.PlexusContainerManager;
 import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingFactory;
 import org.eclipse.m2e.core.internal.lifecyclemapping.LifecycleMappingResult;
@@ -941,7 +942,7 @@ private MavenExecutionRequest configureExecutionRequest(MavenExecutionRequest re
     request.setWorkspaceReader(getWorkspaceReader(state, pom, resolverConfiguration));
     if(pom != null && pom.getLocation() != null) {
       request.setMultiModuleProjectDirectory(
-          PlexusContainerManager.computeMultiModuleProjectDirectory(pom.getLocation().toFile()));
+          MavenProperties.computeMultiModuleProjectDirectory(pom.getLocation().toFile()));
     }
 
     return request;

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

@@ -25,7 +25,7 @@
 
 import org.eclipse.core.resources.IProject;
 
-import org.eclipse.m2e.core.internal.embedder.PlexusContainerManager;
+import org.eclipse.m2e.core.internal.embedder.MavenProperties;
 
 
 /**
@@ -52,7 +52,7 @@ public ResolverConfiguration() {
 
   public ResolverConfiguration(IProject project) {
     setMultiModuleProjectDirectory(
-        PlexusContainerManager.computeMultiModuleProjectDirectory(project.getLocation().toFile()));
+        MavenProperties.computeMultiModuleProjectDirectory(project.getLocation().toFile()));
   }
 
   /**