jvanzyl     2003/11/24 13:25:14

  Modified:    .        build-bootstrap.xml maven.xml
  Log:
  o bootstrap is happy
  
    i will now look at the plugin testing mechanism and have each plugin
  responsible for executing it's own tests as part of the build instead of
  it being triggered by the bootstrap.
  
  Revision  Changes    Path
  1.211     +8 -0      maven/build-bootstrap.xml
  
  Index: build-bootstrap.xml
  ===================================================================
  RCS file: /home/cvs/maven/build-bootstrap.xml,v
  retrieving revision 1.210
  retrieving revision 1.211
  diff -u -r1.210 -r1.211
  --- build-bootstrap.xml       24 Nov 2003 21:06:22 -0000      1.210
  +++ build-bootstrap.xml       24 Nov 2003 21:25:14 -0000      1.211
  @@ -346,6 +346,13 @@
       <chmod file="${maven.home}/bin/maven" perm="+x"/>
   
       <!-- run plugin test projects -->
  +
  +    <!--
  +
  +    This needs to be decoupled and moved and it appears to be
  +    coupled to src/plugins-build. I will fix shortly but I want the
  +    bootstrap to work in the interim.
  +
       <exec executable="${maven.command}" failonerror="true">
         <arg value="-Dmaven.home.local=${maven.home.local}"/>
         <arg value="-Dmaven.repo.local=${maven.repo.local}"/>
  @@ -353,6 +360,7 @@
         <arg value="clean"/>
         <arg value="maven:plugin-test"/>
       </exec>
  +    -->
   
   
     </target>
  
  
  
  1.97      +4 -2      maven/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/maven/maven.xml,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- maven.xml 24 Nov 2003 20:18:00 -0000      1.96
  +++ maven.xml 24 Nov 2003 21:25:14 -0000      1.97
  @@ -77,13 +77,15 @@
     <!-- ================================================================== -->
     <!-- R U N   P L U G I N   T E S T S                                    -->
     <!-- ================================================================== -->
  +  <!--
     <goal name="maven:plugin-test">
  -    <j:set var="maven.multiproject.includes" 
  +    <j:set var="maven.multiproject.includes"
         value="*/src/plugin-test/project.xml" />
       <j:set var="goal" value="testPlugin"/>
       <attainGoal name="multiproject:goal" />
     </goal>
  -    
  +  -->
  +
     <goal name="maven:jar-install"
           description="Compile Maven and put a new jar in ${maven.home}/lib.">
       <attainGoal name="jar:jar"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to