maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject cvs commit: maven-components/maven-mboot2/src/main/java MBoot.java
Date Sat, 18 Sep 2004 04:22:07 GMT
jvanzyl     2004/09/17 21:22:07

  Modified:    .        mboot.jar
               maven-artifact pom.xml
               maven-core pom.xml
               maven-core/src/bin classworlds.conf
               maven-mboot2/src/main/java MBoot.java
  Log:
  o the assembly of the maven runtime more closely resembles what the
    plexus runtime generator produces so that i may attempt to use it
    some point in the near future
  
  o flipped back to 0.9-S of wagon until I run this on beaver to
    verify
  
  Revision  Changes    Path
  1.28      +113 -113  maven-components/mboot.jar
  
  	<<Binary file>>
  
  
  1.6       +2 -2      maven-components/maven-artifact/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/pom.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- pom.xml	18 Sep 2004 02:47:10 -0000	1.5
  +++ pom.xml	18 Sep 2004 04:22:07 -0000	1.6
  @@ -18,12 +18,12 @@
       <dependency>
         <groupId>maven</groupId>
         <artifactId>wagon-api</artifactId>
  -      <version>1.0-alpha-1-SNAPSHOT</version>
  +      <version>0.9-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>maven</groupId>
         <artifactId>wagon-http-lightweight</artifactId>
  -      <version>1.0-alpha-1-SNAPSHOT</version>
  +      <version>0.9-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </project>
  
  
  
  1.8       +1 -7      maven-components/maven-core/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/pom.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- pom.xml	17 Sep 2004 21:55:41 -0000	1.7
  +++ pom.xml	18 Sep 2004 04:22:07 -0000	1.8
  @@ -52,17 +52,11 @@
         <artifactId>ognl</artifactId>
         <version>2.5.1</version>
       </dependency>
  -    <!-- Wagon -->
       <dependency>
         <groupId>maven</groupId>
         <artifactId>wagon-api</artifactId>
         <version>1.0-alpha-1-SNAPSHOT</version>
  -    </dependency>
  -    <dependency>
  -      <groupId>maven</groupId>
  -      <artifactId>wagon-http-lightweight</artifactId>
  -      <version>1.0-alpha-1-SNAPSHOT</version>
  -    </dependency>
  +    </dependency>    
     </dependencies>
     <distributionManagement>
       <site>
  
  
  
  1.10      +1 -3      maven-components/maven-core/src/bin/classworlds.conf
  
  Index: classworlds.conf
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/bin/classworlds.conf,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- classworlds.conf	18 Sep 2004 02:24:48 -0000	1.9
  +++ classworlds.conf	18 Sep 2004 04:22:07 -0000	1.10
  @@ -3,9 +3,7 @@
   set maven.home default ${user.home}/m2
   
   [plexus.core]
  -load ${maven.home}/core/plexus-0.17-SNAPSHOT.jar
  -load ${maven.home}/core/xstream-1.0-SNAPSHOT.jar
  -load ${maven.home}/core/xpp3-1.1.3.3.jar
  +load ${maven.home}/core/*.jar
   
   [plexus.core.maven]
   load ${maven.home}/lib/*.jar
  
  
  
  1.28      +12 -11    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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- MBoot.java	18 Sep 2004 01:59:21 -0000	1.27
  +++ MBoot.java	18 Sep 2004 04:22:07 -0000	1.28
  @@ -51,18 +51,19 @@
           "xpp3/jars/xpp3-1.1.3.3.jar",
           "xstream/jars/xstream-1.0-SNAPSHOT.jar",
           "qdox/jars/qdox-1.2.jar",
  -        "maven/jars/wagon-http-lightweight-1.0-alpha-1-SNAPSHOT.jar"
  +        "maven/jars/wagon-http-lightweight-0.9-SNAPSHOT.jar"
       };
   
       String[] plexusDeps = new String[]
       {
           "classworlds/jars/classworlds-1.1-SNAPSHOT.jar",
           "plexus/jars/plexus-0.17-SNAPSHOT.jar",
  +        "plexus/jars/plexus-artifact-container-1.0-alpha-1-SNAPSHOT.jar",
           "xpp3/jars/xpp3-1.1.3.3.jar",
           "xstream/jars/xstream-1.0-SNAPSHOT.jar",
  -        //"maven/jars/maven-artifact-2.0-SNAPSHOT.jar",
  -        //"maven/jars/wagon-api-1.0-alpha-1-SNAPSHOT.jar",
  -        //"maven/jars/wagon-http-lightweight-1.0-alpha-1-SNAPSHOT.jar"
  +        "maven/jars/maven-artifact-2.0-SNAPSHOT.jar",
  +        "maven/jars/wagon-api-0.9-SNAPSHOT.jar",
  +        "maven/jars/wagon-http-lightweight-0.9-SNAPSHOT.jar"
       };
   
       String[] builds = new String[]
  @@ -322,13 +323,13 @@
               Dependency d = (Dependency) i.next();
   
               if ( d.getArtifactId().equals( "classworlds" ) ||
  -                d.artifactId.equals( "plexus" ) ||
  -                d.artifactId.equals( "xstream" ) ||
  -                d.artifactId.equals( "xpp3" ) //||
  -                //d.artifactId.equals( "junit" ) ||
  -                //d.artifactId.equals( "wagon-api" ) ||
  -                //d.artifactId.equals( "maven-artifact" ) 
  -)
  +                 d.artifactId.equals( "plexus" ) ||
  +                 d.artifactId.equals( "xstream" ) ||
  +                 d.artifactId.equals( "xpp3" ) ||
  +                 d.artifactId.equals( "junit" ) ||
  +                 d.artifactId.equals( "wagon-api" ) ||
  +                 d.artifactId.equals( "plexus-artifact-container" ) ||
  +                 d.artifactId.equals( "maven-artifact" ) )
               {
                   continue;
               }
  
  
  

Mime
View raw message