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:34:17 UTC
cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/project/helpers ProjectTestHelper.java
brett 2004/09/15 05:34:17
Modified: maven-core/src/main/java/org/apache/maven DefaultMaven.java
maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase
GoalResolutionPhase.java
maven-core/src/main/java/org/apache/maven/plugin
DefaultPluginManager.java
maven-core/src/main/java/org/apache/maven/project
DefaultMavenProjectBuilder.java MavenProject.java
maven-core/src/test/java/org/apache/maven/lifecycle/goal/phase
GoalResolutionPhaseTest.java
maven-core/src/test/java/org/apache/maven/project/helpers
ProjectTestHelper.java
Log:
optimize imports
Revision Changes Path
1.12 +6 -1 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultMaven.java 15 Sep 2004 12:30:04 -0000 1.11
+++ DefaultMaven.java 15 Sep 2004 12:34:16 -0000 1.12
@@ -35,7 +35,12 @@
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
public class DefaultMaven
extends AbstractLogEnabled
1.4 +7 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GoalResolutionPhase.java 15 Sep 2004 12:30:04 -0000 1.3
+++ GoalResolutionPhase.java 15 Sep 2004 12:34:16 -0000 1.4
@@ -24,7 +24,12 @@
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
1.8 +6 -1 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultPluginManager.java 15 Sep 2004 12:30:04 -0000 1.7
+++ DefaultPluginManager.java 15 Sep 2004 12:34:16 -0000 1.8
@@ -34,7 +34,12 @@
import org.codehaus.plexus.util.dag.DAG;
import org.codehaus.plexus.util.dag.TopologicalSorter;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
public class DefaultPluginManager
extends AbstractLogEnabled
1.11 +14 -2 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultMavenProjectBuilder.java 15 Sep 2004 12:30:04 -0000 1.10
+++ DefaultMavenProjectBuilder.java 15 Sep 2004 12:34:16 -0000 1.11
@@ -40,8 +40,20 @@
import org.codehaus.plexus.util.dag.DAG;
import org.codehaus.plexus.util.dag.TopologicalSorter;
-import java.io.*;
-import java.util.*;
+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;
public class DefaultMavenProjectBuilder
extends AbstractLogEnabled
1.6 +11 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MavenProject.java 15 Sep 2004 12:30:04 -0000 1.5
+++ MavenProject.java 15 Sep 2004 12:34:16 -0000 1.6
@@ -18,7 +18,17 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.*;
+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.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;
1.5 +7 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GoalResolutionPhaseTest.java 15 Sep 2004 12:30:05 -0000 1.4
+++ GoalResolutionPhaseTest.java 15 Sep 2004 12:34:16 -0000 1.5
@@ -9,7 +9,13 @@
import org.apache.maven.model.PreGoal;
import org.apache.maven.project.MavenProject;
-import java.util.*;
+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;
/**
* @author jdcasey
1.2 +11 -2 maven-components/maven-core/src/test/java/org/apache/maven/project/helpers/ProjectTestHelper.java
Index: ProjectTestHelper.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/helpers/ProjectTestHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProjectTestHelper.java 9 Aug 2004 19:02:39 -0000 1.1
+++ ProjectTestHelper.java 15 Sep 2004 12:34:17 -0000 1.2
@@ -17,7 +17,16 @@
*/
import junit.framework.TestCase;
-import org.apache.maven.model.*;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Contributor;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Developer;
+import org.apache.maven.model.DistributionManagement;
+import org.apache.maven.model.MailingList;
+import org.apache.maven.model.Repository;
+import org.apache.maven.model.Resource;
+import org.apache.maven.model.Site;
+import org.apache.maven.model.UnitTest;
import org.apache.maven.project.MavenProject;
/**
Re: code style was: cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/project/helpers ProjectTestHelper.java
Posted by Emmanuel Venisse <em...@venisse.net>.
> > > If you (or anyone else) want I can upload a version.
> >
> > Yes, please.
>
> http://apache.org/~trygvis/jason-style.xml
Thanks.
Emmanuel
Re: code style was: cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/project/helpers ProjectTestHelper.java
Posted by Trygve Laugstøl <tr...@student.matnat.uio.no>.
On Thu, Sep 16, 2004 at 09:35:06AM +0200, Emmanuel Venisse wrote:
> > On Wed, Sep 15, 2004 at 10:38:12PM +1000, Brett Porter wrote:
> > > Sorry about that. Coming to grips with my IntelliJ settings :)
> > >
> > > Do we have the any code style guidelines documented anywhere? Both IDEA
> > > and Eclipse can import from a file now, so it might be worth coming up
> > > with standard ones and feeding it into them, and matching it up to
> > > checkstyle.
> >
> > I have a "Jason" profile in eclipse that I'm using to format the code. Can
> > IDEA read those files?
> >
> > The only issue I have with it is that it keeps on placing the throws
> > clauses in "foo() throws BarException" on a single line.
> >
> > If you (or anyone else) want I can upload a version.
>
> Yes, please.
http://apache.org/~trygvis/jason-style.xml
--
Trygve
>
> >
> > --
> > Trygve
>
Re: code style was: cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/project/helpers ProjectTestHelper.java
Posted by Emmanuel Venisse <em...@venisse.net>.
> On Wed, Sep 15, 2004 at 10:38:12PM +1000, Brett Porter wrote:
> > Sorry about that. Coming to grips with my IntelliJ settings :)
> >
> > Do we have the any code style guidelines documented anywhere? Both IDEA
> > and Eclipse can import from a file now, so it might be worth coming up
> > with standard ones and feeding it into them, and matching it up to
> > checkstyle.
>
> I have a "Jason" profile in eclipse that I'm using to format the code. Can
> IDEA read those files?
>
> The only issue I have with it is that it keeps on placing the throws
> clauses in "foo() throws BarException" on a single line.
>
> If you (or anyone else) want I can upload a version.
Yes, please.
>
> --
> Trygve
Re: code style was: cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/project/helpers ProjectTestHelper.java
Posted by Trygve Laugstøl <tr...@student.matnat.uio.no>.
On Wed, Sep 15, 2004 at 10:38:12PM +1000, Brett Porter wrote:
> Sorry about that. Coming to grips with my IntelliJ settings :)
>
> Do we have the any code style guidelines documented anywhere? Both IDEA
> and Eclipse can import from a file now, so it might be worth coming up
> with standard ones and feeding it into them, and matching it up to
> checkstyle.
I have a "Jason" profile in eclipse that I'm using to format the code. Can
IDEA read those files?
The only issue I have with it is that it keeps on placing the throws
clauses in "foo() throws BarException" on a single line.
If you (or anyone else) want I can upload a version.
--
Trygve
>
> I'm not that anal about being able to read the code, but its nice to be
> able to use IntelliJ's reformat without fear of making a whole bunch of
> other unexpected changes.
>
> Cheers,
> Brett
>
> brett@apache.org wrote:
>
> >brett 2004/09/15 05:34:17
> >
> > Modified: maven-core/src/main/java/org/apache/maven DefaultMaven.java
> > maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase
> > GoalResolutionPhase.java
> > maven-core/src/main/java/org/apache/maven/plugin
> > DefaultPluginManager.java
> > maven-core/src/main/java/org/apache/maven/project
> > DefaultMavenProjectBuilder.java MavenProject.java
> > maven-core/src/test/java/org/apache/maven/lifecycle/goal/phase
> > GoalResolutionPhaseTest.java
> > maven-core/src/test/java/org/apache/maven/project/helpers
> > ProjectTestHelper.java
> > Log:
> > optimize imports
> >
> > Revision Changes Path
> > 1.12 +6 -1
> > 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.11
> > retrieving revision 1.12
> > diff -u -r1.11 -r1.12
> > --- DefaultMaven.java 15 Sep 2004 12:30:04 -0000 1.11
> > +++ DefaultMaven.java 15 Sep 2004 12:34:16 -0000 1.12
> > @@ -35,7 +35,12 @@
> > import org.codehaus.plexus.util.StringUtils;
> >
> > import java.io.File;
> > -import java.util.*;
> > +import java.util.ArrayList;
> > +import java.util.Arrays;
> > +import java.util.Date;
> > +import java.util.Iterator;
> > +import java.util.List;
> > +import java.util.Map;
> >
> > public class DefaultMaven
> > extends AbstractLogEnabled
> >
> >
> >
> > 1.4 +7 -2
> > 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.3
> > retrieving revision 1.4
> > diff -u -r1.3 -r1.4
> > --- GoalResolutionPhase.java 15 Sep 2004 12:30:04 -0000 1.3
> > +++ GoalResolutionPhase.java 15 Sep 2004 12:34:16 -0000 1.4
> > @@ -24,7 +24,12 @@
> > import org.apache.maven.plugin.PluginManager;
> > import org.apache.maven.plugin.descriptor.MojoDescriptor;
> >
> > -import java.util.*;
> > +import java.util.Collections;
> > +import java.util.HashSet;
> > +import java.util.Iterator;
> > +import java.util.LinkedList;
> > +import java.util.List;
> > +import java.util.Set;
> >
> > /**
> > * @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
> >
> >
> >
> > 1.8 +6 -1
> > 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.7
> > retrieving revision 1.8
> > diff -u -r1.7 -r1.8
> > --- DefaultPluginManager.java 15 Sep 2004 12:30:04 -0000 1.7
> > +++ DefaultPluginManager.java 15 Sep 2004 12:34:16 -0000 1.8
> > @@ -34,7 +34,12 @@
> > import org.codehaus.plexus.util.dag.DAG;
> > import org.codehaus.plexus.util.dag.TopologicalSorter;
> >
> > -import java.util.*;
> > +import java.util.HashMap;
> > +import java.util.HashSet;
> > +import java.util.Iterator;
> > +import java.util.List;
> > +import java.util.Map;
> > +import java.util.Set;
> >
> > public class DefaultPluginManager
> > extends AbstractLogEnabled
> >
> >
> >
> > 1.11 +14 -2
> > 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.10
> > retrieving revision 1.11
> > diff -u -r1.10 -r1.11
> > --- DefaultMavenProjectBuilder.java 15 Sep 2004 12:30:04 -0000 1.10
> > +++ DefaultMavenProjectBuilder.java 15 Sep 2004 12:34:16 -0000 1.11
> > @@ -40,8 +40,20 @@
> > import org.codehaus.plexus.util.dag.DAG;
> > import org.codehaus.plexus.util.dag.TopologicalSorter;
> >
> > -import java.io.*;
> > -import java.util.*;
> > +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;
> >
> > public class DefaultMavenProjectBuilder
> > extends AbstractLogEnabled
> >
> >
> >
> > 1.6 +11 -1
> > 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.5
> > retrieving revision 1.6
> > diff -u -r1.5 -r1.6
> > --- MavenProject.java 15 Sep 2004 12:30:04 -0000 1.5
> > +++ MavenProject.java 15 Sep 2004 12:34:16 -0000 1.6
> > @@ -18,7 +18,17 @@
> >
> > import org.apache.maven.artifact.Artifact;
> > import org.apache.maven.artifact.repository.ArtifactRepository;
> > -import org.apache.maven.model.*;
> > +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.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;
> >
> >
> >
> >
> > 1.5 +7 -1
> > 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.4
> > retrieving revision 1.5
> > diff -u -r1.4 -r1.5
> > --- GoalResolutionPhaseTest.java 15 Sep 2004 12:30:05 -0000 1.4
> > +++ GoalResolutionPhaseTest.java 15 Sep 2004 12:34:16 -0000 1.5
> > @@ -9,7 +9,13 @@
> > import org.apache.maven.model.PreGoal;
> > import org.apache.maven.project.MavenProject;
> >
> > -import java.util.*;
> > +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;
> >
> > /**
> > * @author jdcasey
> >
> >
> >
> > 1.2 +11 -2
> > maven-components/maven-core/src/test/java/org/apache/maven/project/helpers/ProjectTestHelper.java
> >
> > Index: ProjectTestHelper.java
> > ===================================================================
> > RCS file:
> > /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/helpers/ProjectTestHelper.java,v
> > retrieving revision 1.1
> > retrieving revision 1.2
> > diff -u -r1.1 -r1.2
> > --- ProjectTestHelper.java 9 Aug 2004 19:02:39 -0000 1.1
> > +++ ProjectTestHelper.java 15 Sep 2004 12:34:17 -0000 1.2
> > @@ -17,7 +17,16 @@
> > */
> >
> > import junit.framework.TestCase;
> > -import org.apache.maven.model.*;
> > +import org.apache.maven.model.Build;
> > +import org.apache.maven.model.Contributor;
> > +import org.apache.maven.model.Dependency;
> > +import org.apache.maven.model.Developer;
> > +import org.apache.maven.model.DistributionManagement;
> > +import org.apache.maven.model.MailingList;
> > +import org.apache.maven.model.Repository;
> > +import org.apache.maven.model.Resource;
> > +import org.apache.maven.model.Site;
> > +import org.apache.maven.model.UnitTest;
> > import org.apache.maven.project.MavenProject;
> >
> > /**
> >
> >
> >
> >
> >
> >
> >
>
code style was: cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/project/helpers
ProjectTestHelper.java
Posted by Brett Porter <br...@apache.org>.
Sorry about that. Coming to grips with my IntelliJ settings :)
Do we have the any code style guidelines documented anywhere? Both IDEA
and Eclipse can import from a file now, so it might be worth coming up
with standard ones and feeding it into them, and matching it up to
checkstyle.
I'm not that anal about being able to read the code, but its nice to be
able to use IntelliJ's reformat without fear of making a whole bunch of
other unexpected changes.
Cheers,
Brett
brett@apache.org wrote:
>brett 2004/09/15 05:34:17
>
> Modified: maven-core/src/main/java/org/apache/maven DefaultMaven.java
> maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase
> GoalResolutionPhase.java
> maven-core/src/main/java/org/apache/maven/plugin
> DefaultPluginManager.java
> maven-core/src/main/java/org/apache/maven/project
> DefaultMavenProjectBuilder.java MavenProject.java
> maven-core/src/test/java/org/apache/maven/lifecycle/goal/phase
> GoalResolutionPhaseTest.java
> maven-core/src/test/java/org/apache/maven/project/helpers
> ProjectTestHelper.java
> Log:
> optimize imports
>
> Revision Changes Path
> 1.12 +6 -1 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.11
> retrieving revision 1.12
> diff -u -r1.11 -r1.12
> --- DefaultMaven.java 15 Sep 2004 12:30:04 -0000 1.11
> +++ DefaultMaven.java 15 Sep 2004 12:34:16 -0000 1.12
> @@ -35,7 +35,12 @@
> import org.codehaus.plexus.util.StringUtils;
>
> import java.io.File;
> -import java.util.*;
> +import java.util.ArrayList;
> +import java.util.Arrays;
> +import java.util.Date;
> +import java.util.Iterator;
> +import java.util.List;
> +import java.util.Map;
>
> public class DefaultMaven
> extends AbstractLogEnabled
>
>
>
> 1.4 +7 -2 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.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- GoalResolutionPhase.java 15 Sep 2004 12:30:04 -0000 1.3
> +++ GoalResolutionPhase.java 15 Sep 2004 12:34:16 -0000 1.4
> @@ -24,7 +24,12 @@
> import org.apache.maven.plugin.PluginManager;
> import org.apache.maven.plugin.descriptor.MojoDescriptor;
>
> -import java.util.*;
> +import java.util.Collections;
> +import java.util.HashSet;
> +import java.util.Iterator;
> +import java.util.LinkedList;
> +import java.util.List;
> +import java.util.Set;
>
> /**
> * @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
>
>
>
> 1.8 +6 -1 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.7
> retrieving revision 1.8
> diff -u -r1.7 -r1.8
> --- DefaultPluginManager.java 15 Sep 2004 12:30:04 -0000 1.7
> +++ DefaultPluginManager.java 15 Sep 2004 12:34:16 -0000 1.8
> @@ -34,7 +34,12 @@
> import org.codehaus.plexus.util.dag.DAG;
> import org.codehaus.plexus.util.dag.TopologicalSorter;
>
> -import java.util.*;
> +import java.util.HashMap;
> +import java.util.HashSet;
> +import java.util.Iterator;
> +import java.util.List;
> +import java.util.Map;
> +import java.util.Set;
>
> public class DefaultPluginManager
> extends AbstractLogEnabled
>
>
>
> 1.11 +14 -2 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.10
> retrieving revision 1.11
> diff -u -r1.10 -r1.11
> --- DefaultMavenProjectBuilder.java 15 Sep 2004 12:30:04 -0000 1.10
> +++ DefaultMavenProjectBuilder.java 15 Sep 2004 12:34:16 -0000 1.11
> @@ -40,8 +40,20 @@
> import org.codehaus.plexus.util.dag.DAG;
> import org.codehaus.plexus.util.dag.TopologicalSorter;
>
> -import java.io.*;
> -import java.util.*;
> +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;
>
> public class DefaultMavenProjectBuilder
> extends AbstractLogEnabled
>
>
>
> 1.6 +11 -1 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.5
> retrieving revision 1.6
> diff -u -r1.5 -r1.6
> --- MavenProject.java 15 Sep 2004 12:30:04 -0000 1.5
> +++ MavenProject.java 15 Sep 2004 12:34:16 -0000 1.6
> @@ -18,7 +18,17 @@
>
> import org.apache.maven.artifact.Artifact;
> import org.apache.maven.artifact.repository.ArtifactRepository;
> -import org.apache.maven.model.*;
> +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.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;
>
>
>
>
> 1.5 +7 -1 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.4
> retrieving revision 1.5
> diff -u -r1.4 -r1.5
> --- GoalResolutionPhaseTest.java 15 Sep 2004 12:30:05 -0000 1.4
> +++ GoalResolutionPhaseTest.java 15 Sep 2004 12:34:16 -0000 1.5
> @@ -9,7 +9,13 @@
> import org.apache.maven.model.PreGoal;
> import org.apache.maven.project.MavenProject;
>
> -import java.util.*;
> +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;
>
> /**
> * @author jdcasey
>
>
>
> 1.2 +11 -2 maven-components/maven-core/src/test/java/org/apache/maven/project/helpers/ProjectTestHelper.java
>
> Index: ProjectTestHelper.java
> ===================================================================
> RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/helpers/ProjectTestHelper.java,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- ProjectTestHelper.java 9 Aug 2004 19:02:39 -0000 1.1
> +++ ProjectTestHelper.java 15 Sep 2004 12:34:17 -0000 1.2
> @@ -17,7 +17,16 @@
> */
>
> import junit.framework.TestCase;
> -import org.apache.maven.model.*;
> +import org.apache.maven.model.Build;
> +import org.apache.maven.model.Contributor;
> +import org.apache.maven.model.Dependency;
> +import org.apache.maven.model.Developer;
> +import org.apache.maven.model.DistributionManagement;
> +import org.apache.maven.model.MailingList;
> +import org.apache.maven.model.Repository;
> +import org.apache.maven.model.Resource;
> +import org.apache.maven.model.Site;
> +import org.apache.maven.model.UnitTest;
> import org.apache.maven.project.MavenProject;
>
> /**
>
>
>
>
>
>
>