You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by ev...@apache.org on 2004/06/27 15:24:13 UTC
cvs commit: maven-components/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test SurefireFailureResponse.java SurefirePlugin.java
evenisse 2004/06/27 06:24:13
Modified: maven-core pom.xml
maven-mboot/src/bash deps maven.functions
maven-plugins/maven-surefire-plugin pom.xml
maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test
SurefirePlugin.java
Added: maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test
SurefireFailureResponse.java
Log:
- Use surefire 1.1
- Build failed now when we have failures in tests
Revision Changes Path
1.3 +30 -1 maven-components/maven-core/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pom.xml 20 Jun 2004 02:02:18 -0000 1.2
+++ pom.xml 27 Jun 2004 13:24:13 -0000 1.3
@@ -76,7 +76,7 @@
<dependency>
<groupId>surefire</groupId>
<artifactId>surefire-booter</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</dependency>
<!-- Wagon -->
<dependency>
@@ -109,6 +109,35 @@
<groupId>qdox</groupId>
<artifactId>qdox</artifactId>
<version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>jcoverage</groupId>
+ <artifactId>jcoverage</artifactId>
+ <version>1.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>bcel</groupId>
+ <artifactId>bcel</artifactId>
+ <version>5.1</version>
+ <url>http://jakarta.apache.org/bcel/</url>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <url>http://jakarta.apache.org/log4j/</url>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.7</version>
+ <url>http://jakarta.apache.org/oro/</url>
+ </dependency>
+ <dependency>
+ <groupId>urbanophile</groupId>
+ <artifactId>java-getopt</artifactId>
+ <version>1.0.9</version>
+ <url>http://www.urbanophile.com/arenn/hacking/download.html</url>
</dependency>
</dependencies>
</project>
1.4 +2 -2 maven-components/maven-mboot/src/bash/deps
Index: deps
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot/src/bash/deps,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- deps 16 May 2004 04:31:26 -0000 1.3
+++ deps 27 Jun 2004 13:24:13 -0000 1.4
@@ -1,6 +1,6 @@
junit/jars/junit-3.8.1.jar
-surefire/jars/surefire-booter-1.0.jar
-surefire/jars/surefire-1.0.jar
+surefire/jars/surefire-booter-1.1.jar
+surefire/jars/surefire-1.1.jar
modello/jars/modello-1.0-SNAPSHOT.jar
xpp3/jars/xpp3-1.1.3.3.jar
xstream/jars/xstream-1.0-SNAPSHOT.jar
1.42 +1 -1 maven-components/maven-mboot/src/bash/maven.functions
Index: maven.functions
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot/src/bash/maven.functions,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- maven.functions 9 Jun 2004 03:10:50 -0000 1.41
+++ maven.functions 27 Jun 2004 13:24:13 -0000 1.42
@@ -257,7 +257,7 @@
# We only need the booter jar in the classpath, it will load everything else.
- runTests ".:${MBOOT_HOME}/classes:$repoLocal/surefire/jars/surefire-booter-1.0.jar" "$1" "$repoLocal" bootstrap.libs bootstrap.tests.includes bootstrap.tests.excludes
+ runTests ".:${MBOOT_HOME}/classes:$repoLocal/surefire/jars/surefire-booter-1.1.jar" "$1" "$repoLocal" bootstrap.libs bootstrap.tests.includes bootstrap.tests.excludes
if [ "$2" = "default" ]
then
1.2 +6 -1 maven-components/maven-plugins/maven-surefire-plugin/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/maven-surefire-plugin/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pom.xml 9 Jun 2004 03:10:50 -0000 1.1
+++ pom.xml 27 Jun 2004 13:24:13 -0000 1.2
@@ -14,8 +14,13 @@
<dependencies>
<dependency>
<groupId>surefire</groupId>
+ <artifactId>surefire</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>surefire</groupId>
<artifactId>surefire-booter</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</dependency>
</dependencies>
</project>
1.12 +8 -3 maven-components/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
Index: SurefirePlugin.java
===================================================================
RCS file: /home/cvs/maven-components/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SurefirePlugin.java 22 Jun 2004 17:03:45 -0000 1.11
+++ SurefirePlugin.java 27 Jun 2004 13:24:13 -0000 1.12
@@ -110,7 +110,7 @@
surefireBooter.addClassPathUrl( new File( mavenRepoLocal, "junit/jars/junit-3.8.1.jar" ).getPath() );
- surefireBooter.addClassPathUrl( new File( mavenRepoLocal, "surefire/jars/surefire-1.0.jar" ).getPath() );
+ surefireBooter.addClassPathUrl( new File( mavenRepoLocal, "surefire/jars/surefire-1.1.jar" ).getPath() );
surefireBooter.addClassPathUrl( new File( classesDirectory ).getPath() );
@@ -123,6 +123,11 @@
surefireBooter.addReport( "org.codehaus.surefire.report.ConsoleReport" );
- surefireBooter.run();
+ boolean success = surefireBooter.run();
+
+ if ( !success )
+ {
+ response.setExecutionFailure( true, new SurefireFailureResponse( null ) );
+ }
}
}
1.1 maven-components/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefireFailureResponse.java
Index: SurefireFailureResponse.java
===================================================================
package org.apache.maven.test;
import org.apache.maven.plugin.FailureResponse;
import java.util.List;
import java.util.Iterator;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id: SurefireFailureResponse.java,v 1.1 2004/06/27 13:24:13 evenisse Exp $
*/
public class SurefireFailureResponse
extends FailureResponse
{
private String LS = System.getProperty( "line.separator" );
private String message;
public SurefireFailureResponse( Object o )
{
super( o );
}
public String shortMessage()
{
return "There are some test failures.";
}
public String longMessage()
{
return shortMessage();
}
}
Re: cvs commit:maven-components/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/testSurefireFailureResponse.java SurefirePlugin.java
Posted by Emmanuel Venisse <em...@venisse.net>.
----- Original Message -----
From: "Jason van Zyl" <jv...@maven.org>
To: "Maven 2 Developers List" <m2...@maven.apache.org>
Sent: Sunday, June 27, 2004 3:39 PM
Subject: Re: cvs
commit:maven-components/maven-plugins/maven-surefire-plugin/src/main/java/or
g/apache/maven/testSurefireFailureResponse.java SurefirePlugin.java
> On Sun, 2004-06-27 at 09:24, evenisse@apache.org wrote:
> > evenisse 2004/06/27 06:24:13
> >
> > Modified: maven-core pom.xml
> > maven-mboot/src/bash deps maven.functions
> > maven-plugins/maven-surefire-plugin pom.xml
> >
maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test
> > SurefirePlugin.java
> > Added:
maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test
> > SurefireFailureResponse.java
> > Log:
> > - Use surefire 1.1
> > - Build failed now when we have failures in tests
>
> Nice work!
>
> Does anything need to be deployed to ibiblio?
surefire and surefire-booter 1.1 are deployed to ibiblio.
>
> > + <dependency>
> > + <groupId>jcoverage</groupId>
> > + <artifactId>jcoverage</artifactId>
> > + <version>1.0.5</version>
> > + </dependency>
>
> Trygve has plugin dep downloading now so I will probably clean out the
> core POM today.
Cool.
>
> --
> jvz.
>
> Jason van Zyl
> jason@maven.org
> http://maven.apache.org
>
> happiness is like a butterfly: the more you chase it, the more it will
> elude you, but if you turn your attention to other things, it will come
> and sit softly on your shoulder ...
>
> -- Thoreau
>
>
Re: cvs commit:
maven-components/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test
SurefireFailureResponse.java SurefirePlugin.java
Posted by Jason van Zyl <jv...@maven.org>.
On Sun, 2004-06-27 at 09:24, evenisse@apache.org wrote:
> evenisse 2004/06/27 06:24:13
>
> Modified: maven-core pom.xml
> maven-mboot/src/bash deps maven.functions
> maven-plugins/maven-surefire-plugin pom.xml
> maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test
> SurefirePlugin.java
> Added: maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test
> SurefireFailureResponse.java
> Log:
> - Use surefire 1.1
> - Build failed now when we have failures in tests
Nice work!
Does anything need to be deployed to ibiblio?
> + <dependency>
> + <groupId>jcoverage</groupId>
> + <artifactId>jcoverage</artifactId>
> + <version>1.0.5</version>
> + </dependency>
Trygve has plugin dep downloading now so I will probably clean out the
core POM today.
--
jvz.
Jason van Zyl
jason@maven.org
http://maven.apache.org
happiness is like a butterfly: the more you chase it, the more it will
elude you, but if you turn your attention to other things, it will come
and sit softly on your shoulder ...
-- Thoreau