You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by st...@apache.org on 2010/08/05 13:55:30 UTC
svn commit: r982554 - in /maven/surefire/trunk: maven-failsafe-plugin/
maven-failsafe-plugin/src/it/multiple-summaries-failing/
maven-failsafe-plugin/src/it/multiple-summaries-failing/src/
maven-failsafe-plugin/src/it/multiple-summaries-failing/src/tes...
Author: stephenc
Date: Thu Aug 5 11:55:29 2010
New Revision: 982554
URL: http://svn.apache.org/viewvc?rev=982554&view=rev
Log:
SUREFIRE-606
Added:
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/invoker.properties
- copied unchanged from r982517, maven/surefire/trunk/maven-failsafe-plugin/src/it/jetty-war-test-failing/invoker.properties
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml (with props)
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyAT.java (with props)
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyIT.java (with props)
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml (with props)
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/src/
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/src/test/
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/src/test/java/
maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/src/test/java/MyIT.java (with props)
Modified:
maven/surefire/trunk/maven-failsafe-plugin/pom.xml
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
maven/surefire/trunk/maven-failsafe-plugin/src/main/mdo/failsafe-summary.mdo
maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/usage.apt.vm
maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml
maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
Modified: maven/surefire/trunk/maven-failsafe-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/pom.xml?rev=982554&r1=982553&r2=982554&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/pom.xml Thu Aug 5 11:55:29 2010
@@ -207,7 +207,7 @@
<models>
<model>src/main/mdo/failsafe-summary.mdo</model>
</models>
- <version>2.4.3</version>
+ <version>2.6.0</version>
</configuration>
</plugin>
<plugin>
Added: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml?rev=982554&view=auto
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml (added)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml Thu Aug 5 11:55:29 2010
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>localhost</groupId>
+ <artifactId>working-directory-test</artifactId>
+ <version>1.0</version>
+ <name>Run tests multiple times</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>@project.groupId@</groupId>
+ <artifactId>@project.artifactId@</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-1.xml</summaryFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>acceptance-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>**/AT*.java</include>
+ <include>**/*AT.java</include>
+ <include>**/*ATCase.java</include>
+ </includes>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-2.xml</summaryFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <summaryFiles>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-1.xml</summaryFile>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-2.xml</summaryFile>
+ </summaryFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyAT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyAT.java?rev=982554&view=auto
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyAT.java (added)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyAT.java Thu Aug 5 11:55:29 2010
@@ -0,0 +1,7 @@
+import junit.framework.TestCase;
+
+public class MyAT extends TestCase {
+ public void testSomething() {
+ assertTrue(false);
+ }
+}
Propchange: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyAT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyAT.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyIT.java?rev=982554&view=auto
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyIT.java (added)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyIT.java Thu Aug 5 11:55:29 2010
@@ -0,0 +1,7 @@
+import junit.framework.TestCase;
+
+public class MyIT extends TestCase {
+ public void testSomething() {
+ assertTrue(true);
+ }
+}
Propchange: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries-failing/src/test/java/MyIT.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml?rev=982554&view=auto
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml (added)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml Thu Aug 5 11:55:29 2010
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>localhost</groupId>
+ <artifactId>working-directory-test</artifactId>
+ <version>1.0</version>
+ <name>Run tests multiple times</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>@project.groupId@</groupId>
+ <artifactId>@project.artifactId@</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>integration-test1</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-1.xml</summaryFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>integration-test2</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-2.xml</summaryFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <summaryFiles>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-1.xml</summaryFile>
+ <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-2.xml</summaryFile>
+ </summaryFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/src/test/java/MyIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/src/test/java/MyIT.java?rev=982554&view=auto
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/src/test/java/MyIT.java (added)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/src/test/java/MyIT.java Thu Aug 5 11:55:29 2010
@@ -0,0 +1,7 @@
+import junit.framework.TestCase;
+
+public class MyIT extends TestCase {
+ public void testSomething() {
+ assertTrue(true);
+ }
+}
Propchange: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/src/test/java/MyIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/maven-failsafe-plugin/src/it/multiple-summaries/src/test/java/MyIT.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java?rev=982554&r1=982553&r2=982554&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java Thu Aug 5 11:55:29 2010
@@ -32,6 +32,7 @@ import org.apache.maven.plugin.surefire.
import org.apache.maven.plugin.surefire.SurefireReportParameters;
import org.apache.maven.surefire.failsafe.model.FailsafeSummary;
import org.apache.maven.surefire.failsafe.model.io.xpp3.FailsafeSummaryXpp3Reader;
+import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -119,7 +120,7 @@ public class VerifyMojo
private File reportsDirectory;
/**
- * The summary file to write integration test results to.
+ * The summary file to read integration test results from.
*
* @parameter expression="${project.build.directory}/failsafe-reports/failsafe-summary.xml"
* @required
@@ -127,6 +128,13 @@ public class VerifyMojo
private File summaryFile;
/**
+ * Additional summary files to read integration test results from.
+ *
+ * @parameter
+ */
+ private File[] summaryFiles;
+
+ /**
* Set this to "true" to cause a failure if there are no tests to run.
*
* @parameter expression="${failIfNoTests}"
@@ -166,15 +174,23 @@ public class VerifyMojo
encoding = this.encoding;
}
- FileInputStream fos = new FileInputStream( summaryFile );
- BufferedInputStream bos = new BufferedInputStream( fos );
- Reader w = new InputStreamReader( bos, encoding );
- FailsafeSummaryXpp3Reader reader = new FailsafeSummaryXpp3Reader();
- final FailsafeSummary summary = reader.read( w );
+ final FailsafeSummary summary;
+ if ( !summaryFile.isFile() && summaryFiles != null )
+ {
+ summary = new FailsafeSummary();
+ }
+ else
+ {
+ summary = readSummary( encoding, summaryFile );
+ }
+ if ( summaryFiles != null )
+ {
+ for ( int i = 0; i < summaryFiles.length; i++ )
+ {
+ summary.merge( readSummary( encoding, summaryFiles[i] ) );
+ }
+ }
result = summary.getResult();
- w.close();
- bos.close();
- fos.close();
}
catch ( IOException e )
{
@@ -189,6 +205,28 @@ public class VerifyMojo
}
}
+ private FailsafeSummary readSummary( String encoding, File summaryFile )
+ throws IOException, XmlPullParserException
+ {
+ FileInputStream fileInputStream = null;
+ BufferedInputStream bufferedInputStream = null;
+ Reader reader = null;
+ try
+ {
+ fileInputStream = new FileInputStream( summaryFile );
+ bufferedInputStream = new BufferedInputStream( fileInputStream );
+ reader = new InputStreamReader( bufferedInputStream, encoding );
+ FailsafeSummaryXpp3Reader xpp3Reader = new FailsafeSummaryXpp3Reader();
+ return xpp3Reader.read( reader );
+ }
+ finally
+ {
+ IOUtil.close( reader );
+ IOUtil.close( bufferedInputStream );
+ IOUtil.close( fileInputStream );
+ }
+ }
+
protected boolean verifyParameters()
throws MojoFailureException
{
Modified: maven/surefire/trunk/maven-failsafe-plugin/src/main/mdo/failsafe-summary.mdo
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/main/mdo/failsafe-summary.mdo?rev=982554&r1=982553&r2=982554&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/main/mdo/failsafe-summary.mdo (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/main/mdo/failsafe-summary.mdo Thu Aug 5 11:55:29 2010
@@ -24,7 +24,7 @@ under the License.
<id>failsafe-summary</id>
<name>FailsafeSummary</name>
<description>
- A summary of tests executed by the Failsafe Maven Plugin.
+ A summary of tests executed by the Maven Failsafe Plugin.
</description>
<defaults>
<default>
@@ -41,23 +41,80 @@ under the License.
<description>
Describes the results of executing tests
</description>
- <version>2.4.3</version>
+ <version>2.4.3+</version>
<fields>
<field xml.attribute="true">
<name>result</name>
- <version>2.4.3</version>
+ <version>2.4.3+</version>
<required>true</required>
<type>int</type>
<description>The surefire result code</description>
</field>
<field>
<name>exception</name>
- <version>2.4.3</version>
+ <version>2.4.3+</version>
<required>false</required>
<type>String</type>
<description>The exception that caused surefire to bomb out</description>
</field>
</fields>
+ <codeSegments>
+ <codeSegment>
+ <version>2.6.0</version>
+ <code><![CDATA[
+ /**
+ * Merges the summary result with this summary result.
+ *
+ * @param summary The summary to merge.
+ * @since 2.6
+ */
+ public void merge( FailsafeSummary summary )
+ {
+ switch ( this.result )
+ {
+ case org.apache.maven.surefire.booter.SurefireBooter.TESTS_SUCCEEDED_EXIT_CODE:
+ this.result = summary.result;
+ break;
+ case org.apache.maven.surefire.booter.SurefireBooter.NO_TESTS_EXIT_CODE:
+ switch ( summary.result )
+ {
+ case org.apache.maven.surefire.booter.SurefireBooter.TESTS_SUCCEEDED_EXIT_CODE:
+ break;
+ case org.apache.maven.surefire.booter.SurefireBooter.NO_TESTS_EXIT_CODE:
+ break;
+ case org.apache.maven.surefire.booter.SurefireBooter.TESTS_FAILED_EXIT_CODE:
+ this.result = summary.result;
+ break;
+ default:
+ this.result = summary.result;
+ break;
+ }
+ break;
+ case org.apache.maven.surefire.booter.SurefireBooter.TESTS_FAILED_EXIT_CODE:
+ switch ( summary.result )
+ {
+ case org.apache.maven.surefire.booter.SurefireBooter.TESTS_SUCCEEDED_EXIT_CODE:
+ break;
+ case org.apache.maven.surefire.booter.SurefireBooter.NO_TESTS_EXIT_CODE:
+ break;
+ case org.apache.maven.surefire.booter.SurefireBooter.TESTS_FAILED_EXIT_CODE:
+ break;
+ default:
+ this.result = summary.result;
+ break;
+ }
+ break;
+ default:
+ break;
+ }
+ if ( this.exception == null )
+ {
+ this.exception = summary.exception;
+ }
+ }
+ ]]></code>
+ </codeSegment>
+ </codeSegments>
</class>
</classes>
</model>
Modified: maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/usage.apt.vm
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/usage.apt.vm?rev=982554&r1=982553&r2=982554&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/usage.apt.vm Thu Aug 5 11:55:29 2010
@@ -225,7 +225,7 @@ mvn verify
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
<version>${project.version}</version>
<reportSets>
<reportSet>
@@ -247,3 +247,63 @@ mvn verify
</project>
+---+
+* Running integration tests multiple times
+
+ If you need to run your integration tests multiple times, just use multiple executions of the <<<integration-test>>>
+ goal. You will need to specify a different summary file for each execution, and then configure the <<<verify>>> goal
+ with the multiple summary files in order to fail the build when any one execution has failures, e.g.
+
++---+
+<project>
+ [...]
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>integration-test-red-bevels</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <bevels>red</bevels>
+ </systemPropertyVariables>
+ <summaryFile>target/failsafe-reports/failsafe-summary-red-bevels.xml</summaryFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>integration-test-no-bevels</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <bevels>none</bevels>
+ </systemPropertyVariables>
+ <summaryFile>target/failsafe-reports/failsafe-summary-no-bevels.xml</summaryFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <summaryFiles>
+ <summaryFile>target/failsafe-reports/failsafe-summary-red-bevels.xml</summaryFile>
+ <summaryFile>target/failsafe-reports/failsafe-summary-no-bevels.xml</summaryFile>
+ </summaryFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </reporting>
+ [...]
+</project>
++---+
+
Modified: maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml?rev=982554&r1=982553&r2=982554&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml Thu Aug 5 11:55:29 2010
@@ -36,6 +36,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml?rev=982554&r1=982553&r2=982554&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml Thu Aug 5 11:55:29 2010
@@ -36,6 +36,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml?rev=982554&r1=982553&r2=982554&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml Thu Aug 5 11:55:29 2010
@@ -36,6 +36,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml?rev=982554&r1=982553&r2=982554&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml Thu Aug 5 11:55:29 2010
@@ -41,6 +41,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>