diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProject.java b/maven-project/src/main/java/org/apache/maven/project/MavenProject.java index ab10809282..da3a61a743 100644 --- a/maven-project/src/main/java/org/apache/maven/project/MavenProject.java +++ b/maven-project/src/main/java/org/apache/maven/project/MavenProject.java @@ -16,18 +16,6 @@ package org.apache.maven.project; * limitations under the License. */ -import java.io.File; -import java.io.IOException; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.artifact.DependencyResolutionRequiredException; @@ -62,6 +50,18 @@ import org.apache.maven.project.artifact.MavenMetadataSource; import org.apache.maven.project.overlay.BuildOverlay; import org.codehaus.plexus.util.xml.Xpp3Dom; +import java.io.File; +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + /** * The concern of the project is provide runtime values based on the model.

* The values in the model remain untouched but during the process of building a @@ -258,11 +258,6 @@ public class MavenProject { // FIXME: This is hacky. What if module directory doesn't match artifactid, and parent // is coming from the repository?? - - // FIXME: If there is a hierarchy of three projects, with the url specified at the top, - // and the top two projects are referenced from copies that are in the repository, the - // middle-level POM doesn't have a File associated with it (or the file's directory is - // of an unexpected name), and module path adjustments fail. String module = moduleProject.getArtifactId(); File moduleFile = moduleProject.getFile();