You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by br...@apache.org on 2004/09/15 14:30:05 UTC
cvs commit: maven-components/maven-core/src/test/java/org/apache/maven MavenTestCase.java
brett 2004/09/15 05:30:05
Modified: maven-core/src/main/java/org/apache/maven/artifact/factory
DefaultArtifactFactory.java
maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase
GoalResolutionPhase.java
maven-core/src/main/java/org/apache/maven/lifecycle/goal
GoalNotFoundException.java MavenGoalPhase.java
MavenGoalPhaseManager.java
maven-core/src/main/java/org/apache/maven/lifecycle/session
AbstractMavenSessionPhase.java
DefaultMavenSessionPhaseManager.java
MavenSession.java MavenSessionPhase.java
maven-core/src/main/java/org/apache/maven/plugin
DefaultPluginManager.java PluginManager.java
maven-core/src/main/java/org/apache/maven/project
DefaultMavenProjectBuilder.java MavenProject.java
maven-core/src/main/java/org/apache/maven DefaultMaven.java
JarOverrideRequestTransformation.java Maven.java
maven-core/src/test/java/org/apache/maven/lifecycle/goal/phase
GoalResolutionPhaseTest.java
maven-core/src/test/java/org/apache/maven/plugin
PluginTest.java
maven-core/src/test/java/org/apache/maven/project/inheritance/t01
ProjectInheritanceTest.java
maven-core/src/test/java/org/apache/maven/project/inheritance
DefaultModelInheritanceAssemblerTest.java
ProjectInheritanceTestCase.java
maven-core/src/test/java/org/apache/maven/project/validation
DefaultModelValidatorTest.java
maven-core/src/test/java/org/apache/maven/project
AbstractProjectTestCase.java
ProjectBaseDirectoryAlignmentTest.java
maven-core/src/test/java/org/apache/maven MavenTestCase.java
Log:
optimize imports
Revision Changes Path
1.3 +0 -1 maven-components/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
Index: DefaultArtifactFactory.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultArtifactFactory.java 10 Aug 2004 17:59:30 -0000 1.2
+++ DefaultArtifactFactory.java 15 Sep 2004 12:30:04 -0000 1.3
@@ -18,7 +18,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Dependency;
1.3 +3 -11 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalResolutionPhase.java
Index: GoalResolutionPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalResolutionPhase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GoalResolutionPhase.java 26 Aug 2004 04:39:56 -0000 1.2
+++ GoalResolutionPhase.java 15 Sep 2004 12:30:04 -0000 1.3
@@ -16,23 +16,15 @@
* limitations under the License.
*/
-import org.apache.maven.lifecycle.goal.GoalNotFoundException;
import org.apache.maven.lifecycle.goal.AbstractMavenGoalPhase;
-import org.apache.maven.lifecycle.goal.MavenGoalExecutionContext;
-import org.apache.maven.lifecycle.goal.MavenGoalExecutionContext;
import org.apache.maven.lifecycle.goal.GoalExecutionException;
+import org.apache.maven.lifecycle.goal.MavenGoalExecutionContext;
import org.apache.maven.model.GoalDecorator;
-import org.apache.maven.model.PostGoal;
import org.apache.maven.model.PreGoal;
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
1.2 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/GoalNotFoundException.java
Index: GoalNotFoundException.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/GoalNotFoundException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GoalNotFoundException.java 15 Aug 2004 15:01:50 -0000 1.1
+++ GoalNotFoundException.java 15 Sep 2004 12:30:04 -0000 1.2
@@ -1,6 +1,6 @@
package org.apache.maven.lifecycle.goal;
-import org.apache.maven.lifecycle.goal.GoalExecutionException;
+
/*
* Copyright 2001-2004 The Apache Software Foundation.
1.2 +1 -2 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhase.java
Index: MavenGoalPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenGoalPhase.java 15 Aug 2004 15:01:50 -0000 1.1
+++ MavenGoalPhase.java 15 Sep 2004 12:30:04 -0000 1.2
@@ -17,7 +17,6 @@
*/
import org.codehaus.plexus.logging.Logger;
-import org.apache.maven.lifecycle.goal.MavenGoalExecutionContext;
/**
1.2 +1 -3 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhaseManager.java
Index: MavenGoalPhaseManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalPhaseManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenGoalPhaseManager.java 15 Aug 2004 15:01:50 -0000 1.1
+++ MavenGoalPhaseManager.java 15 Sep 2004 12:30:04 -0000 1.2
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.lifecycle.goal.MavenGoalExecutionContext;
-
import java.util.List;
/**
1.3 +1 -2 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/AbstractMavenSessionPhase.java
Index: AbstractMavenSessionPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/AbstractMavenSessionPhase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractMavenSessionPhase.java 26 Aug 2004 16:37:08 -0000 1.2
+++ AbstractMavenSessionPhase.java 15 Sep 2004 12:30:04 -0000 1.3
@@ -17,7 +17,6 @@
*/
import org.apache.maven.ExecutionResponse;
-
import org.codehaus.plexus.logging.AbstractLogEnabled;
/**
1.4 +1 -2 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/DefaultMavenSessionPhaseManager.java
Index: DefaultMavenSessionPhaseManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/DefaultMavenSessionPhaseManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultMavenSessionPhaseManager.java 26 Aug 2004 16:37:08 -0000 1.3
+++ DefaultMavenSessionPhaseManager.java 15 Sep 2004 12:30:04 -0000 1.4
@@ -17,7 +17,6 @@
*/
import org.apache.maven.ExecutionResponse;
-
import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.util.Iterator;
1.3 +2 -2 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSession.java
Index: MavenSession.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSession.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenSession.java 15 Aug 2004 15:01:51 -0000 1.2
+++ MavenSession.java 15 Sep 2004 12:30:04 -0000 1.3
@@ -7,8 +7,8 @@
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import java.util.Set;
import java.util.List;
+import java.util.Set;
/*
* Copyright 2001-2004 The Apache Software Foundation.
1.3 +1 -2 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSessionPhase.java
Index: MavenSessionPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSessionPhase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenSessionPhase.java 26 Aug 2004 16:37:08 -0000 1.2
+++ MavenSessionPhase.java 15 Sep 2004 12:30:04 -0000 1.3
@@ -17,7 +17,6 @@
*/
import org.apache.maven.ExecutionResponse;
-
import org.codehaus.plexus.logging.Logger;
/**
1.7 +1 -7 maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Index: DefaultPluginManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultPluginManager.java 2 Sep 2004 12:34:17 -0000 1.6
+++ DefaultPluginManager.java 15 Sep 2004 12:30:04 -0000 1.7
@@ -22,7 +22,6 @@
import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
import org.codehaus.plexus.ArtifactEnabledContainer;
import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.discovery.ComponentDiscoveryEvent;
import org.codehaus.plexus.component.discovery.ComponentDiscoveryListener;
import org.codehaus.plexus.component.repository.ComponentSetDescriptor;
@@ -35,12 +34,7 @@
import org.codehaus.plexus.util.dag.DAG;
import org.codehaus.plexus.util.dag.TopologicalSorter;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
public class DefaultPluginManager
extends AbstractLogEnabled
1.2 +1 -2 maven-components/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PluginManager.java 9 Aug 2004 19:02:36 -0000 1.1
+++ PluginManager.java 15 Sep 2004 12:30:04 -0000 1.2
@@ -18,7 +18,6 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
import java.util.List;
import java.util.Map;
1.10 +3 -19 maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Index: DefaultMavenProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultMavenProjectBuilder.java 15 Sep 2004 10:56:41 -0000 1.9
+++ DefaultMavenProjectBuilder.java 15 Sep 2004 12:30:04 -0000 1.10
@@ -17,8 +17,8 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.MavenMetadataSource;
import org.apache.maven.artifact.DefaultArtifact;
+import org.apache.maven.artifact.MavenMetadataSource;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
@@ -36,28 +36,12 @@
import org.apache.maven.repository.RepositoryUtils;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.util.CollectionUtils;
-import org.codehaus.plexus.util.PropertyUtils;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.dag.DAG;
import org.codehaus.plexus.util.dag.TopologicalSorter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Collection;
-import java.util.Collections;
+import java.io.*;
+import java.util.*;
public class DefaultMavenProjectBuilder
extends AbstractLogEnabled
1.5 +6 -18 maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Index: MavenProject.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MavenProject.java 2 Sep 2004 12:34:17 -0000 1.4
+++ MavenProject.java 15 Sep 2004 12:30:04 -0000 1.5
@@ -16,29 +16,17 @@
* limitations under the License.
*/
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.model.*;
+import org.apache.maven.repository.RepositoryUtils;
+import org.codehaus.plexus.util.StringUtils;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Set;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Build;
-import org.apache.maven.model.CiManagement;
-import org.apache.maven.model.Contributor;
-import org.apache.maven.model.Developer;
-import org.apache.maven.model.DistributionManagement;
-import org.apache.maven.model.IssueManagement;
-import org.apache.maven.model.License;
-import org.apache.maven.model.MailingList;
-import org.apache.maven.model.Local;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Organization;
-import org.apache.maven.model.Scm;
-import org.apache.maven.repository.RepositoryUtils;
-import org.codehaus.plexus.util.StringUtils;
/**
* The concern of the project is provide runtime values based on the model.
1.11 +1 -12 maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Index: DefaultMaven.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultMaven.java 15 Sep 2004 10:48:52 -0000 1.10
+++ DefaultMaven.java 15 Sep 2004 12:30:04 -0000 1.11
@@ -16,11 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.lifecycle.goal.MavenGoalExecutionContext;
-import org.apache.maven.lifecycle.goal.MavenGoalPhaseManager;
-import org.apache.maven.lifecycle.goal.MavenGoalExecutionContext;
-import org.apache.maven.lifecycle.goal.MavenGoalPhaseManager;
import org.apache.maven.lifecycle.goal.GoalNotFoundException;
import org.apache.maven.lifecycle.session.MavenSession;
import org.apache.maven.lifecycle.session.MavenSessionPhaseManager;
@@ -31,7 +26,6 @@
import org.apache.maven.project.ProjectBuildingException;
import org.codehaus.plexus.ArtifactEnabledContainer;
import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.i18n.I18N;
@@ -41,12 +35,7 @@
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
public class DefaultMaven
extends AbstractLogEnabled
1.3 +0 -3 maven-components/maven-core/src/main/java/org/apache/maven/JarOverrideRequestTransformation.java
Index: JarOverrideRequestTransformation.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/JarOverrideRequestTransformation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JarOverrideRequestTransformation.java 2 Sep 2004 12:34:17 -0000 1.2
+++ JarOverrideRequestTransformation.java 15 Sep 2004 12:30:04 -0000 1.3
@@ -17,11 +17,8 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.request.ArtifactRequestTransformation;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
import java.util.Map;
import java.util.Set;
1.4 +2 -4 maven-components/maven-core/src/main/java/org/apache/maven/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/Maven.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Maven.java 2 Sep 2004 12:34:17 -0000 1.3
+++ Maven.java 15 Sep 2004 12:30:04 -0000 1.4
@@ -16,12 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.lifecycle.goal.GoalNotFoundException;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.lifecycle.goal.GoalNotFoundException;
import java.io.File;
import java.util.List;
1.4 +2 -9 maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/goal/phase/GoalResolutionPhaseTest.java
Index: GoalResolutionPhaseTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/goal/phase/GoalResolutionPhaseTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GoalResolutionPhaseTest.java 2 Sep 2004 12:34:17 -0000 1.3
+++ GoalResolutionPhaseTest.java 15 Sep 2004 12:30:05 -0000 1.4
@@ -1,22 +1,15 @@
/* Created on Jul 14, 2004 */
package org.apache.maven.lifecycle.goal.phase;
+import org.apache.maven.MavenTestCase;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.lifecycle.goal.MavenGoalExecutionContext;
import org.apache.maven.model.Model;
import org.apache.maven.model.PostGoal;
import org.apache.maven.model.PreGoal;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.MavenTestCase;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
/**
* @author jdcasey
1.2 +3 -5 maven-components/maven-core/src/test/java/org/apache/maven/plugin/PluginTest.java
Index: PluginTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/plugin/PluginTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PluginTest.java 9 Aug 2004 19:02:38 -0000 1.1
+++ PluginTest.java 15 Sep 2004 12:30:05 -0000 1.2
@@ -18,17 +18,15 @@
import org.apache.maven.Maven;
import org.apache.maven.MavenTestCase;
+import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.PluginManager;
-import org.apache.maven.plugin.MavenPluginDescriptor;
import java.io.File;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
1.3 +1 -2 maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
Index: ProjectInheritanceTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProjectInheritanceTest.java 2 Sep 2004 12:34:18 -0000 1.2
+++ ProjectInheritanceTest.java 15 Sep 2004 12:30:05 -0000 1.3
@@ -3,7 +3,6 @@
*/
package org.apache.maven.project.inheritance.t01;
-import org.apache.maven.model.MailingList;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.ProjectInheritanceTestCase;
1.5 +0 -2 maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
Index: DefaultModelInheritanceAssemblerTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultModelInheritanceAssemblerTest.java 6 Sep 2004 12:10:27 -0000 1.4
+++ DefaultModelInheritanceAssemblerTest.java 15 Sep 2004 12:30:05 -0000 1.5
@@ -18,12 +18,10 @@
*/
import junit.framework.TestCase;
-
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.Resource;
import org.apache.maven.model.UnitTest;
-import org.apache.maven.project.MavenProject;
import java.util.Arrays;
import java.util.List;
1.3 +1 -2 maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java
Index: ProjectInheritanceTestCase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProjectInheritanceTestCase.java 2 Sep 2004 12:34:18 -0000 1.2
+++ ProjectInheritanceTestCase.java 15 Sep 2004 12:30:05 -0000 1.3
@@ -4,7 +4,6 @@
package org.apache.maven.project.inheritance;
import org.apache.maven.MavenTestCase;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.MavenProjectBuilder;
import java.io.File;
1.2 +4 -4 maven-components/maven-core/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
Index: DefaultModelValidatorTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultModelValidatorTest.java 9 Aug 2004 19:02:39 -0000 1.1
+++ DefaultModelValidatorTest.java 15 Sep 2004 12:30:05 -0000 1.2
@@ -4,12 +4,12 @@
* LICENSE
*/
-import java.io.FileReader;
-import java.io.Reader;
-
import org.apache.maven.MavenTestCase;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+
+import java.io.FileReader;
+import java.io.Reader;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
1.4 +0 -1 maven-components/maven-core/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java
Index: AbstractProjectTestCase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractProjectTestCase.java 2 Sep 2004 12:34:18 -0000 1.3
+++ AbstractProjectTestCase.java 15 Sep 2004 12:30:05 -0000 1.4
@@ -2,7 +2,6 @@
import org.apache.maven.MavenTestCase;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.codehaus.plexus.util.FileUtils;
import java.io.File;
1.3 +3 -4 maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
Index: ProjectBaseDirectoryAlignmentTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProjectBaseDirectoryAlignmentTest.java 2 Sep 2004 12:34:18 -0000 1.2
+++ ProjectBaseDirectoryAlignmentTest.java 15 Sep 2004 12:30:05 -0000 1.3
@@ -2,7 +2,6 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Resource;
-import org.apache.maven.wagon.repository.Repository;
import java.io.File;
@@ -32,13 +31,13 @@
assertTrue( resource.getDirectory().startsWith( basedir ) );
}
- /* TODO: why commented out?
+ /* TODO: why commented out? Gives a Wagonhttp warning and can't find parent POM
public void testProjectDirectoryBaseDirectoryAlignmentInheritance()
throws Exception
{
File f = new File( basedir, dir + "project-which-needs-directory-alignment-child.xml" );
- MavenProject project = projectBuilder.build( f, true, false );
+ MavenProject project = projectBuilder.build( f, false );
assertNotNull( "Test project can't be null!", project );
@@ -58,7 +57,7 @@
{
File f = new File( basedir, dir + "subproject/project-which-needs-directory-alignment-child.xml" );
- MavenProject project = projectBuilder.build( f, true, false );
+ MavenProject project = projectBuilder.build( f, false );
assertNotNull( "Test project can't be null!", project );
1.7 +1 -2 maven-components/maven-core/src/test/java/org/apache/maven/MavenTestCase.java
Index: MavenTestCase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/MavenTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MavenTestCase.java 2 Sep 2004 12:34:17 -0000 1.6
+++ MavenTestCase.java 15 Sep 2004 12:30:05 -0000 1.7
@@ -26,7 +26,6 @@
import org.codehaus.classworlds.ClassRealm;
import org.codehaus.classworlds.ClassWorld;
import org.codehaus.plexus.ArtifactEnabledPlexusTestCase;
-import org.codehaus.plexus.PlexusTestCase;
import java.io.File;
import java.util.ArrayList;