maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject [2/3] revert https://git-wip-us.apache.org/repos/asf?p=maven-surefire.git;a=commit;h=a303827d673a4821e2c7aadd8e54eab1171c070c only for apt files as site was broken. sorry I don't know how Hervé format apt files :-)
Date Tue, 11 Dec 2012 19:53:30 GMT
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8970909c/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm b/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
index b249606..a421f93 100644
--- a/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
@@ -1,285 +1,271 @@
-------
-Using JUnit
-------
-Kristian Rosenvold
-<krosenvold@apache.org>
-------
-2010-10-10
-------
-
-~~ 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.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+ ------
+ Using JUnit
+ ------
+ Kristian Rosenvold <krosenvold@apache.org>
+ ------
+ 2010-10-10
+ ------
+ 
+ ~~ 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.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html 
 
 Using JUnit
 
 * Configuring JUnit
 
-To get started with JUnit, you need to add the required version of JUnit to your project:
+  To get started with JUnit, you need to add the required version of JUnit to your project:
 
 +---+
 <dependencies>
-    [...]
+  [...]
     <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.8.1</version>
-        <scope>test</scope>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
     </dependency>
-    [...]
+  [...]
 </dependencies>
 +---+
 
 
-This is the only step that is required to get started - you can now create tests in your test source directory
-(eg, <<
-<src/test/java>>>).
+  This is the only step that is required to get started - you can now create tests in your test source directory
+  (eg, <<<src/test/java>>>).
 
 * Different Generations of JUnit support
 
-Surefire supports three different generations of JUnit: JUnit 3.8.x, JUnit 4.x (serial provider) and JUnit 4.7 (junit-core provider
-with parallel support). The provider is selected based on the JUnit version in your project and the configuration parameters (for parallel).
+  Surefire supports three different generations of JUnit: JUnit 3.8.x, JUnit 4.x (serial provider) and JUnit 4.7 (junit-core provider
+  with parallel support). The provider is selected based on the JUnit version in your project and the configuration parameters (for parallel).
 
 * Upgrade check for JUnit 4.x
 
-As of Surefire version 2.7, the algorithm for choosing which tests to run
-has changed. From 2.7 and on, only valid JUnit tests are run for all versions of JUnit, where older versions
-of the plugin would also run invalid tests that satisfied the naming convention.
+  As of Surefire version 2.7, the algorithm for choosing which tests to run
+  has changed. From 2.7 and on, only valid JUnit tests are run for all versions of JUnit, where older versions
+  of the plugin would also run invalid tests that satisfied the naming convention.
 
-When upgrading from a Surefire version prior to 2.7, the build can be run with
-the flag -Dsurefire.junit4.upgradecheck. This will perform a check and notify you of any invalid tests that
-will not be run with this version of Surefire (and the build fails). This is only meant to be used as a tool
-when upgrading to check that all expected tests will be run. It is a transitional
-feature that will be removed in a future version of surefire.
+  When upgrading from a Surefire version prior to 2.7, the build can be run with
+  the flag -Dsurefire.junit4.upgradecheck. This will perform a check and notify you of any invalid tests that
+  will not be run with this version of Surefire (and the build fails). This is only meant to be used as a tool
+  when upgrading to check that all expected tests will be run. It is a transitional
+  feature that will be removed in a future version of surefire.
 
 * How is the provider chosen ?
 
-If nothing is configured, surefire detects which junit version to use by the following algorithm:
+   If nothing is configured, surefire detects which junit version to use by the following algorithm:
 
 +---+
 if the JUnit version in the project >= 4.7 and the parallel attribute has ANY value
-use junit47 provider
+    use junit47 provider
 if JUnit >= 4.0 is present
-use junit4 provider
+    use junit4 provider
 else
-use junit3.8.1
+    use junit3.8.1
 +---+
 
-Please note that the "else" part of this algorithm is also a FAQ response:
+    Please note that the "else" part of this algorithm is also a FAQ response:
 
-You depend on the appropriate version of JUnit being present in the project dependencies, or surefire may choose the wrong
-provider. If, for instance, one of your dependencies pulls in JUnit 3.8.1 you risk that surefire chooses the
-3.8.1 provider, which will not support annotations or any of the 4.x features.
+    You depend on the appropriate version of JUnit being present in the project dependencies, or surefire may choose the wrong
+    provider. If, for instance, one of your dependencies pulls in JUnit 3.8.1 you risk that surefire chooses the
+    3.8.1 provider, which will not support annotations or any of the 4.x features.
 
-Use mvn dependency:tree, pom dependency ordering and/or and exclusion of transitive dependencies to fix this problem.
+    Use mvn dependency:tree, pom dependency ordering and/or and exclusion of transitive dependencies to fix this problem.
 
 ** Manually specifying a provider
 
-You can also manually force a specific provider by adding it as a dependency to ${thisPlugin} itself:
+   You can also manually force a specific provider by adding it as a dependency to ${thisPlugin} itself:
+
++---+
+<plugins>
+[...]
+  <plugin>
+    <groupId>${project.groupId}</groupId>
+    <artifactId>${project.artifactId}</artifactId>
+    <version>${project.version}</version>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.maven.surefire</groupId>
+        <artifactId>surefire-junit47</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+    </dependencies>
+  </plugin>
+[...]
+</plugins>
++---+
+
+  When using this technique there  is no check that the proper test-frameworks are present on your project's
+  classpath. Failing to add the proper test-frameworks will result in a build failure.
+
+* Running tests in parallel
+
+  From JUnit 4.7 and onwards you can run your tests in parallel. To do this, you must set the
+  <<<parallel>>> parameter, and may change the <<<threadCount>>> or <<<useUnlimitedThreads>>> attribute.
+  For example:
 
 +---+
 <plugins>
     [...]
-    <plugin>
+      <plugin>
         <groupId>${project.groupId}</groupId>
         <artifactId>${project.artifactId}</artifactId>
         <version>${project.version}</version>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.maven.surefire</groupId>
-                <artifactId>surefire-junit47</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </plugin>
+        <configuration>
+          <parallel>methods</parallel>
+          <threadCount>10</threadCount>
+        </configuration>
+      </plugin>
     [...]
 </plugins>
 +---+
 
-When using this technique there  is no check that the proper test-frameworks are present on your project's
-classpath. Failing to add the proper test-frameworks will result in a build failure.
 
-* Running tests in parallel
+  If your tests specify any value for the "parallel" attribute and your project uses JUnit 4.7+, your request will be routed to
+  the concurrent JUnit provider, which uses the JUnit JUnitCore testrunner.
+
+  This is particularly useful for slow tests that can have high concurrency.
+
+  As of surefire 2.7, no additional dependencies are needed to use the full set of options with parallel.
+
+* Using custom listeners and reporters
+
+  JUnit4/4.7 provider provides support for attaching custom RunListeners to your tests.
+
+  You can configure multiple custom listeners like this:
+
++---+
+<plugins>
+[...]
+  <plugin>
+    <groupId>${project.groupId}</groupId>
+    <artifactId>${project.artifactId}</artifactId>
+    <version>${project.version}</version>
+    <configuration>
+      <properties>
+        <property>
+          <name>listener</name>
+          <value>com.mycompany.MyResultListener,com.mycompany.MyResultListener2</value>
+        </property>
+    </configuration>
+  </plugin>
+[...]
+</plugins>
++---+
+
+* Using a security manager (JUnit3 only)
+
+   As long as forkMode!=never and you use JUnit3, you can run your tests with a java security manager active.
+   The classname of the security manager must be sent as a system property variable to the JUnit3 provider.
+
+   JUnit4 uses mechanisms internally that are not compatible with the tested security managers and is not supported
+   by surefire.
+
++---+
+<plugins>
+[...]
+      <plugin>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>${project.artifactId}</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <systemPropertyVariables>
+            <surefire.security.manager>java.lang.SecurityManager</surefire.security.manager>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+[...]
+</plugins>
++---+
+
+* Using a security manager (All providers)
+
+    Alternatively you can define a policy file that allows all providers to run with surefire
+    and send them using the argLine parameter and two system properties;
+
++---+
+<plugins>
+[...]
+      <plugin>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>${project.artifactId}</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <argLine>-Djava.security.manager -Djava.security.policy=${basedir}/src/test/resources/java.policy</argLine>
+        </configuration>
+      </plugin>
+[...]
+</plugins>
++---+
+
+  The disadvantage of this solution is that the policy changes will affect the tests too, which make the
+  security environment less realistic.
+
+* Using JUnit Categories
+
+    JUnit 4.8 introduced the notion of Categories. You can use JUnit categories by using the <<<groups>>> parameter. As long as 
+    the JUnit version in the project is 4.8 or higher, the presence of the "groups" parameter will automatically make surefire select 
+    the junit47 provider, which supports groups.
+
++---+
+<plugins>
+[...]
+    <plugin>
+      <artifactId>maven-surefire-plugin</artifactId>
+      <version>2.11</version>
+      <configuration>
+        <groups>com.mycompany.SlowTests</groups>
+      </configuration>
+    </plugin>
+[...]
+</plugins>
++---+
+
+  This will execute only those tests annotated with the <<<@Category(com.mycompany.SlowTests.class)>>> annotation and those tests
+  annotated with <<<@Category(com.mycompany.SlowerTests.class)>>> if class/interface <<<SlowerTests>>> is subclass of <<<SlowTests>>>:
+
++---+
+    public interface SlowTests{}
+    public interface SlowerTests extends SlowTests{}
++---+
+
++---+
+    public class AppTest {
+      @Test
+      @Category(com.mycompany.SlowTests.class)
+      public void testSlow() {
+        System.out.println("slow");
+      }
+
+      @Test
+      @Category(com.mycompany.SlowerTests.class)
+      public void testSlower() {
+        System.out.println("slower");
+      }
+
+      @Test
+      @Category(com.cmycompany.FastTests.class)
+      public void testSlow() {
+        System.out.println("fast");
+      }
+    }
++---+
 
-From JUnit 4.7 and onwards you can run your tests in parallel. To do this, you must set the
-<<
-<parallel>>> parameter, and may change the <<
-    <threadCount>>> or <<
-        <useUnlimitedThreads>>> attribute.
-            For example:
-
-            +---+
-            <plugins>
-                [...]
-                <plugin>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>${project.artifactId}</artifactId>
-                    <version>${project.version}</version>
-                    <configuration>
-                        <parallel>methods</parallel>
-                        <threadCount>10</threadCount>
-                    </configuration>
-                </plugin>
-                [...]
-            </plugins>
-            +---+
-
-
-            If your tests specify any value for the "parallel" attribute and your project uses JUnit 4.7+, your request
-            will be routed to
-            the concurrent JUnit provider, which uses the JUnit JUnitCore testrunner.
-
-            This is particularly useful for slow tests that can have high concurrency.
-
-            As of surefire 2.7, no additional dependencies are needed to use the full set of options with parallel.
-
-            * Using custom listeners and reporters
-
-            JUnit4/4.7 provider provides support for attaching custom RunListeners to your tests.
-
-            You can configure multiple custom listeners like this:
-
-            +---+
-            <plugins>
-                [...]
-                <plugin>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>${project.artifactId}</artifactId>
-                    <version>${project.version}</version>
-                    <configuration>
-                        <properties>
-                            <property>
-                                <name>listener</name>
-                                <value>com.mycompany.MyResultListener,com.mycompany.MyResultListener2</value>
-                            </property>
-                    </configuration>
-                </plugin>
-                [...]
-            </plugins>
-            +---+
-
-            * Using a security manager (JUnit3 only)
-
-            As long as forkMode!=never and you use JUnit3, you can run your tests with a java security manager active.
-            The classname of the security manager must be sent as a system property variable to the JUnit3 provider.
-
-            JUnit4 uses mechanisms internally that are not compatible with the tested security managers and is not
-            supported
-            by surefire.
-
-            +---+
-            <plugins>
-                [...]
-                <plugin>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>${project.artifactId}</artifactId>
-                    <version>${project.version}</version>
-                    <configuration>
-                        <systemPropertyVariables>
-                            <surefire.security.manager>java.lang.SecurityManager</surefire.security.manager>
-                        </systemPropertyVariables>
-                    </configuration>
-                </plugin>
-                [...]
-            </plugins>
-            +---+
-
-            * Using a security manager (All providers)
-
-            Alternatively you can define a policy file that allows all providers to run with surefire
-            and send them using the argLine parameter and two system properties;
-
-            +---+
-            <plugins>
-                [...]
-                <plugin>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>${project.artifactId}</artifactId>
-                    <version>${project.version}</version>
-                    <configuration>
-                        <argLine>-Djava.security.manager -Djava.security.policy=${basedir}
-                            /src/test/resources/java.policy
-                        </argLine>
-                    </configuration>
-                </plugin>
-                [...]
-            </plugins>
-            +---+
-
-            The disadvantage of this solution is that the policy changes will affect the tests too, which make the
-            security environment less realistic.
-
-            * Using JUnit Categories
-
-            JUnit 4.8 introduced the notion of Categories. You can use JUnit categories by using the <<
-            <groups>>> parameter. As long as
-                the JUnit version in the project is 4.8 or higher, the presence of the "groups" parameter will
-                automatically make surefire select
-                the junit47 provider, which supports groups.
-
-                +---+
-                <plugins>
-                    [...]
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.11</version>
-                        <configuration>
-                            <groups>com.mycompany.SlowTests</groups>
-                        </configuration>
-                    </plugin>
-                    [...]
-                </plugins>
-                +---+
-
-                This will execute only those tests annotated with the <<<@Category(com.mycompany.SlowTests.class)>>>
-                annotation and those tests
-                annotated with <<<@Category(com.mycompany.SlowerTests.class)>>> if class/interface <<
-                <SlowerTests>>> is subclass of <<
-                    <SlowTests>>>:
-
-                        +---+
-                        public interface SlowTests{}
-                        public interface SlowerTests extends SlowTests{}
-                        +---+
-
-                        +---+
-                        public class AppTest {
-                        @Test
-                        @Category(com.mycompany.SlowTests.class)
-                        public void testSlow() {
-                        System.out.println("slow");
-                        }
-
-                        @Test
-                        @Category(com.mycompany.SlowerTests.class)
-                        public void testSlower() {
-                        System.out.println("slower");
-                        }
-
-                        @Test
-                        @Category(com.cmycompany.FastTests.class)
-                        public void testSlow() {
-                        System.out.println("fast");
-                        }
-                        }
-                        +---+
-
-                        The @Category annotation can also be applied at class-level.
-
-                        For more information on JUnit, see the {{{http://www.junit.org}JUnit web site}}.
+  The @Category annotation can also be applied at class-level.
+	
+  For more information on JUnit, see the {{{http://www.junit.org}JUnit web site}}.

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8970909c/maven-surefire-plugin/src/site/apt/examples/pojo-test.apt.vm
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/apt/examples/pojo-test.apt.vm b/maven-surefire-plugin/src/site/apt/examples/pojo-test.apt.vm
index 4ebfe9e..1d2661e 100644
--- a/maven-surefire-plugin/src/site/apt/examples/pojo-test.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/examples/pojo-test.apt.vm
@@ -1,54 +1,50 @@
-------
-Using POJO tests
-------
-Christian Gruber
-------
-May 2008
-------
-
-~~ 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.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+   ------
+  Using POJO tests
+  ------
+  Christian Gruber
+  ------
+  May 2008
+  ------
+  
+ ~~ 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.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html  
 
 Defining a POJO Test
 
-POJO tests look very much like JUnit or TestNG tests, though they do not
-require dependencies on these artifacts.  A test class should be named
-<<<**/*Test>>> and should contain <<
-<test*>>> methods which will each be
-executed by surefire.
-
-Validating assertions can be done using the JDK 1.4 <<
-<assert>>> keyword.
-    Simultaneous test execution is not possible with POJO tests.
-
-    Fixture can be setup before and after each <<
-    <test
-    *>>> method by implementing
-    a set-up and a tear-down method. These methods must match these signatures
-    to be recognized and executed before and after each test method.
-
-    +---+
-    public void setUp();
-    public void tearDown();
-    +---+
-
-    These fixture methods can also throw any exception and will still be valid.
+  POJO tests look very much like JUnit or TestNG tests, though they do not
+  require dependencies on these artifacts.  A test class should be named
+  <<<**/*Test>>> and should contain <<<test*>>> methods which will each be 
+  executed by surefire.  
+  
+  Validating assertions can be done using the JDK 1.4 <<<assert>>> keyword.
+  Simultaneous test execution is not possible with POJO tests.
+  
+  Fixture can be setup before and after each <<<test*>>> method by implementing
+  a set-up and a tear-down method.  These methods must match these signatures 
+  to be recognized and executed before and after each test method.
+     
++---+
+public void setUp();
+public void tearDown();
++---+
+
+  These fixture methods can also throw any exception and will still be valid.
 
   
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8970909c/maven-surefire-plugin/src/site/apt/examples/providers.apt.vm
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/apt/examples/providers.apt.vm b/maven-surefire-plugin/src/site/apt/examples/providers.apt.vm
index dd595f4..39eff4d 100644
--- a/maven-surefire-plugin/src/site/apt/examples/providers.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/examples/providers.apt.vm
@@ -1,65 +1,64 @@
-------
-Selecting providers
-------
-Kristian Rosenvold
-<krosenvold@apache.org>
-------
-2010-12-04
-------
-
-~~ 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.
+ ------
+ Selecting providers
+ ------
+ Kristian Rosenvold <krosenvold@apache.org>
+ ------
+ 2010-12-04
+ ------
+ 
+ ~~ 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.
 
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html 
 
 Selecting providers
 
 * Selecting a provider
 
-Surefire normally automatically selects which test-framework provider to use based on the version of
-TestNG/JUnit present in your project's classpath. In some cases it may be desirable to manually
-override such a selection. This can be done by adding the required provider as a dependency to
-the surefire-plugin.
+  Surefire normally automatically selects which test-framework provider to use based on the version of
+  TestNG/JUnit present in your project's classpath. In some cases it may be desirable to manually
+  override such a selection. This can be done by adding the required provider as a dependency to
+  the surefire-plugin.
 
-The following example shows how to force the junit 4.7 provider:
+  The following example shows how to force the junit 4.7 provider:
 
 +---+
 <plugins>
-    [...]
-    <plugin>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>${project.artifactId}</artifactId>
+  [...]
+  <plugin>
+    <groupId>${project.groupId}</groupId>
+    <artifactId>${project.artifactId}</artifactId>
+    <version>${project.version}</version>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.maven.surefire</groupId>
+        <artifactId>surefire-junit47</artifactId>
         <version>${project.version}</version>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.maven.surefire</groupId>
-                <artifactId>surefire-junit47</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </plugin>
-    [...]
+      </dependency>
+    </dependencies>
+  </plugin>
+  [...]
 </plugins>
 +---+
 
-The providers supplied with surefire are surefire-junit3, surefire-junit4, surefire-junit47 and surefire-testng.
-Please note that forcing a provider still requires that the test framework is properly set up on your project classpath.
+  The providers supplied with surefire are surefire-junit3, surefire-junit4, surefire-junit47 and surefire-testng.
+  Please note that forcing a provider still requires that the test framework is properly set up on your project classpath.
 
-You can also specify multiple providers as dependencies, and they will all be run and produce a common report.
-This may be especially handy with external providers, since there are few use-cases for combining the included providers.
+  You can also specify multiple providers as dependencies, and they will all be run and produce a common report.
+  This may be especially handy with external providers, since there are few use-cases for combining the included providers.
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8970909c/maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm b/maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm
index d228673..b67897f 100644
--- a/maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/examples/single-test.apt.vm
@@ -1,122 +1,116 @@
-------
-Running a Single Test
-------
-Allan Ramirez
-Olivier Lamy
-------
-2012-02-28
-------
-
-~~ 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.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+  ------
+  Running a Single Test
+  ------
+  Allan Ramirez
+  Olivier Lamy
+  ------
+ 2012-02-28
+  ------
+  
+ ~~ 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.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
 
 Running a Single Test
 
 #{if}(${project.artifactId}=="maven-surefire-plugin")
-During development, you may run a single test class repeatedly. To run this
-through Maven, set the <<
-<test>>> property to a specific test case.
+  During development, you may run a single test class repeatedly. To run this
+  through Maven, set the <<<test>>> property to a specific test case.
 
-    +---+
-    mvn -Dtest=TestCircle test
-    +---+
++---+
+mvn -Dtest=TestCircle test
++---+
 
-    The value for the <<
-<test>>> parameter is the name of the test class (without the extension; we'll strip off the extension if you
-    accidentally provide one).
+  The value for the <<<test>>> parameter is the name of the test class (without the extension; we'll strip off the extension if you accidentally provide one).
 #{else}
-    During development, you may run a single test class repeatedly. To run this
-    through Maven, set the <<
-<it.test>>> property to a specific test case.
+  During development, you may run a single test class repeatedly. To run this
+  through Maven, set the <<<it.test>>> property to a specific test case.
 
-    +---+
-    mvn -Dit.test=ITCircle verify
-    +---+
++---+
+mvn -Dit.test=ITCircle verify
++---+
 
-    The value for the <<
-<it.test>>> parameter is the name of the test class (without the extension; we'll strip off the extension if you
-    accidentally provide one).
+  The value for the <<<it.test>>> parameter is the name of the test class (without the extension; we'll strip off the extension if you accidentally provide one).
 #{end}
 
-    You may also use patterns to run a number of tests:
+  You may also use patterns to run a number of tests:
 
 #{if}(${project.artifactId}=="maven-surefire-plugin")
-    +---+
-    mvn -Dtest=TestCi*le test
-    +---+
++---+
+mvn -Dtest=TestCi*le test
++---+
 #{else}
-    +---+
-    mvn -Dit.test=ITCi*le verify
-    +---+
++---+
+mvn -Dit.test=ITCi*le verify
++---+
 #{end}
 
-    And you may use multiple names/patterns, separated by commas:
+  And you may use multiple names/patterns, separated by commas:
 
 #{if}(${project.artifactId}=="maven-surefire-plugin")
-    +---+
-    mvn -Dtest=TestSquare,TestCi*le test
-    +---+
++---+
+mvn -Dtest=TestSquare,TestCi*le test
++---+
 #{else}
-    +---+
-    mvn -Dit.test=ITSquare,ITCi*le verify
-    +---+
++---+
+mvn -Dit.test=ITSquare,ITCi*le verify
++---+
 #{end}
 
-    Running a set of methods in a Single Test Class
-
-    With version 2.7.3, you can run only n tests in a single Test Class.
-
-    << NOTE : it's supported for junit 4.x and TestNG. >>
-
-    You must use the following syntax
+Running a set of methods in a Single Test Class
 
+  With version 2.7.3, you can run only n tests in a single Test Class.
+  
+  << NOTE : it's supported for junit 4.x and TestNG. >>
+  
+  You must use the following syntax
+  
 #{if}(${project.artifactId}=="maven-surefire-plugin")
-    +---+
-    mvn -Dtest=TestCircle#mytest test
-    +---+
++---+
+mvn -Dtest=TestCircle#mytest test
++---+
 #{else}
-    +---+
-    mvn -Dit.test=ITCircle#mytest verify
-    +---+
++---+
+mvn -Dit.test=ITCircle#mytest verify
++---+
 #{end}
 
-    You can use patterns too
-
+  You can use patterns too
+  
 #{if}(${project.artifactId}=="maven-surefire-plugin")
-    +---+
-    mvn -Dtest=TestCircle#test* test
-    +---+
++---+
+mvn -Dtest=TestCircle#test* test
++---+
 #{else}
-    +---+
-    mvn -Dit.test=ITCircle#test* verify
-    +---+
++---+
+mvn -Dit.test=ITCircle#test* verify
++---+
 #{end}
 
-    As of surefire 2.12.1, you can select multiple methods (JUnit4X only at this time, patches welcome)
+  As of surefire 2.12.1, you can select multiple methods (JUnit4X only at this time, patches welcome)
 
 #{if}(${project.artifactId}=="maven-surefire-plugin")
-    +---+
-    mvn -Dtest=TestCircle#testOne+testTwo test
-    +---+
++---+
+mvn -Dtest=TestCircle#testOne+testTwo test
++---+
 #{else}
-    +---+
-    mvn -Dit.test=ITCircle#test* verify
-    +---+
++---+
+mvn -Dit.test=ITCircle#test* verify
++---+
 #{end}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8970909c/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm b/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm
index 85a0d1f..ff8584f 100644
--- a/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm
@@ -1,118 +1,112 @@
-------
-Skipping Test
-------
-Johnny Ruiz
-Brett Porter
-Allan Ramirez
-------
-July 2006
-------
-
-~~ 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.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+  ------
+  Skipping Test
+  ------
+  Johnny Ruiz
+  Brett Porter
+  Allan Ramirez
+  ------
+  July 2006
+  ------
+  
+ ~~ 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.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
 
 Skipping Tests
 
-To skip running the tests for a particular project, set the <
-<skipTests>>
-    property to <
-    <true>>.
-
-        +---+
-        <project>
-            [...]
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>${project.groupId}</groupId>
-                        <artifactId>${project.artifactId}</artifactId>
-                        <version>${project.version}</version>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-            [...]
-        </project>
-        +---+
-
-        You can also skip the tests via command line by executing the following command:
-
-        +---+
-        mvn install -DskipTests
-        +---+
-
-        #{if}(${project.artifactId}=="maven-failsafe-plugin")
-            Since <<
-        <skipTests>>> is also followed by the ${thatPlugin} Plugin, this will have the effect
-            of not running any tests.  If, instead, you want to skip only the integration tests
-            being run by the ${thisPlugin} Plugin, you would use the <<
-        <skipITs>>> property
-
-            +---+
-            mvn install -DskipITs
-            +---+
-
-        #{end}
-        If you absolutely must, you can also use the <<
-        <maven.test.skip>>> property to skip compiling the tests.
-            <<
-            <maven.test.skip>>> is honored by Surefire, Failsafe and the Compiler Plugin.
-
-                +---+
-                mvn install -Dmaven.test.skip=true
-                +---+
-
-                Skipping by default
-
-                If you want to skip tests by default but want the ability to re-enable tests from the
-                command line, you need to go via a properties section in the pom:
-
-                +---+
-                <project>
-                    [...]
-                    <properties>
-                        <skipTests>true</skipTests>
-                    </properties>
-                    [...]
-                    <build>
-                        <plugins>
-                            <plugin>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>${project.artifactId}</artifactId>
-                                <version>${project.version}</version>
-                                <configuration>
-                                    <skipTests>${skipTests}</skipTests>
-                                </configuration>
-                            </plugin>
-                        </plugins>
-                    </build>
-                    [...]
-                </project>
-                +---+
-
-                This will allow you to run with tests disabled by default and to run them with this command:
-
-                +---+
-                mvn install -DskipTests=false
-                +---+
-
-                The same can be done with the "skip" parameter and other booleans on the plugin.
+ To skip running the tests for a particular project, set the <<skipTests>>
+ property to <<true>>.
+
++---+
+<project>
+  [...]
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>${project.artifactId}</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <skipTests>true</skipTests>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  [...]
+</project>
++---+
+
+ You can also skip the tests via command line by executing the following command:
+
++---+
+mvn install -DskipTests
++---+
+
+#{if}(${project.artifactId}=="maven-failsafe-plugin")
+ Since <<<skipTests>>> is also followed by the ${thatPlugin} Plugin, this will have the effect
+ of not running any tests.  If, instead, you want to skip only the integration tests
+ being run by the ${thisPlugin} Plugin, you would use the <<<skipITs>>> property
+
++---+
+mvn install -DskipITs
++---+
+
+#{end}
+ If you absolutely must, you can also use the <<<maven.test.skip>>> property to skip compiling the tests.
+ <<<maven.test.skip>>> is honored by Surefire, Failsafe and the Compiler Plugin.
+
++---+
+mvn install -Dmaven.test.skip=true
++---+
+
+Skipping by default
+
+   If you want to skip tests by default but want the ability to re-enable tests from the
+   command line, you need to go via a properties section in the pom:
+
++---+
+<project>
+  [...]
+  <properties>
+    <skipTests>true</skipTests>
+  </properties>
+  [...]
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>${project.artifactId}</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <skipTests>${skipTests}</skipTests>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  [...]
+</project>
++---+
+
+   This will allow you to run with tests disabled by default and to run them with this command:
+
++---+
+mvn install -DskipTests=false
++---+
+
+   The same can be done with the "skip" parameter and other booleans on the plugin.

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8970909c/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm b/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm
index ecc30ae..76d8abf 100644
--- a/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm
@@ -1,150 +1,140 @@
-------
-Using System Properties
-------
-Allan Ramirez
-Dan Tran
-------
-2010-01-09
-------
-
-~~ 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.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+  ------
+  Using System Properties
+  ------
+  Allan Ramirez
+  Dan Tran
+  ------
+  2010-01-09
+  ------
+  
+ ~~ 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.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
 
 Using System Properties
 
-There are two ways to add a list of system properties to ${thisPlugin}:
+  There are two ways to add a list of system properties to ${thisPlugin}:
 
 * systemPropertyVariables
 
-This configuration is the replacement of the deprecated <<
-<systemProperties>>>. It can accept any value
-    from Maven's properties that can be converted <
-    <to String value>>.
-
-        +---+
-        <project>
-            [...]
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>${project.groupId}</groupId>
-                        <artifactId>${project.artifactId}</artifactId>
-                        <version>${project.version}</version>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <propertyName>propertyValue</propertyName>
-                                <buildDirectory>\${project.build.directory}</buildDirectory>
-                                [...]
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-            [...]
-        </project>
-        +---+
-
-
-        * systemProperties ( deprecated )
-
-        +---+
-        <project>
+  This configuration is the replacement of the deprecated <<<systemProperties>>>.  It can accept any value
+  from Maven's properties that can be converted <<to String value>>.
+
++---+
+<project>
+  [...]
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>${project.artifactId}</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <systemPropertyVariables>
+            <propertyName>propertyValue</propertyName>
+            <buildDirectory>\${project.build.directory}</buildDirectory>
             [...]
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>${project.groupId}</groupId>
-                        <artifactId>${project.artifactId}</artifactId>
-                        <version>${project.version}</version>
-                        <configuration>
-                            <systemProperties>
-                                <property>
-                                    <name>propertyName</name>
-                                    <value>propertyValue</value>
-                                </property>
-                                [...]
-                            </systemProperties>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  [...]
+</project>
++---+
+
+
+* systemProperties ( deprecated )
+
++---+
+<project>
+  [...]
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>${project.artifactId}</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>propertyName</name>
+              <value>propertyValue</value>
+            </property>
             [...]
-        </project>
-        +---+
-
-        Take note that only <
-        <String valued>> properties can be passed as system
-            properties. Any attempt to pass any other Maven variable type (i.e. <<
-            <List>>>
-                or a <<
-                <URL>>> variable) will cause the variable expression to be passed
-                    literally (unevaluated). So having the example below:
-
-                    +---+
-                    <project>
-                        [...]
-                        <build>
-                            <plugins>
-                                <plugin>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}</artifactId>
-                                    <version>${project.version}</version>
-                                    <configuration>
-                                        <systemProperties>
-                                            <property>
-                                                <name>buildDir</name>
-                                                <value>\${project.build.outputDirectory}</value>
-                                            </property>
-                                        </systemProperties>
-                                    </configuration>
-                                </plugin>
-                            </plugins>
-                        </build>
-                        [...]
-                    </project>
-                    +---+
-
-                    will literally pass <<$\{project.build.outputDirectory\}>> because the value
-                    of that expression is a <<
-                    <File>>>, not a <<
-                        <String>>>.
-
-                            To inherit the "systemProperties" collection from the parent configuration,
-                            you will need to specify combine.children="append" on the systemProperties node in the child
-                            pom:
-
-                            +---+
-                            <systemProperties combine.children="append">
-                                <property>
-                                    [...]
-                                </property>
-                            </systemProperties>
-                            +---+
-
-                            Special VM properties
-
-                            Some system properties must be set on the command line of the forked VM, and cannot be set
-                            after the
-                            VM has been started. These properties must be added to the argLine parameter of the surefire
-                            plugin.
-
-                            +---+
-                            <argLine>-Djava.endorsed.dirs=...</argLine>
-                            +---+
+          </systemProperties>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  [...]
+</project>
++---+
+
+  Take note that only <<String valued>> properties can be passed as system
+  properties. Any attempt to pass any other Maven variable type (i.e. <<<List>>>
+  or a <<<URL>>> variable) will cause the variable expression to be passed
+  literally (unevaluated). So having the example below:
+
++---+
+<project>
+  [...]
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>${project.artifactId}</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>buildDir</name>
+              <value>\${project.build.outputDirectory}</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  [...]
+</project>
++---+
+
+  will literally pass <<$\{project.build.outputDirectory\}>> because the value
+  of that expression is a <<<File>>>, not a <<<String>>>.
+
+  To inherit the "systemProperties" collection from the parent configuration,
+  you will need to specify combine.children="append" on the systemProperties node in the child pom:
+
++---+
+  <systemProperties combine.children="append">
+      <property>
+         [...]
+      </property>
+   </systemProperties>
++---+
+
+Special VM properties
+
+  Some system properties must be set on the command line of the forked VM, and cannot be set after the
+  VM has been started. These properties must be added to the argLine parameter of the surefire plugin.
+
++---+
+  <argLine>-Djava.endorsed.dirs=...</argLine>
++---+

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8970909c/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm b/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm
index beda88a..3b6e37e 100644
--- a/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm
@@ -1,235 +1,209 @@
-------
-Using TestNG
-------
-Brett Porter
-<brett@apache.org>
-------
-2010-01-09
-------
-
-~~ 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.
-
-~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+ ------
+ Using TestNG
+ ------
+ Brett Porter <brett@apache.org>
+ ------
+ 2010-01-09
+ ------
+ 
+ ~~ 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.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
 
 Using TestNG
 
 * Configuring TestNG
 
-To get started with TestNG, include the following dependency in your project (replacing the version with the one you wish to use):
+  To get started with TestNG, include the following dependency in your project (replacing the version with the one you wish to use):
 
 +---+
 <dependencies>
-    [...]
+  [...]
     <dependency>
-        <groupId>org.testng</groupId>
-        <artifactId>testng</artifactId>
-        <version>6.3.1</version>
-        <scope>test</scope>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <version>6.3.1</version>
+      <scope>test</scope>
     </dependency>
-    [...]
+  [...]
 </dependencies>
 +---+
 
-If you are using an older version of TestNG (\<= 5.11), the dependency would instead look like this:
+  If you are using an older version of TestNG (\<= 5.11), the dependency would instead look like this:
 
 +---+
 <dependencies>
-    [...]
+  [...]
     <dependency>
-        <groupId>org.testng</groupId>
-        <artifactId>testng</artifactId>
-        <version>6.3.1</version>
-        <scope>test</scope>
-        <classifier>jdk15</classifier>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <version>6.3.1</version>
+      <scope>test</scope>
+      <classifier>jdk15</classifier>
     </dependency>
-    [...]
+  [...]
 </dependencies>
 +---+
 
-<
-<Note:>> if you are using JDK 1.4 Javadoc annotations for your TestNG tests, replace the classifier <<
-    <jdk15>>> with <<
-        <jdk14>>> above.
-
-            #{if}(${project.artifactId}=="maven-surefire-plugin")
-                This is the only step that is required to get started - you can now create tests in your test source
-                directory
-                (eg, <<
-                <src
-                /test/java>>>. As long as they are named using the defaults such as <<<*Test.java>>> they will be run
-                by ${thisPlugin} as TestNG tests.
-            #{else}
-                This is the only step that is required to get started - you can now create tests in your test source
-                directory
-                (eg, <<
-                <src
-                /test/java>>>. As long as they are named using the defaults such as <<<*IT.java>>> they will be run
-                by ${thisPlugin} as TestNG tests.
-            #{end}
-
-            If you'd like to use a different naming scheme, you can change the <<
-            <includes>>> parameter, as discussed in the
-                {{{./inclusion-exclusion.html}Inclusions and Exclusions of Tests}} example.
-
-                * Using Suite XML Files
-
-                Another alternative is to use TestNG suite XML files. This allows flexible configuration of the tests to
-                be run.
-                These files are created in the normal way, and then added to the ${thisPlugin} Plugin configuration:
-
-                +---+
-                <plugins>
-                    [...]
-                    <plugin>
-                        <groupId>${project.groupId}</groupId>
-                        <artifactId>${project.artifactId}</artifactId>
-                        <version>${project.version}</version>
-                        <configuration>
-                            <suiteXmlFiles>
-                                <suiteXmlFile>testng.xml</suiteXmlFile>
-                            </suiteXmlFiles>
-                        </configuration>
-                    </plugin>
-                    [...]
-                </plugins>
-                +---+
-
-                This configuration will override the includes and excludes patterns and run all tests in the suite
-                files.
-
-                * Specifying Test Parameters
-
-                Your TestNG test can accept parameters with the @Parameters annotation. You can also pass parameters
-                from Maven
-                into your TestNG test, by specifying them as system properties, like this:
-
-                +---+
-                <plugins>
-                    [...]
-                    <plugin>
-                        <groupId>${project.groupId}</groupId>
-                        <artifactId>${project.artifactId}</artifactId>
-                        <version>${project.version}</version>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <propertyName>firefox</propertyName>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                    [...]
-                </plugins>
-                +---+
-
-                For more information about setting system properties in ${thisPlugin} tests, see
-                {{{./system-properties.html}System Properties}}.
-
-                * Using Groups
-
-                TestNG allows you to group your tests. You can then execute one or more specific groups. To do this
-                with ${thisPlugin},
-                use the <<
-                <groups>>> parameter, for example:
-
-                    +---+
-                    <plugins>
-                        [...]
-                        <plugin>
-                            <groupId>${project.groupId}</groupId>
-                            <artifactId>${project.artifactId}</artifactId>
-                            <version>${project.version}</version>
-                            <configuration>
-                                <groups>functest,perftest</groups>
-                            </configuration>
-                        </plugin>
-                        [...]
-                    </plugins>
-                    +---+
-
-                    Likewise, the <<
-                    <excludedGroups>>> parameter can be used to run all but a certain set of groups.
-
-                        * Running tests in parallel
-
-                        TestNG allows you to run your tests in parallel, including JUnit tests. To do this, you must set
-                        the
-                        <<
-                        <parallel>>> parameter, and may change the <<
-                            <threadCount>>> parameter if the default of 5 is not sufficient.
-                                For example:
-
-                                +---+
-                                </plugins>
-                                [...]
-                                <plugin>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}</artifactId>
-                                    <version>${project.version}</version>
-                                    <configuration>
-                                        <parallel>methods</parallel>
-                                        <threadCount>10</threadCount>
-                                    </configuration>
-                                </plugin>
-                                [...]
-                                </plugins>
-                                +---+
-
-                                This is particularly useful for slow tests that can have high concurrency, or to quickly
-                                and roughly assess the independance
-                                and thread safety of your tests and code.
-
-                                * Using custom listeners and reporters
-
-                                TestNG provides support for attaching custom listeners, reporters, annotation
-                                transformers and method interceptors to your tests.
-                                By default, TestNG attaches a few basic listeners to generate HTML and XML reports.
-
-                                You can configure multiple custom listeners like this:
-
-                                +---+
-                                </plugins>
-                                [...]
-                                <plugin>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}</artifactId>
-                                    <version>${project.version}</version>
-                                    <configuration>
-                                        <properties>
-                                            <property>
-                                                <name>usedefaultlisteners</name>
-                                                <value>false</value>
-                                                <!-- disabling default listeners is optional -->
-                                            </property>
-                                            <property>
-                                                <name>listener</name>
-                                                <value>
-                                                    com.mycompany.MyResultListener,com.mycompany.MyAnnotationTransformer,com.mycompany.MyMethodInterceptor
-                                                </value>
-                                            </property>
-                                            <property>
-                                                <name>reporter</name>
-                                                <value>listenReport.Reporter</value>
-                                            </property>
-                                        </properties>
-                                    </configuration>
-                                </plugin>
-                                [...]
-                                </plugins>
-                                +---+
-
-                                For more information on TestNG, see the {{{http://www.testng.org}TestNG web site}}.
+  <<Note:>> if you are using JDK 1.4 Javadoc annotations for your TestNG tests, replace the classifier <<<jdk15>>> with <<<jdk14>>> above.
+
+#{if}(${project.artifactId}=="maven-surefire-plugin")
+  This is the only step that is required to get started - you can now create tests in your test source directory
+  (eg, <<<src/test/java>>>. As long as they are named using the defaults such as <<<*Test.java>>> they will be run
+  by ${thisPlugin} as TestNG tests.
+#{else}
+  This is the only step that is required to get started - you can now create tests in your test source directory
+  (eg, <<<src/test/java>>>. As long as they are named using the defaults such as <<<*IT.java>>> they will be run
+  by ${thisPlugin} as TestNG tests.
+#{end}
+
+  If you'd like to use a different naming scheme, you can change the <<<includes>>> parameter, as discussed in the
+  {{{./inclusion-exclusion.html}Inclusions and Exclusions of Tests}} example.
+
+* Using Suite XML Files
+
+  Another alternative is to use TestNG suite XML files. This allows flexible configuration of the tests to be run.
+  These files are created in the normal way, and then added to the ${thisPlugin} Plugin configuration:
+
++---+
+<plugins>
+    [...]
+      <plugin>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>${project.artifactId}</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <suiteXmlFiles>
+            <suiteXmlFile>testng.xml</suiteXmlFile>
+          </suiteXmlFiles>
+        </configuration>
+      </plugin>
+    [...]
+</plugins>
++---+
+
+  This configuration will override the includes and excludes patterns and run all tests in the suite files.
+
+* Specifying Test Parameters
+
+  Your TestNG test can accept parameters with the @Parameters annotation.  You can also pass parameters from Maven
+  into your TestNG test, by specifying them as system properties, like this:
+
++---+
+<plugins>
+    [...]
+      <plugin>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>${project.artifactId}</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <systemPropertyVariables>
+            <propertyName>firefox</propertyName>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    [...]
+</plugins>
++---+
+
+  For more information about setting system properties in ${thisPlugin} tests, see {{{./system-properties.html}System Properties}}.
+
+* Using Groups
+
+  TestNG allows you to group your tests. You can then execute one or more specific groups. To do this with ${thisPlugin},
+  use the <<<groups>>> parameter, for example:
+
++---+
+<plugins>
+    [...]
+      <plugin>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>${project.artifactId}</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <groups>functest,perftest</groups>
+        </configuration>
+      </plugin>
+    [...]
+</plugins>
++---+
+
+  Likewise, the <<<excludedGroups>>> parameter can be used to run all but a certain set of groups.
+
+* Running tests in parallel
+
+  TestNG allows you to run your tests in parallel, including JUnit tests. To do this, you must set the
+  <<<parallel>>> parameter, and may change the <<<threadCount>>> parameter if the default of 5 is not sufficient.
+  For example:
+
++---+
+</plugins>
+    [...]
+      <plugin>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>${project.artifactId}</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <parallel>methods</parallel>
+          <threadCount>10</threadCount>
+        </configuration>
+      </plugin>
+    [...]
+</plugins>
++---+
+
+  This is particularly useful for slow tests that can have high concurrency, or to quickly and roughly assess the independance
+  and thread safety of your tests and code.
+
+* Using custom listeners and reporters
+
+  TestNG provides support for attaching custom listeners, reporters, annotation transformers and method interceptors to your tests.
+  By default, TestNG attaches a few basic listeners to generate HTML and XML reports.
+
+  You can configure multiple custom listeners like this:
+
++---+
+</plugins>
+    [...]
+      <plugin>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>${project.artifactId}</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <properties>
+            <property>
+              <name>usedefaultlisteners</name>
+              <value>false</value> <!-- disabling default listeners is optional -->
+            </property>
+            <property>
+              <name>listener</name>
+              <value>com.mycompany.MyResultListener,com.mycompany.MyAnnotationTransformer,com.mycompany.MyMethodInterceptor</value>
+            </property>
+            <property>
+              <name>reporter</name>
+              <value>listenReport.Reporter</value>
+            </property>
+          </properties>
+        </configuration>
+      </plugin>
+    [...]
+</plugins>
++---+
+
+  For more information on TestNG, see the {{{http://www.testng.org}TestNG web site}}.

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8970909c/maven-surefire-plugin/src/site/apt/featurematrix.apt.vm
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/apt/featurematrix.apt.vm b/maven-surefire-plugin/src/site/apt/featurematrix.apt.vm
index 63e06b0..13a06a9 100644
--- a/maven-surefire-plugin/src/site/apt/featurematrix.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/featurematrix.apt.vm
@@ -20,34 +20,27 @@
 
 Feature matrix
 
-Not all features are supported for all test frameworks, and the following table gives a brief overview
-of support status:
+    Not all features are supported for all test frameworks, and the following table gives a brief overview
+    of support status:
 
 *---------------------------------------------+-----------+-----------+------------+-----------+----------+
-|| <
-<Feature>> ||<
-    <JUnit3>>||<
-        <JUnit4>>||<
-            <Junit47>>||<
-                <TestNG>>||<
-                    <Pojo>> |
-                        *---------------------------------------------+------------+----------+------------+-----------+----------+
-                        | groups/category support | N | N | Y | Y | N |
-                        *---------------------------------------------+------------+----------+------------+-----------+----------+
-                        | security manager support | Y | N | N | N | N |
-                        *---------------------------------------------+------------+----------+------------+-----------+----------+
-                        | runOrder support | Y | Y | Y | ? | Y |
-                        *---------------------------------------------+------------+----------+------------+-----------+----------+
-                        | run >1 individual test method in a class | N | Y | Y | N | N |
-                        *---------------------------------------------+------------+----------+------------+-----------+----------+
-                        | parallel support | N | N | Y | Y | N |
-                        *---------------------------------------------+------------+----------+------------+-----------+----------+
-
-
-                        Legend: Y means supported, N means not supported. ? means not tested.
-
-                        If you would like to implement support for
-                        a given provider with an N or a ? (or create tests for it), you should create a patch and mark
-                        the issue is an
-                        improvement. If there is something wrong with an implementation marked with "Y" it's a bug.
+|| <<Feature>>                                ||<<JUnit3>>||<<JUnit4>>||<<Junit47>>||<<TestNG>>||<<Pojo>> |
+*---------------------------------------------+------------+----------+------------+-----------+----------+
+| groups/category support                     |     N      |    N     |      Y     |    Y      |  N       |
+*---------------------------------------------+------------+----------+------------+-----------+----------+
+| security manager support                    |     Y      |    N     |      N     |    N      |  N       |
+*---------------------------------------------+------------+----------+------------+-----------+----------+
+| runOrder support                            |     Y      |    Y     |      Y     |    ?      |  Y       |
+*---------------------------------------------+------------+----------+------------+-----------+----------+
+| run >1 individual test method in a class    |     N      |    Y     |      Y     |    N      |  N       |
+*---------------------------------------------+------------+----------+------------+-----------+----------+
+| parallel support                            |     N      |    N     |      Y     |    Y      |  N       |
+*---------------------------------------------+------------+----------+------------+-----------+----------+
+
+
+    Legend: Y means supported, N means not supported. ? means not tested.
+
+    If you would like to implement support for
+    a given provider with an N or a ? (or create tests for it), you should create a patch and mark the issue is an
+    improvement. If there is something wrong with an implementation marked with "Y" it's a bug.
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8970909c/maven-surefire-plugin/src/site/apt/index.apt.vm
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/apt/index.apt.vm b/maven-surefire-plugin/src/site/apt/index.apt.vm
index 5d6f891..b27f3f2 100644
--- a/maven-surefire-plugin/src/site/apt/index.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/index.apt.vm
@@ -1,12 +1,12 @@
-------
-Introduction
-------
-Stephen Connolly
-Allan Ramirez
-------
-2011-06-27
-------
-
+  ------
+  Introduction
+  ------
+  Stephen Connolly
+  Allan Ramirez
+  ------
+  2011-06-27
+  ------
+  
 ~~ 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
@@ -26,144 +26,127 @@ Allan Ramirez
 
 ~~ NOTE: For help with the syntax of this file, see:
 ~~ http://maven.apache.org/doxia/references/apt-format.html
-
+  
 
 Maven ${thisPlugin} Plugin
 
 #{if}(${project.artifactId}=="maven-surefire-plugin")
-The Surefire Plugin is used during the <<
-<test>>> phase of the build
-    lifecycle to execute the unit tests of an application. It generates reports
-    in 2 different file formats:
+  The Surefire Plugin is used during the <<<test>>> phase of the build
+  lifecycle to execute the unit tests of an application. It generates reports
+  in 2 different file formats:
 #{else}
-    The Failsafe Plugin is designed to run integration tests while the Surefire Plugins is designed to run unit tests.
-    The name (failsafe) was chosen both because it is a synonym of surefire and because it implies that when it fails,
-    it
-    does so in a safe way.
+  The Failsafe Plugin is designed to run integration tests while the Surefire Plugins is designed to run unit tests.
+  The name (failsafe) was chosen both because it is a synonym of surefire and because it implies that when it fails, it
+  does so in a safe way.
 
-    The Maven lifecycle has four phases for running integration tests:
+  The Maven lifecycle has four phases for running integration tests:
 
-    * <<
-<pre-integration-test>>> for setting up the integration test environment.
+  * <<<pre-integration-test>>> for setting up the integration test environment.
 
-    * <<
-<integration-test>>> for running the integration tests.
+  * <<<integration-test>>> for running the integration tests.
 
-    * <<
-<post-integration-test>>> for tearing down the integration test environment.
+  * <<<post-integration-test>>> for tearing down the integration test environment.
 
-    * <<
-<verify>>> for checking the results of the integration tests.
+  * <<<verify>>> for checking the results of the integration tests.
 
-    []
+  []
 
-    If you use the Surefire Plugin for running tests, then when you have a test failure, the build will stop at the
-    <<
-<integration-test>>> phase and your integration test environment will not have been torn down correctly.
+  If you use the Surefire Plugin for running tests, then when you have a test failure, the build will stop at the
+  <<<integration-test>>> phase and your integration test environment will not have been torn down correctly.
 
-    The Failsafe Plugin is used during the <<
-<integration-test>>> and <<
-<verify>>> phases of the build
-    lifecycle to execute the integration tests of an application. The Failsafe Plugin will not fail the build during
-    the <<
-<integration-test>>> phase thus enabling the <<
-<post-integration-test>>> phase to execute.
+  The Failsafe Plugin is used during the <<<integration-test>>> and <<<verify>>> phases of the build
+  lifecycle to execute the integration tests of an application. The Failsafe Plugin will not fail the build during
+  the <<<integration-test>>> phase thus enabling the <<<post-integration-test>>> phase to execute.
 
-    NOTE: when running integration tests, you should invoke maven with the (shorter to type too)
+  NOTE: when running integration tests, you should invoke maven with the (shorter to type too)
 
-    +---+
-    mvn verify
-    +---+
++---+
+mvn verify
++---+
 
-    rather than trying to invoke the <<
-<integration-test>>> phase directly, as otherwise the <<
-<post-integration-test>>>
-    phase will not be executed.
+  rather than trying to invoke the <<<integration-test>>> phase directly, as otherwise the <<<post-integration-test>>>
+  phase will not be executed.
 
-    The Failsafe Plugin generates reports in 2 different file formats:
+  The Failsafe Plugin generates reports in 2 different file formats:
 
 #{end}
 
-    * Plain text files (<<<*.txt>>>)
+  * Plain text files (<<<*.txt>>>)
 
-    * XML files (<<<*.xml>>>)
+  * XML files (<<<*.xml>>>)
 
-    []
+  []
 
-    By default, these files are generated at <<<$\{basedir\}/target/${thisPlugin.toLowerCase()}-reports>>>.
+  By default, these files are generated at <<<$\{basedir\}/target/${thisPlugin.toLowerCase()}-reports>>>.
 
-    For an HTML format of the report, please see the
-    {{{http://maven.apache.org/plugins/maven-surefire-report-plugin/}Maven Surefire Report Plugin}}.
+  For an HTML format of the report, please see the
+  {{{http://maven.apache.org/plugins/maven-surefire-report-plugin/}Maven Surefire Report Plugin}}.
 
-    * Goals Overview
+* Goals Overview
 
 #{if}(${project.artifactId}=="maven-surefire-plugin")
-    The Surefire Plugin has only 1 goal:
+  The Surefire Plugin has only 1 goal:
 
-    * {{{./test-mojo.html}surefire:test}} runs the unit tests of an application.
+  * {{{./test-mojo.html}surefire:test}} runs the unit tests of an application.
 
-    []
+  []
 
 #{else}
-    The Failsafe Plugin has only 2 goals:
+  The Failsafe Plugin has only 2 goals:
 
-    * {{{./integration-test-mojo.html}failsafe:integration-test}} runs the integration tests of an application.
+  * {{{./integration-test-mojo.html}failsafe:integration-test}} runs the integration tests of an application.
 
-    * {{{./verify-mojo.html}failsafe:verify}} verifies that the integration tests of an application passed.
+  * {{{./verify-mojo.html}failsafe:verify}} verifies that the integration tests of an application passed.
 
-    []
+  []
 
 #{end}
 
-    * Usage
+* Usage
 
-    General instructions on how to use the ${thisPlugin} Plugin can be found on the {{{./usage.html}usage page}}. Some
-    more
-    specific use cases are described in the examples given below.
-#{if}(${project.artifactId}=="maven-surefire-plugin") Last but not least, users occasionally contribute
-    additional examples, tips or errata to the
-    {{{http://docs.codehaus.org/display/MAVENUSER/Surefire+Plugin}plugin's wiki page}}.#{end}
+  General instructions on how to use the ${thisPlugin} Plugin can be found on the {{{./usage.html}usage page}}. Some more
+  specific use cases are described in the examples given below.
+  #{if}(${project.artifactId}=="maven-surefire-plugin") Last but not least, users occasionally contribute
+  additional examples, tips or errata to the
+  {{{http://docs.codehaus.org/display/MAVENUSER/Surefire+Plugin}plugin's wiki page}}.#{end}
 
-    In case you still have questions regarding the plugin's usage, please have a look at the {{{./faq.html}FAQ}} and
-    feel
-    free to contact the {{{./mail-lists.html}user mailing list}}. The posts to the mailing list are archived and could
-    already contain the answer to your question as part of an older thread. Hence, it is also worth browsing/searching
-    the {{{./mail-lists.html}mail archive}}.
+  In case you still have questions regarding the plugin's usage, please have a look at the {{{./faq.html}FAQ}} and feel
+  free to contact the {{{./mail-lists.html}user mailing list}}. The posts to the mailing list are archived and could
+  already contain the answer to your question as part of an older thread. Hence, it is also worth browsing/searching
+  the {{{./mail-lists.html}mail archive}}.
 
-    If you feel like the plugin is missing a feature or has a defect, you can fill a feature request or bug report in
-    our
-    {{{./issue-tracking.html}issue tracker}}. When creating a new issue, please provide a comprehensive description of
-    your
-    concern. Especially for fixing bugs it is crucial that the developers can reproduce your problem. For this reason,
-    entire debug logs, POMs or most preferably little demo projects attached to the issue are very much appreciated.
-    Of course, patches are welcome, too. Contributors can check out the project from our
-    {{{./source-repository.html}source repository}} and will find supplementary information in the
-    {{{http://maven.apache.org/guides/development/guide-helping.html}guide to helping with Maven}}.
+  If you feel like the plugin is missing a feature or has a defect, you can fill a feature request or bug report in our
+  {{{./issue-tracking.html}issue tracker}}. When creating a new issue, please provide a comprehensive description of your
+  concern. Especially for fixing bugs it is crucial that the developers can reproduce your problem. For this reason,
+  entire debug logs, POMs or most preferably little demo projects attached to the issue are very much appreciated.
+  Of course, patches are welcome, too. Contributors can check out the project from our
+  {{{./source-repository.html}source repository}} and will find supplementary information in the
+  {{{http://maven.apache.org/guides/development/guide-helping.html}guide to helping with Maven}}.
 
-    * Examples
+* Examples
 
-    The following examples show how to use the ${thisPlugin} Plugin in more advanced use-cases:
+  The following examples show how to use the ${thisPlugin} Plugin in more advanced use-cases:
 
-    * {{{./examples/testng.html}Using TestNG}}
+  * {{{./examples/testng.html}Using TestNG}}
 
-    * {{{./examples/junit.html}Using JUnit}}
+  * {{{./examples/junit.html}Using JUnit}}
 
-    * {{{./examples/pojo-test.html}Using POJO Tests}}
+  * {{{./examples/pojo-test.html}Using POJO Tests}}
 
-    * {{{./examples/skipping-test.html}Skipping Tests}}
+  * {{{./examples/skipping-test.html}Skipping Tests}}
 
-    * {{{./examples/inclusion-exclusion.html}Inclusions and Exclusions of Tests}}
+  * {{{./examples/inclusion-exclusion.html}Inclusions and Exclusions of Tests}}
 
-    * {{{./examples/single-test.html}Running a Single Test}}
+  * {{{./examples/single-test.html}Running a Single Test}}
 
-    * {{{./examples/class-loading.html}Class Loading Issues}}
+  * {{{./examples/class-loading.html}Class Loading Issues}}
 
-    * {{{./examples/debugging.html}Debugging Tests}}
+  * {{{./examples/debugging.html}Debugging Tests}}
 
-    * {{{./examples/system-properties.html}Using System Properties}}
+  * {{{./examples/system-properties.html}Using System Properties}}
 
-    * {{{./examples/configuring-classpath.html}Configuring the Classpath}}
+  * {{{./examples/configuring-classpath.html}Configuring the Classpath}}
 
-    * {{{./examples/providers.html}Selecting providers}}
+  * {{{./examples/providers.html}Selecting providers}}
 
-    []
+  []


Mime
View raw message