cvs commit: maven-components/maven-mboot2/src/main/java MBoot.java

[brett]

brett       2005/04/03 22:31:29

  Modified:    maven-mboot2/src/main/java/download ArtifactDownloader.java
               maven-mboot2/src/main/java MBoot.java
  Log:
  surefire issues
  
  Revision  Changes    Path
  1.7       +2 -2      
maven-components/maven-mboot2/src/main/java/download/ArtifactDownloader.java
  
  Index: ArtifactDownloader.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-mboot2/src/main/java/download/ArtifactDownloader.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ArtifactDownloader.java   4 Apr 2005 05:23:01 -0000       1.6
  +++ ArtifactDownloader.java   4 Apr 2005 05:31:29 -0000       1.7
  @@ -60,10 +60,10 @@
           System.out.println( "Using the following proxy : " + proxyHost + "/" 
+ proxyPort );
       }
   
  -    public void downloadDependencies( List files )
  +    public void downloadDependencies( List dependencies )
           throws Exception
       {
  -        for ( Iterator j = files.iterator(); j.hasNext(); )
  +        for ( Iterator j = dependencies.iterator(); j.hasNext(); )
           {
               Dependency dep = (Dependency) j.next();
   
  
  
  
  1.88      +16 -1     maven-components/maven-mboot2/src/main/java/MBoot.java
  
  Index: MBoot.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-mboot2/src/main/java/MBoot.java,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- MBoot.java        4 Apr 2005 05:23:01 -0000       1.87
  +++ MBoot.java        4 Apr 2005 05:31:29 -0000       1.88
  @@ -280,7 +280,22 @@
   
           reader = new ModelReader( localRepository );
           reader.parse( new File( basedir, 
"maven-plugins/maven-surefire-plugin/pom.xml" ) );
  -        List surefireDependencies = reader.getDependencies();
  +        List surefireDependencies = new ArrayList();
  +
  +        // TODO: while we have maven-artifact in there, it needs to be 
filtered...
  +        for ( Iterator i = reader.getDependencies().iterator(); i.hasNext(); 
)
  +        {
  +            Dependency d = (Dependency) i.next();
  +            if ( d.getGroupId().equals( "surefire" ) )
  +            {
  +                surefireDependencies.add( d );
  +            }
  +        }
  +
  +        if ( online )
  +        {
  +            downloader.downloadDependencies( surefireDependencies );
  +        }
   
           reader = new ModelReader( localRepository );