You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/01/02 02:30:22 UTC

cvs commit: jakarta-turbine-maven/src/java/org/apache/maven DependencyClasspathBuilder.java ArtifactListBuilder.java AbstractMavenComponent.java

dion        2003/01/01 17:30:22

  Modified:    src/java/org/apache/maven/cli App.java
               src/java/org/apache/maven DependencyClasspathBuilder.java
                        ArtifactListBuilder.java
                        AbstractMavenComponent.java
  Log:
  Code cleanup
  
  Revision  Changes    Path
  1.17      +3 -2      jakarta-turbine-maven/src/java/org/apache/maven/cli/App.java
  
  Index: App.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/cli/App.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- App.java	31 Dec 2002 07:02:47 -0000	1.16
  +++ App.java	2 Jan 2003 01:30:22 -0000	1.17
  @@ -390,7 +390,8 @@
   
           mavenSession = new MavenSession();
           mavenSession.setRootContext( getRootContext() );
  -        mavenSession.setRootDescriptorFile( getDescriptorFile() );
  +        // note: setRootDescriptor file is a static method
  +        MavenSession.setRootDescriptorFile( getDescriptorFile() );
           mavenSession.addGoalNames( getCli().getArgList() );
       }
   
  
  
  
  1.8       +1 -2      jakarta-turbine-maven/src/java/org/apache/maven/DependencyClasspathBuilder.java
  
  Index: DependencyClasspathBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/DependencyClasspathBuilder.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DependencyClasspathBuilder.java	31 Dec 2002 07:00:10 -0000	1.7
  +++ DependencyClasspathBuilder.java	2 Jan 2003 01:30:22 -0000	1.8
  @@ -59,7 +59,6 @@
   import org.apache.maven.project.Dependency;
   import org.apache.maven.project.Project;
   import org.apache.maven.repository.Artifact;
  -import org.apache.tools.ant.types.Path;
   
   import java.util.Iterator;
   
  
  
  
  1.5       +1 -2      jakarta-turbine-maven/src/java/org/apache/maven/ArtifactListBuilder.java
  
  Index: ArtifactListBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ArtifactListBuilder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ArtifactListBuilder.java	31 Dec 2002 06:59:56 -0000	1.4
  +++ ArtifactListBuilder.java	2 Jan 2003 01:30:22 -0000	1.5
  @@ -56,7 +56,6 @@
    * ====================================================================
    */
   
  -import org.apache.maven.jelly.MavenJellyContext;
   import org.apache.maven.project.Dependency;
   import org.apache.maven.project.Project;
   import org.apache.maven.repository.Artifact;
  
  
  
  1.6       +1 -2      jakarta-turbine-maven/src/java/org/apache/maven/AbstractMavenComponent.java
  
  Index: AbstractMavenComponent.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/AbstractMavenComponent.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractMavenComponent.java	31 Dec 2002 06:59:51 -0000	1.5
  +++ AbstractMavenComponent.java	2 Jan 2003 01:30:22 -0000	1.6
  @@ -56,7 +56,6 @@
    * ====================================================================
    */
   
  -import org.apache.maven.jelly.MavenJellyContext;
   import org.apache.maven.project.Project;
   
   /**