Author: stephenc
Date: Mon Jun 27 13:05:01 2011
New Revision: 1140144
URL: http://svn.apache.org/viewvc?rev=1140144&view=rev
Log:
syncing the docs between surefire and failsafe to see what the exact
differences should be
Added:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt.vm
(contents, props changed)
- copied, changed from r1140122,
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt
Removed:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt
Modified:
maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/examples/system-properties.apt.vm
maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/examples/testng.apt.vm
maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/usage.apt.vm
Modified:
maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/examples/system-properties.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/examples/system-properties.apt.vm?rev=1140144&r1=1140143&r2=1140144&view=diff
==============================================================================
---
maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/examples/system-properties.apt.vm
(original)
+++
maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/examples/system-properties.apt.vm
Mon Jun 27 13:05:01 2011
@@ -80,20 +80,6 @@ Using System Properties
[...]
</systemProperties>
</configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
@@ -123,20 +109,6 @@ Using System Properties
</property>
</systemProperties>
</configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified:
maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/examples/testng.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/examples/testng.apt.vm?rev=1140144&r1=1140143&r2=1140144&view=diff
==============================================================================
---
maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/examples/testng.apt.vm
(original)
+++
maven/surefire/trunk/maven-failsafe-plugin/src/site/apt/examples/testng.apt.vm
Mon Jun 27 13:05:01 2011
@@ -3,7 +3,7 @@
------
Brett Porter <br...@apache.org>
------
- 2 May 2006
+ 2010-01-09
------
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -82,22 +82,6 @@ Using TestNG
<suiteXmlFile>testng.xml</suiteXmlFile>
</suiteXmlFiles>
</configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <phase>verify</phase>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
</plugin>
[...]
+---+
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=1140144&r1=1140143&r2=1140144&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 Mon
Jun 27 13:05:01 2011
@@ -5,7 +5,7 @@
Brett Porter
Allan Ramirez
------
- May 2009
+ 2011-06-27
------
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -27,12 +27,11 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-
Usage
To use the Failsafe Plugin, you need to add the following configuration to
- your pom.xml
+ your <<<pom.xml>>>
+---+
<project>
@@ -88,7 +87,7 @@ mvn verify
Note that any normal Surefire integration works identically no matter which
providers are in use - so you can still produce a Cobertura report and a
- Surefire results report on your project web site for your TestNG tests,
+ Failsafe results report on your project web site for your TestNG tests,
for example.
The POJO provider above allows you to write tests that do not depend on
Copied: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt.vm
(from r1140122,
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt.vm?p2=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt.vm&p1=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt&r1=1140122&r2=1140144&rev=1140144&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt.vm Mon
Jun 27 13:05:01 2011
@@ -3,8 +3,9 @@
------
Brett Porter
Allan Ramirez
+ Stephen Connolly
------
- 2010-01-09
+ 2011-06-27
------
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -29,6 +30,27 @@
Usage
+ Best practice is to define the version of the Surefire plugin that you want
to use in either your <<<pom.xml>>>
+ or a parent <<<pom.xml>>>
+
++---+
+<project>
+ [...]
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ [...]
+</project>
++---+
+
The Surefire Plugin can be invoked by calling the <<<test>>> phase of the
build lifecycle.
@@ -53,7 +75,7 @@ mvn test
Note that any normal Surefire integration works identically no matter which
providers are in use - so you can still produce a Cobertura report and a
- Surefire report on your project web site for your TestNG tests,
+ Surefire results report on your project web site for your TestNG tests,
for example.
The POJO provider above allows you to write tests that do not depend on
Propchange: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt.vm
------------------------------------------------------------------------------
svn:eol-style = native
