You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2004/01/31 07:29:44 UTC

cvs commit: maven-plugins/surefire plugin.jelly project.xml

jvanzyl     2004/01/30 22:29:44

  Modified:    surefire plugin.jelly project.xml
  Log:
  o functional and working with the new components
  
  Revision  Changes    Path
  1.3       +4 -11     maven-plugins/surefire/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/surefire/plugin.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.jelly	31 Jan 2004 05:53:40 -0000	1.2
  +++ plugin.jelly	31 Jan 2004 06:29:44 -0000	1.3
  @@ -37,14 +37,7 @@
           <j:if test="${context.getVariable('maven.test.source') != null}">
             <setProperty name="source" value="${maven.test.source}" />
           </j:if>
  -        <!--
  -        <classpath>
  -          <pathelement path="${maven.test.dest}"/>
  -          <pathelement path="${maven.build.dest}"/>
  -          <pathelement path="${pom.dependencyClasspath}"/>
  -          <pathelement path="${plugin.getDependencyPath('junit')}"/>
  -        </classpath>
  -        -->
  +
           <j:if test="${context.getVariable('maven.compile.compilerargs') != null}">
             <compilerarg line="${maven.compile.compilerargs}" />
           </j:if>
  @@ -83,10 +76,10 @@
   
       <j:if test="${unitTestSourcesPresent == 'true' and context.getVariable('maven.test.skip') != 'true'}">
   
  -      <j:useBean class="org.apache.maven.test.TestRunnerBooter" var="testRunner"/>
  +      <j:useBean class="org.apache.maven.test.SurefirePlugin" var="surefire"/>
   
  -      ${testRunner.setProject(pom)}
  -      ${testRunner.execute()}
  +      ${surefire.setProject(pom)}
  +      ${surefire.execute()}
   
         <j:set var="maven.test.failure" value="${testRunner.failures()}"/>
   
  
  
  
  1.4       +10 -0     maven-plugins/surefire/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/surefire/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	31 Jan 2004 05:53:40 -0000	1.3
  +++ project.xml	31 Jan 2004 06:29:44 -0000	1.4
  @@ -20,8 +20,18 @@
     <dependencies>
       <dependency>
         <groupId>maven</groupId>
  +      <artifactId>maven-model</artifactId>
  +      <version>2.0-SNAPSHOT</version>
  +    </dependency>
  +    <dependency>
  +      <groupId>maven</groupId>
         <artifactId>maven-project</artifactId>
         <version>2.0-SNAPSHOT</version>
  +    </dependency>
  +    <dependency>
  +      <groupId>surefire</groupId>
  +      <artifactId>surefire-booter</artifactId>
  +      <version>1.0</version>
       </dependency>
     </dependencies>
   </project>
  
  
  

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