maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: maven-components/maven-mboot2/src/main/java MBoot.java
Date Mon, 04 Apr 2005 01:40:16 GMT
brett       2005/04/03 18:40:16

  Modified:    maven-mboot2/src/main/java/download ArtifactDownloader.java
               maven-mboot2/src/main/java MBoot.java
  Log:
  mboot fixes
  
  Revision  Changes    Path
  1.4       +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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ArtifactDownloader.java	4 Apr 2005 01:36:58 -0000	1.3
  +++ ArtifactDownloader.java	4 Apr 2005 01:40:16 -0000	1.4
  @@ -88,7 +88,7 @@
           {
               Dependency dep = (Dependency) j.next();
   
  -            if ( !downloadedArtifacts.contains( dep ) )
  +            if ( !downloadedArtifacts.contains( dep.getId() ) )
               {
                   String repositoryPath = dep.getRepositoryPath();
                   File destinationFile = new File( mavenRepoLocal, repositoryPath );
  @@ -113,7 +113,7 @@
                       throw new Exception( "Failed to download " + dep );
                   }
   
  -                downloadedArtifacts.add( dep );
  +                downloadedArtifacts.add( dep.getId() );
               }
           }
       }
  
  
  
  1.82      +4 -4      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.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- MBoot.java	4 Apr 2005 01:36:58 -0000	1.81
  +++ MBoot.java	4 Apr 2005 01:40:16 -0000	1.82
  @@ -33,6 +33,7 @@
   public class MBoot
   {
       String[] pluginGeneratorDeps = new String[]{"plexus/jars/plexus-container-default-1.0-alpha-2.jar",
  +                                                "qdox/jars/qdox-1.2.jar",
                                                   "org.apache.maven/jars/maven-core-2.0-SNAPSHOT.jar",
                                                   "org.apache.maven/jars/maven-artifact-2.0-SNAPSHOT.jar",
                                                   "org.apache.maven/jars/maven-model-2.0-SNAPSHOT.jar",
  @@ -628,10 +629,9 @@
               File f = new File( repoLocal, dependency );
               if ( !f.exists() )
               {
  -                throw new FileNotFoundException( "Missing dependency: " + dependency +
  -                                                 ( !online
  -                                                   ? "; run again online"
  -                                                   : "; there was a problem downloading
it earlier" ) );
  +                throw new FileNotFoundException( "Missing dependency: " + dependency +
( !online
  +                                                                                      
  ? "; run again online"
  +                                                                                      
  : "; there was a problem downloading it earlier" ) );
               }
   
               cl.addURL( f.toURL() );
  
  
  

Mime
View raw message