Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removing incorrect FIXME comment and returning import ordering to normal. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@426114 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2006-07-27 16:08:51 +00:00
parent 75c7380801
commit d70e316446
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
maven-project/src/main/java/org/apache/maven/project/MavenProject.java
View File

@ -16,18 +16,6 @@ package org.apache.maven.project;
* limitations under the License. * 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.Artifact;
import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.DependencyResolutionRequiredException; 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.apache.maven.project.overlay.BuildOverlay;
import org.codehaus.plexus.util.xml.Xpp3Dom; 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. <p/> * The concern of the project is provide runtime values based on the model. <p/>
* The values in the model remain untouched but during the process of building a * 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 // FIXME: This is hacky. What if module directory doesn't match artifactid, and parent
// is coming from the repository?? // 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(); String module = moduleProject.getArtifactId();
File moduleFile = moduleProject.getFile(); File moduleFile = moduleProject.getFile();