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 2004/03/29 01:02:04 UTC

cvs commit: maven-plugins/ant/src/plugin-test maven.xml

dion        2004/03/28 15:02:04

  Modified:    ant      project.xml
               ant/xdocs changes.xml
               ant/src/plugin-test maven.xml
  Log:
  Apply MPANT-11.
  
  The plugin tests are now clearer
  
  Revision  Changes    Path
  1.30      +1 -1      maven-plugins/ant/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/ant/project.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- project.xml	7 Mar 2004 00:24:26 -0000	1.29
  +++ project.xml	28 Mar 2004 23:02:04 -0000	1.30
  @@ -23,7 +23,7 @@
     <pomVersion>3</pomVersion>
     <id>maven-ant-plugin</id>
     <name>Maven Ant Plug-in</name>
  -  <currentVersion>1.6</currentVersion>
  +  <currentVersion>1.7-SNAPSHOT</currentVersion>
     <description>Generates ant build files from a maven project, so that plain ant users can build your project</description>
     <shortDescription>Generate Ant build file</shortDescription>
     <url>http://maven.apache.org/reference/plugins/ant/</url>
  
  
  
  1.15      +3 -0      maven-plugins/ant/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/ant/xdocs/changes.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- changes.xml	7 Mar 2004 00:24:26 -0000	1.14
  +++ changes.xml	28 Mar 2004 23:02:04 -0000	1.15
  @@ -24,6 +24,9 @@
       <author email="dion@multitask.com.au">dIon Gillard</author>
     </properties>
     <body>
  +    <release version="1.7" date="in CVS">
  +    </release>
  +    
       <release version="1.6" date="2004-03-07">
         <action dev="evenisse" type="fix" issue="MPANT-8">Use relative path for javadoc.</action>
         <action dev="dion" type="fix">Check unit test source dir exists before making relative path</action>
  
  
  
  1.3       +6 -7      maven-plugins/ant/src/plugin-test/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/ant/src/plugin-test/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- maven.xml	4 Mar 2004 17:59:03 -0000	1.2
  +++ maven.xml	28 Mar 2004 23:02:04 -0000	1.3
  @@ -16,19 +16,18 @@
    */
    -->
   <project xmlns:util="jelly:util"
  -         xmlns:j="jelly:core">
  +         xmlns:j="jelly:core"
  +         xmlns:assert="assert">
            
     <goal name="testPlugin" prereqs="test-ant">
       <attainGoal name="clean"/>
     </goal>
     
     <goal name="test-ant">
  -    <j:set var="expectedFile" value="${basedir}/build.xml"/>
       <attainGoal name="ant"/>
  -    <util:file var="buildXml" name="${expectedFile}" />
  -    <j:if test="${!(buildXml.exists())}">
  -      <fail>build.xml not generated</fail>
  -    </j:if>
  -    <delete file="${expectedFile}"/>
  +    
  +    <assert:assertFileExists file="${basedir}/build.xml"/>
  +
  +    <delete file="${basedir}/build.xml"/>
     </goal>
   </project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org