You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2017/05/01 22:33:17 UTC

[1/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8

Repository: maven-surefire
Updated Branches:
  refs/heads/master cba4adb1b -> b54e33e68


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml b/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
index 4cb27c6..760211d 100644
--- a/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml
index f1a554b..84378e8 100644
--- a/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-multiple-method-patterns/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml b/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml
index d9d0a31..c90c6e0 100644
--- a/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-parallel-suites/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml b/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml
index 58c275c..ca93853 100644
--- a/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-parallel-with-annotations/pom.xml
@@ -10,7 +10,7 @@
 	-->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml b/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml
index 88eb6da..5f2e8e7 100644
--- a/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml	
+++ b/surefire-integration-tests/src/test/resources/testng-path with spaces/pom.xml	
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-simple/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-simple/pom.xml b/surefire-integration-tests/src/test/resources/testng-simple/pom.xml
index bad1178..2fcdfde 100644
--- a/surefire-integration-tests/src/test/resources/testng-simple/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-simple/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml b/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml
index 7539000..1f84839 100644
--- a/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml b/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml
index 965fc55..e2fbaa7 100644
--- a/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-succes-percentage/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-succes-percentage/pom.xml b/surefire-integration-tests/src/test/resources/testng-succes-percentage/pom.xml
index 1d2cfbd..4e74bd8 100644
--- a/surefire-integration-tests/src/test/resources/testng-succes-percentage/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-succes-percentage/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml b/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml
index f51bb49..96438a0 100644
--- a/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-suite-xml/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml b/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml
index 37d77bf..abdf7a1 100644
--- a/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-twoTestCaseSuite/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml b/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml
index d1bf628..ef9ea09 100644
--- a/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml
+++ b/surefire-integration-tests/src/test/resources/timeout-forked/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml b/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml
index 1056c79..2a385b5 100644
--- a/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml
+++ b/surefire-integration-tests/src/test/resources/unicode-testnames/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/webapp/pom.xml b/surefire-integration-tests/src/test/resources/webapp/pom.xml
index a9b0c39..6777637 100644
--- a/surefire-integration-tests/src/test/resources/webapp/pom.xml
+++ b/surefire-integration-tests/src/test/resources/webapp/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.surefire.its</groupId>
   <artifactId>webapp</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml b/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml
index b079009..40366ab 100644
--- a/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml
+++ b/surefire-integration-tests/src/test/resources/working-directory-is-invalid-property/pom.xml
@@ -19,7 +19,7 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>localhost</groupId>
   <artifactId>working-directory-test</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml b/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml
index 04c7490..677f6d3 100644
--- a/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml
+++ b/surefire-integration-tests/src/test/resources/working-directory-missing/pom.xml
@@ -19,7 +19,7 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>localhost</groupId>
   <artifactId>working-directory-test</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml b/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml
index bca882c..bdfbed8 100644
--- a/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml
+++ b/surefire-integration-tests/src/test/resources/working-directory/child/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/working-directory/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/working-directory/pom.xml b/surefire-integration-tests/src/test/resources/working-directory/pom.xml
index 80e97b3..88d7f46 100644
--- a/surefire-integration-tests/src/test/resources/working-directory/pom.xml
+++ b/surefire-integration-tests/src/test/resources/working-directory/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/ConsoleLogger.java
----------------------------------------------------------------------
diff --git a/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/ConsoleLogger.java b/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/ConsoleLogger.java
index 6baa7e3..34a8f83 100644
--- a/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/ConsoleLogger.java
+++ b/surefire-logger-api/src/main/java/org/apache/maven/plugin/surefire/log/api/ConsoleLogger.java
@@ -21,16 +21,13 @@ package org.apache.maven.plugin.surefire.log.api;
 
 /**
  * Allows providers to write console messages on the running maven process.
- * <p/>
+ * <br>
  * This output is associated with the entire test run and not a specific
  * test, which means it just goes "straight" to the console "immediately".
- * <p/>
- * s* <p/>
- * <p/>
+ * <br>
  * This interface is used in org.apache.maven.plugin.surefire.CommonReflector and reflected
  * via IsolatedClassLoader which can see classes from JRE only. This interface MUST use
  * JRE types in method signatures, e.g. {@link String} or {@link Throwable}, etc.
- * <p/>
  */
 public interface ConsoleLogger
 {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
index 06f0fca..2a17bcb 100644
--- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
@@ -46,8 +46,9 @@ public class JUnit4RunListener
     protected final RunListener reporter;
 
     /**
-     * This flag is set after a failure has occurred so that a <code>testSucceeded</code> event is not fired.
-     * This is necessary because JUnit4 always fires a <code>testRunFinished</code> event-- even if there was a failure.
+     * This flag is set after a failure has occurred so that a {@link RunListener#testSucceeded} event is not fired.
+     * This is necessary because JUnit4 always fires a {@link org.junit.runner.notification.RunListener#testRunFinished}
+     * event-- even if there was a failure.
      */
     private final ThreadLocal<Boolean> failureFlag = new InheritableThreadLocal<Boolean>();
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
index 36096e4..228ca6d 100644
--- a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
+++ b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
@@ -45,7 +45,7 @@ public class FilterFactory
     }
 
     /**
-     * @return <tt>true</tt> if non-blank
+     * @return {@code true} if non-blank
      * {@link org.apache.maven.surefire.booter.ProviderParameterNames#TESTNG_GROUPS_PROP} and/or
      * {@link org.apache.maven.surefire.booter.ProviderParameterNames#TESTNG_EXCLUDEDGROUPS_PROP} exists.
      */

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit46StackTraceWriter.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit46StackTraceWriter.java b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit46StackTraceWriter.java
index a07caaa..4051e19 100644
--- a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit46StackTraceWriter.java
+++ b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit46StackTraceWriter.java
@@ -24,7 +24,7 @@ import org.junit.runner.notification.Failure;
 
 /**
  * A stacktrace writer that requires at least junit 4.6 to run. Note that we only use this for 4.8 and higher
- * <p/>
+ * <br>
  * Writes out a specific {@link org.junit.runner.notification.Failure} for
  * surefire as a stacktrace.
  *

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
index 8095dbf..56e3e1a 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentRunListener.java
@@ -32,7 +32,7 @@ import static org.apache.maven.surefire.junitcore.TestMethod.getThreadTestMethod
 
 /**
  * Handles responses from concurrent junit
- * <p/>
+ * <br>
  * Stuff to remember about JUnit threading:
  * parallel=classes; beforeClass/afterClass, constructor and all tests method run on same thread
  * parallel=methods; beforeClass/afterClass run on main thread, constructor + each test method run on same thread

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCore.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCore.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCore.java
index 9935d9a..ef1d63f 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCore.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCore.java
@@ -32,7 +32,7 @@ import org.junit.runner.notification.RunListener;
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
  * @since 2.19
- * @see https://github.com/junit-team/junit/issues/1186
+ * @see <a href="https://github.com/junit-team/junit/issues/1186">JUnit issue 1186</a>
  */
 class JUnitCore
 {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
index 6a7a248..52aec92 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
@@ -117,10 +117,11 @@ public final class JUnitCoreParameters
     }
 
     /**
-     * @deprecated Instead use the expression ( {@link #isParallelMethods()} && {@link #isParallelClasses()} ).
+     * @deprecated Instead use the expression isParallelMethods() &amp;&amp; isParallelClasses().
+     * @return {@code true} if classes and methods are both parallel
      */
     @Deprecated
-    @SuppressWarnings( { "unused", "deprecation" } )
+    @SuppressWarnings( "unused" )
     public boolean isParallelBoth()
     {
         return isParallelMethods() && isParallelClasses();

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListener.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListener.java
index 98b87ef..e32e32c 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListener.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListener.java
@@ -32,7 +32,7 @@ import org.junit.runner.notification.Failure;
 
 /**
  * Noteworthy things about JUnit4 listening:
- * <p/>
+ * <br>
  * A class that is annotated with @Ignore will have one invocation of "testSkipped" with source==name
  * A method that is annotated with @Ignore will have a invocation of testSkipped with source and name distinct
  * Methods annotated with @Ignore trigger no further events.

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
index ef70027..7bba28c 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Represents the test-state of a single test method that is run.
- * <p/>
+ * <br>
  * Notes about thread safety: This instance is serially confined to 1-3 threads (construction, test-run, reporting),
  * without any actual parallel access
  */

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ThreadSafe.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ThreadSafe.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ThreadSafe.java
index 4f28775..2eaf90a 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ThreadSafe.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ThreadSafe.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
 
 /**
  * After compiling sources under endorsed junit:4.7, this annotation
- * is relocated in {@link org.junit.runner.notification.RunListener.ThreadSafe}.
+ * is relocated in org.junit.runner.notification.RunListener.ThreadSafe.
  */
 @Documented
 @Target( ElementType.TYPE )

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Balancer.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Balancer.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Balancer.java
index 873ccfd..ec93dba 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Balancer.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Balancer.java
@@ -22,7 +22,7 @@ package org.apache.maven.surefire.junitcore.pc;
 /**
  * The Balancer controls the maximum of concurrent threads in the current Scheduler(s) and prevents
  * from own thread resources exhaustion if other group of schedulers share the same pool of threads.
- * <p/>
+ * <br>
  * If a permit is available, {@link #acquirePermit()} simply returns and a new test is scheduled
  * by {@link Scheduler#schedule(Runnable)} in the current runner. Otherwise waiting for a release.
  * One permit is released as soon as the child thread has finished.
@@ -36,7 +36,7 @@ public interface Balancer
     /**
      * Acquires a permit from this balancer, blocking until one is available.
      *
-     * @return <code>true</code> if current thread is <em>NOT</em> interrupted
+     * @return {@code true} if current thread is <b>NOT</b> interrupted
      *         while waiting for a permit.
      */
     boolean acquirePermit();

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/BalancerFactory.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/BalancerFactory.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/BalancerFactory.java
index e4c36e3..82a9a46 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/BalancerFactory.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/BalancerFactory.java
@@ -32,6 +32,7 @@ public class BalancerFactory
 
     /**
      * Infinite permits.
+     * @return Balancer wih infinite permits
      */
     public static Balancer createInfinitePermitsBalancer()
     {
@@ -43,6 +44,7 @@ public class BalancerFactory
      * Fairness guarantees the waiting schedulers to wake up in order they acquired a permit.
      *
      * @param concurrency number of permits to acquire when maintaining concurrency on tests
+     * @return Balancer with given number of permits
      */
     public static Balancer createBalancer( int concurrency )
     {
@@ -54,6 +56,7 @@ public class BalancerFactory
      * Fairness guarantees the waiting schedulers to wake up in order they acquired a permit.
      *
      * @param concurrency number of permits to acquire when maintaining concurrency on tests
+     * @return Balancer with given number of permits
      */
     public static Balancer createBalancerWithFairness( int concurrency )
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ExecutionStatus.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ExecutionStatus.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ExecutionStatus.java
index 2afc012..07c21c9 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ExecutionStatus.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ExecutionStatus.java
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.junitcore.pc;
  */
 
 /**
- * Status of {@link ParallelComputer ParallelComputer runtime}.<p/>
+ * Status of {@link ParallelComputer ParallelComputer runtime}.<br>
  * Used together with shutdown hook.
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java
index 0b35765..92ee18c 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerBuilder.java
@@ -56,6 +56,7 @@ import static org.apache.maven.surefire.junitcore.pc.Type.CLASSES;
 import static org.apache.maven.surefire.junitcore.pc.Type.METHODS;
 import static org.apache.maven.surefire.junitcore.pc.Type.SUITES;
 
+@SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } )
 /**
  * Executing suites, classes and methods with defined concurrency. In this example the threads which completed
  * the suites and classes can be reused in parallel methods.
@@ -70,9 +71,9 @@ import static org.apache.maven.surefire.junitcore.pc.Type.SUITES;
  * Note that the type has always at least one thread even if unspecified. The capacity in
  * {@link ParallelComputerBuilder#useOnePool(int)} must be greater than the number of concurrent suites and classes
  * altogether.
- * <p/>
+ * <br>
  * The Computer can be stopped in a separate thread. Pending tests will be interrupted if the argument is
- * <tt>true</tt>.
+ * {@code true}.
  * <pre>
  * computer.describeStopped(true);
  * </pre>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtil.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtil.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtil.java
index d9e3467..e70fc6f 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtil.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ParallelComputerUtil.java
@@ -30,7 +30,8 @@ import java.util.Iterator;
 /**
  * An algorithm which configures {@link ParallelComputer} with allocated thread resources by given
  * {@link org.apache.maven.surefire.junitcore.JUnitCoreParameters}.
- * The <code>AbstractSurefireMojo</code> has to provide correct combinations of thread-counts and <em>parallel</em>.
+ * The {@code AbstractSurefireMojo} has to provide correct combinations of thread-counts and
+ * configuration parameter {@code parallel}.
  *
  * @author Tibor Digana (tibor17)
  * @see org.apache.maven.surefire.junitcore.pc.ParallelComputerBuilder

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Scheduler.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Scheduler.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Scheduler.java
index 3c21409..cf2b7ac 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Scheduler.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/Scheduler.java
@@ -36,10 +36,10 @@ import java.util.concurrent.ThreadPoolExecutor;
 /**
  * Schedules tests, controls thread resources, awaiting tests and other schedulers finished, and
  * a master scheduler can shutdown slaves.
- * <p/>
+ * <br>
  * The scheduler objects should be first created (and wired) and set in runners
  * {@link org.junit.runners.ParentRunner#setScheduler(org.junit.runners.model.RunnerScheduler)}.
- * <p/>
+ * <br>
  * A new instance of scheduling strategy should be passed to the constructor of this scheduler.
  *
  * @author Tibor Digana (tibor17)
@@ -68,9 +68,13 @@ public class Scheduler
 
     /**
      * Use e.g. parallel classes have own non-shared thread pool, and methods another pool.
-     * <p/>
+     * <br>
      * You can use it with one infinite thread pool shared in strategies across all
      * suites, class runners, etc.
+     *
+     * @param logger          console logger
+     * @param description     JUnit description of class
+     * @param strategy        scheduling strategy
      */
     public Scheduler( ConsoleStream logger, Description description, SchedulingStrategy strategy )
     {
@@ -79,10 +83,10 @@ public class Scheduler
 
     /**
      * Should be used if schedulers in parallel children and parent use one instance of bounded thread pool.
-     * <p/>
+     * <br>
      * Set this scheduler in a e.g. one suite of classes, then every individual class runner should reference
-     * {@link Scheduler(ConsoleStream, org.junit.runner.Description, Scheduler, SchedulingStrategy)}
-     * or {@link Scheduler(ConsoleStream, org.junit.runner.Description, Scheduler, SchedulingStrategy, int)}.
+     * {@link #Scheduler(ConsoleStream, org.junit.runner.Description, Scheduler, SchedulingStrategy)}
+     * or {@link #Scheduler(ConsoleStream, org.junit.runner.Description, Scheduler, SchedulingStrategy, int)}.
      *
      * @param logger current logger implementation
      * @param description description of current runner
@@ -98,9 +102,9 @@ public class Scheduler
     /**
      * New instances should be used by schedulers with limited concurrency by <tt>balancer</tt>
      * against other groups of schedulers. The schedulers share one pool.
-     * <p/>
-     * Unlike in {@link Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy, int)} which was
-     * limiting the <tt>concurrency</tt> of children of a runner where this scheduler was set, <em>this</em>
+     * <br>
+     * Unlike in {@link #Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy, int)} which was
+     * limiting the <tt>concurrency</tt> of children of a runner where this scheduler was set, {@code this}
      * <tt>balancer</tt> is limiting the concurrency of all children in runners having schedulers created by this
      * constructor.
      *
@@ -140,11 +144,16 @@ public class Scheduler
     }
 
     /**
+     * @param logger          console logger
+     * @param description     JUnit description of class
      * @param masterScheduler a reference to
-     * {@link Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy, int)}
-     *                        or {@link Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy)}
-     * @see Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy)
-     * @see Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy, int)
+     * {@link #Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy, int)}
+     *                        or {@link #Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy)}
+     * @param strategy        scheduling strategy
+     * @param concurrency     determines maximum concurrent children scheduled a time via {@link #schedule(Runnable)}
+     *
+     * @see #Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy)
+     * @see #Scheduler(ConsoleStream, org.junit.runner.Description, SchedulingStrategy, int)
      */
     public Scheduler( ConsoleStream logger, Description description, Scheduler masterScheduler,
                       SchedulingStrategy strategy, int concurrency )
@@ -157,8 +166,13 @@ public class Scheduler
     /**
      * Should be used with individual pools on suites, classes and methods, see
      * {@link org.apache.maven.surefire.junitcore.pc.ParallelComputerBuilder#useSeparatePools()}.
-     * <p/>
+     * <br>
      * Cached thread pool is infinite and can be always shared.
+     *
+     * @param logger          console logger
+     * @param description     JUnit description of class
+     * @param masterScheduler parent scheduler
+     * @param strategy        scheduling strategy
      */
     public Scheduler( ConsoleStream logger, Description description, Scheduler masterScheduler,
                       SchedulingStrategy strategy )
@@ -177,7 +191,7 @@ public class Scheduler
 
     /**
      * @param slave a slave scheduler to register
-     * @return <tt>true</tt> if successfully registered the <tt>slave</tt>.
+     * @return {@code true} if successfully registered the <tt>slave</tt>.
      */
     private boolean register( Scheduler slave )
     {
@@ -196,7 +210,7 @@ public class Scheduler
     }
 
     /**
-     * @return <tt>true</tt> if new tasks can be scheduled.
+     * @return {@code true} if new tasks can be scheduled.
      */
     private boolean canSchedule()
     {
@@ -226,11 +240,11 @@ public class Scheduler
     /**
      * Attempts to stop all actively executing tasks and immediately returns a collection
      * of descriptions of those tasks which have started prior to this call.
-     * <p/>
+     * <br>
      * This scheduler and other registered schedulers will stop, see {@link #register(Scheduler)}.
      * If <tt>shutdownNow</tt> is set, waiting methods will be interrupted via {@link Thread#interrupt}.
      *
-     * @param stopNow if <tt>true</tt> interrupts waiting test methods
+     * @param stopNow if {@code true} interrupts waiting test methods
      * @return collection of descriptions started before shutting down
      */
     protected ShutdownResult describeStopped( boolean stopNow )
@@ -252,7 +266,7 @@ public class Scheduler
      *                            is finished in
      *                            {@link org.junit.runners.Suite#run(org.junit.runner.notification.RunNotifier)}
      *                            all the thread-pools created by {@link ParallelComputerBuilder.PC} are already dead.
-     *                            See the unit test <em>ParallelComputerBuilder#timeoutAndForcedShutdown()</em>.
+     *                            See the unit test {@code ParallelComputerBuilder#timeoutAndForcedShutdown()}.
      * @param stopNow             Interrupting tests by {@link java.util.concurrent.ExecutorService#shutdownNow()} or
      *                            {@link java.util.concurrent.Future#cancel(boolean) Future#cancel(true)} or
      *                            {@link Thread#interrupt()}.
@@ -428,7 +442,7 @@ public class Scheduler
         }
 
         /**
-         * @return <tt>true</tt> if new children can be scheduled.
+         * @return {@code true} if new children can be scheduled.
          */
         boolean canSchedule()
         {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategies.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategies.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategies.java
index 520c312..b3f80ba 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategies.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategies.java
@@ -67,7 +67,7 @@ public class SchedulingStrategies
 
     /**
      * The <tt>threadPool</tt> passed to this strategy can be shared in other strategies.
-     * <p/>
+     * <br>
      * The call {@link SchedulingStrategy#finished()} is waiting until own tasks have finished.
      * New tasks will not be scheduled by this call in this strategy. This strategy is not
      * waiting for other strategies to finish. The {@link org.junit.runners.model.RunnerScheduler#finished()} may

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategy.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategy.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategy.java
index ce337bc..d310628 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategy.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategy.java
@@ -27,10 +27,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Specifies the strategy of scheduling whether sequential, or parallel.
- * The strategy may use a thread pool <em>shared</em> with other strategies.
- * <p/>
+ * The strategy may use a thread pool <b>shared</b> with other strategies.
+ * <br>
  * One instance of strategy can be used just by one {@link Scheduler}.
- * <p/>
+ * <br>
  * The strategy is scheduling tasks in {@link #schedule(Runnable)} and awaiting them
  * completed in {@link #finished()}. Both methods should be used in one thread.
  *
@@ -66,8 +66,8 @@ public abstract class SchedulingStrategy
      * Waiting for scheduled tasks to finish.
      * New tasks will not be scheduled by calling this method.
      *
-     * @return <tt>true</tt> if successfully stopped the scheduler, else
-     *         <tt>false</tt> if already stopped (a <em>shared</em> thread
+     * @return {@code true} if successfully stopped the scheduler, else
+     *         {@code false} if already stopped (a <b>shared</b> thread
      *         pool was shutdown externally).
      * @throws InterruptedException if interrupted while waiting
      *                              for scheduled tasks to finish
@@ -78,24 +78,24 @@ public abstract class SchedulingStrategy
 
     /**
      * Stops scheduling new tasks (e.g. by {@link java.util.concurrent.ExecutorService#shutdown()}
-     * on a private thread pool which cannot be <em>shared</em> with other strategy).
+     * on a private thread pool which cannot be <b>shared</b> with other strategy).
      *
-     * @return <tt>true</tt> if successfully stopped the scheduler, else
-     *         <tt>false</tt> if already stopped (a <em>shared</em> thread
+     * @return {@code true} if successfully stopped the scheduler, else
+     *         {@code false} if already stopped (a <b>shared</b> thread
      *         pool was shutdown externally).
      * @see java.util.concurrent.ExecutorService#shutdown()
      */
     protected abstract boolean stop();
 
     /**
-     * Stops scheduling new tasks and <em>interrupts</em> running tasks
+     * Stops scheduling new tasks and {@code interrupts} running tasks
      * (e.g. by {@link java.util.concurrent.ExecutorService#shutdownNow()} on a private thread pool
-     * which cannot be <em>shared</em> with other strategy).
-     * <p/>
+     * which cannot be <b>shared</b> with other strategy).
+     * <br>
      * This method calls {@link #stop()} by default.
      *
-     * @return <tt>true</tt> if successfully stopped the scheduler, else
-     *         <tt>false</tt> if already stopped (a <em>shared</em> thread
+     * @return {@code true} if successfully stopped the scheduler, else
+     *         {@code false} if already stopped (a <b>shared</b> thread
      *         pool was shutdown externally).
      * @see java.util.concurrent.ExecutorService#shutdownNow()
      */
@@ -105,7 +105,7 @@ public abstract class SchedulingStrategy
     }
 
     /**
-     * Persistently disables this strategy. Atomically ignores {@link Balancer} to acquire a new permit.<p/>
+     * Persistently disables this strategy. Atomically ignores {@link Balancer} to acquire a new permit.<br>
      * The method {@link #canSchedule()} atomically returns {@code false}.
      * @return {@code true} if {@link #canSchedule()} has return {@code true} on the beginning of this method call.
      */
@@ -119,13 +119,13 @@ public abstract class SchedulingStrategy
     }
 
     /**
-     * @return <tt>true</tt> if a thread pool associated with this strategy
+     * @return {@code true} if a thread pool associated with this strategy
      *         can be shared with other strategies.
      */
     protected abstract boolean hasSharedThreadPool();
 
     /**
-     * @return <tt>true</tt> unless stopped, finished or disabled.
+     * @return {@code true} unless stopped, finished or disabled.
      */
     protected boolean canSchedule()
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java
index a0f5c2d..8e61fa3 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/SingleThreadScheduler.java
@@ -33,8 +33,8 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 /**
- * Used to execute tests annotated with {@link net.jcip.annotations.NotThreadSafe}.
- * <p/>
+ * Used to execute tests annotated with net.jcip.annotations.NotThreadSafe.
+ * <br>
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
  * @see ParallelComputerBuilder

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ThreadResourcesBalancer.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ThreadResourcesBalancer.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ThreadResourcesBalancer.java
index 070c457..13f49bf 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ThreadResourcesBalancer.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/ThreadResourcesBalancer.java
@@ -48,7 +48,7 @@ final class ThreadResourcesBalancer
     /**
      * @param numPermits number of permits to acquire when maintaining concurrency on tests.
      *                   Must be &gt;0 and &lt; {@link Integer#MAX_VALUE}.
-     * @param fair       <tt>true</tt> guarantees the waiting schedulers to wake up in order they acquired a permit
+     * @param fair       {@code true} guarantees the waiting schedulers to wake up in order they acquired a permit
      * @throws IllegalArgumentException if <tt>numPermits</tt> is not positive number
      */
     ThreadResourcesBalancer( int numPermits, boolean fair )
@@ -65,7 +65,7 @@ final class ThreadResourcesBalancer
     /**
      * Acquires a permit from this balancer, blocking until one is available.
      *
-     * @return <code>true</code> if current thread is <em>NOT</em> interrupted
+     * @return {@code true} if current thread is <b>NOT</b> interrupted
      *         while waiting for a permit.
      */
     @Override

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/WrappedRunners.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/WrappedRunners.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/WrappedRunners.java
index ba45e74..707cc35 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/WrappedRunners.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/pc/WrappedRunners.java
@@ -23,7 +23,7 @@ import org.junit.runners.ParentRunner;
 
 /**
  * We need to wrap runners in a suite and count children of these runners.
- * <p/>
+ * <br>
  * Old JUnit versions do not cache children after the first call of
  * {@link org.junit.runners.ParentRunner#getChildren()}.
  * Due to performance reasons, the children have to be observed just once.

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
index b883d09..3e139e1 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
@@ -27,15 +27,15 @@ import org.junit.runner.notification.Failure;
  * {@code
  * TestCase that expose "No tests were executed!" on Test failure using Maven Surefire 2.6-SNAPSHOT
  * and the JUnit 4.7 Runner.
- * <p/>
+ * <br>
  * -------------------------------------------------------
  * T E S T S
  * -------------------------------------------------------
- * <p/>
+ * <br>
  * Results:
- * <p/>
+ * <br>
  * Tests run: 0, Failures: 0, Errors: 0, Skipped: 0
- * <p/>
+ * <br>
  * [INFO] ------------------------------------------------------------------------
  * [INFO] BUILD FAILURE
  * [INFO] ------------------------------------------------------------------------
@@ -46,15 +46,15 @@ import org.junit.runner.notification.Failure;
  * [ERROR] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.5:test
  * (default-test) on project xxxxxx: No tests were executed!  (Set -DfailIfNoTests=false to
  * ignore this error.) -> [Help 1]
- * <p/>
- * <p/>
+ * <br>
+ * <br>
  * <dependency>
  * <groupId>junit</groupId>
  * <artifactId>junit</artifactId>
  * <version>4.8.1</version>
  * <scope>test</scope>
  * </dependency>
- * <p/>
+ * <br>
  * <dependency>
  * <groupId>org.apache.maven.surefire</groupId>
  * <artifactId>surefire-booter</artifactId>
@@ -90,7 +90,7 @@ public class MavenSurefireJUnit47RunnerTest
     * JUnits ParentRunner is responsible for adding the BeforeClass/AfterClass statements to the
     * statement execution chain. After BeforeClass is executed, a Statement that delegates to the
     * abstract method: runChild(T child, RunNotifier notifier) is called. As the JavaDoc explains:
-    * "Subclasses are responsible for making sure that relevant test events are reported through {@code notifier}".
+    * "Subclasses are responsible for making sure that relevant test events are reported through <b>notifier</b>".
     * When a @BeforeClass fail, the child that should handle the relevant test events(Started, Failed, Finished)
     * is never executed.
     *

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java
index 08e1695..1faa782 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java
@@ -27,15 +27,15 @@ import org.junit.runner.notification.Failure;
  * TestCase that expose "No tests were executed!" on Test failure using Maven Surefire 2.6-SNAPSHOT
  * and the JUnit 4.8 Runner.
  * {@code
- * * <p/>
+ * * <br>
  * -------------------------------------------------------
  * T E S T S
  * -------------------------------------------------------
- * <p/>
+ * <br>
  * Results:
- * <p/>
+ * <br>
  * Tests run: 0, Failures: 0, Errors: 0, Skipped: 0
- * <p/>
+ * <br>
  * [INFO] ------------------------------------------------------------------------
  * [INFO] BUILD FAILURE
  * [INFO] ------------------------------------------------------------------------
@@ -46,15 +46,15 @@ import org.junit.runner.notification.Failure;
  * [ERROR] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.5:test
  * (default-test) on project xxxxxx: No tests were executed!  (Set -DfailIfNoTests=false to
  * ignore this error.) -> [Help 1]
- * <p/>
- * <p/>
+ * <br>
+ * <br>
  * <dependency>
  * <groupId>junit</groupId>
  * <artifactId>junit</artifactId>
  * <version>4.8.1</version>
  * <scope>test</scope>
  * </dependency>
- * <p/>
+ * <br>
  * <dependency>
  * <groupId>org.apache.maven.surefire</groupId>
  * <artifactId>surefire-booter</artifactId>
@@ -90,7 +90,7 @@ public class MavenSurefireJUnit48RunnerTest
     * JUnits ParentRunner is responsible for adding the BeforeClass/AfterClass statements to the
     * statement execution chain. After BeforeClass is executed, a Statement that delegates to the
     * abstract method: runChild(T child, RunNotifier notifier) is called. As the JavaDoc explains:
-    * "Subclasses are responsible for making sure that relevant test events are reported through {@code notifier}".
+    * "Subclasses are responsible for making sure that relevant test events are reported through <b>notifier</b>".
     * When a @BeforeClass fail, the child that should handle the relevant test events(Started, Failed, Finished)
     * is never executed.
     *

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
index 3e9ca93..eb5534e 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
@@ -54,7 +54,7 @@ import static junit.framework.Assert.assertEquals;
  * <version>4.8.1</version>
  * <scope>test</scope>
  * </dependency>
- * <p/>
+ * <br>
  * <dependency>
  * <groupId>org.apache.maven.surefire</groupId>
  * <artifactId>surefire-booter</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategiesTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategiesTest.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategiesTest.java
index 812355f..0f1ac1a 100644
--- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategiesTest.java
+++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/pc/SchedulingStrategiesTest.java
@@ -33,13 +33,13 @@ import static org.junit.Assert.assertTrue;
 
 /**
  * Tests the factories in SchedulingStrategy.
- * <p/>
+ * <br>
  * Th point of these tests is to check {@link Task#result} if changed
- * from <code>false</code> to <code>true</code> after all scheduled tasks
+ * from {@code false} to {@code true} after all scheduled tasks
  * have finished.
  * The call {@link SchedulingStrategy#finished()} is waiting until the
  * strategy has finished.
- * Then {@link Task#result} should be asserted that is <code>true</code>.
+ * Then {@link Task#result} should be asserted that is {@code true}.
  *
  * @author Tibor Digana (tibor17)
  * @see SchedulingStrategy

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
index d55c079..2cd2f48 100644
--- a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
+++ b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
@@ -30,7 +30,6 @@ import org.testng.ITestNGMethod;
  * For internal use only
  *
  * @author Olivier Lamy
- * @noinspection UnusedDeclaration
  * @since 2.7.3
  */
 public class MethodSelector

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/Stoppable.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/Stoppable.java b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/Stoppable.java
index dd172d2..e4fe304 100644
--- a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/Stoppable.java
+++ b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/Stoppable.java
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.testng.utils;
  */
 
 /**
- * Covers configuration parameter <em>skipAfterFailureCount</em>.
+ * Covers configuration parameter {@code skipAfterFailureCount}.
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
  * @since 2.19

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/ConfigurationAwareTestNGReporter.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/ConfigurationAwareTestNGReporter.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/ConfigurationAwareTestNGReporter.java
index 956a9d9..dd646b6 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/ConfigurationAwareTestNGReporter.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/ConfigurationAwareTestNGReporter.java
@@ -28,7 +28,6 @@ import org.testng.internal.IResultListener;
  * Just like TestNGReporter, but explicitly implements IResultListener; this interface is new in TestNG 5.5
  *
  * @author Dan Fabulich
- * @noinspection UnusedDeclaration
  */
 public class ConfigurationAwareTestNGReporter
     extends TestNGReporter

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java
index a8a3837..14e103a 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java
@@ -51,7 +51,6 @@ import static org.apache.maven.surefire.util.TestsToRun.fromClass;
 
 /**
  * @author Kristian Rosenvold
- * @noinspection UnusedDeclaration
  */
 public class TestNGProvider
     extends AbstractProvider

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
index d7d5ff9..19cd22d 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
@@ -40,7 +40,6 @@ import static org.apache.maven.surefire.report.SimpleReportEntry.withException;
  * {@link org.apache.maven.surefire.report.RunListener}.
  *
  * @author jkuhnert
- * @noinspection ThrowableResultOfMethodCallIgnored
  */
 public class TestNGReporter
     implements ITestListener, ISuiteListener
@@ -50,8 +49,8 @@ public class TestNGReporter
     /**
      * Constructs a new instance that will listen to
      * test updates from a {@link org.testng.TestNG} class instance.
-     * <p/>
-     * <p/>It is assumed that the requisite {@link org.testng.TestNG#addListener(ITestListener)}
+     * <br>
+     * <br>It is assumed that the requisite {@link org.testng.TestNG#addListener(ITestListener)}
      * method call has already associated with this instance <i>before</i> the test
      * suite is run.
      *

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java
index 081b532..9955f44 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java
@@ -23,14 +23,14 @@ import org.apache.maven.surefire.booter.ProviderParameterNames;
 
 /**
  * TestNG 4.7 and 5.1 configurator.
- * <p/>
+ * <br>
  * Allowed options:
  * -groups
  * -excludedgroups
  * -junit (boolean)
  * -threadcount (int)
  * -parallel (boolean)
- * <p/>
+ * <br>
  *
  * @author <a href='mailto:the[dot]mindstorm[at]gmail[dot]com'>Alex Popescu</a>
  */

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG513Configurator.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG513Configurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG513Configurator.java
index b003789..ff164fb 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG513Configurator.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG513Configurator.java
@@ -22,7 +22,7 @@ package org.apache.maven.surefire.testng.conf;
 import org.apache.maven.surefire.testset.TestSetFailedException;
 
 /**
- * TestNG 5.13 configurator. Changed: "reporterslist" need String instead of List<ReporterConfig>.
+ * TestNG 5.13 configurator. Changed: "reporterslist" need String instead of List&lt;ReporterConfig&gt;.
  */
 public class TestNG513Configurator
     extends TestNG510Configurator

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG5143Configurator.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG5143Configurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG5143Configurator.java
index 5575ccf..15a46a8 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG5143Configurator.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG5143Configurator.java
@@ -24,7 +24,7 @@ import org.apache.maven.surefire.testset.TestSetFailedException;
 
 /**
  * TestNG 5.14.3 configurator. Changed: "reporterslist" replaced by "reporter",
- *                                       and "listener" can use String instead of List<Class>.
+ *                                       and "listener" can use String instead of List&lt;Class&gt;.
  */
 public class TestNG5143Configurator
     extends TestNG5141Configurator

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java
index 28c802f..44da341 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java
@@ -23,14 +23,14 @@ import org.apache.maven.surefire.booter.ProviderParameterNames;
 
 /**
  * TestNG 5.2 configurator.
- * <p/>
+ * <br>
  * Allowed options:
  * -groups
  * -excludedgroups
  * -junit (boolean)
  * -threadcount (int)
  * -parallel (String)
- * <p/>
+ * <br>
  *
  * @author <a href='mailto:the[dot]mindstorm[at]gmail[dot]com'>Alex Popescu</a>
  */

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
index b819298..c51aca6 100755
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
@@ -35,13 +35,13 @@ import static org.apache.maven.surefire.testng.conf.AbstractDirectConfigurator.l
 
 /**
  * TestNG configurator for 5.3+ versions. TestNG exposes a {@link org.testng.TestNG#configure(java.util.Map)} method.
- * All suppported TestNG options are passed in String format, except
- * <code>TestNGCommandLineArgs.LISTENER_COMMAND_OPT</code> which is <code>List&gt;Class&lt;</code>,
- * <code>TestNGCommandLineArgs.JUNIT_DEF_OPT</code> which is a <code>Boolean</code>,
- * <code>TestNGCommandLineArgs.SKIP_FAILED_INVOCATION_COUNT_OPT</code> which is a <code>Boolean</code>,
- * <code>TestNGCommandLineArgs.OBJECT_FACTORY_COMMAND_OPT</code> which is a <code>Class</code>,
- * <code>TestNGCommandLineArgs.REPORTERS_LIST</code> which is a <code>List&gt;ReporterConfig&lt;</code>.
- * <p/>
+ * All supported TestNG options are passed in String format, except
+ * {@link org.testng.TestNGCommandLineArgs#LISTENER_COMMAND_OPT} which is {@link java.util.List List&gt;Class&lt;},
+ * {@link org.testng.TestNGCommandLineArgs#JUNIT_DEF_OPT} which is a {@link Boolean},
+ * {@link org.testng.TestNGCommandLineArgs#SKIP_FAILED_INVOCATION_COUNT_OPT} which is a {@link Boolean},
+ * {@link org.testng.TestNGCommandLineArgs#OBJECT_FACTORY_COMMAND_OPT} which is a {@link Class},
+ * {@link org.testng.TestNGCommandLineArgs#REPORTERS_LIST} which is a {@link java.util.List List&gt;ReporterConfig&lt;}.
+ * <br>
  * Test classes and/or suite files are not passed along as options parameters, but configured separately.
  *
  * @author <a href='mailto:the[dot]mindstorm[at]gmail[dot]com'>Alex Popescu</a>

[2/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8

Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml
index e7c4b6f..08ba73d 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1098-balanced-runorder/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
index 62ef251..479caa3 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1122-parallel-and-flakyTests/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
index d9a9a84..6a1b46e 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1135-improve-ignore-message-for-testng/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml
index 799f87e..b35d70e 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1144-xml-runtime/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml
index 28d0420..3867dd2 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1146-rerunFailingTests-with-Parameterized/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
index b8b4a03..b430563 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
@@ -19,7 +19,7 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/pom.xml
index d7cd094..d93b047 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1158-remove-info-lines/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml
index c7fac09..910c7a8 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1185/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml
index d867b3c..d8d24f4 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1211/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/pom.xml
index c6673b8..5f3df66 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1260-new-tests-pattern/pom.xml
@@ -1 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
  ~ Licensed to the Apache Software Foundation (ASF) under one
  ~ or more contributor license agreements.  See the NOTICE file
  ~ distributed with this work for additional information
  ~ regarding copyright ownership.  The ASF licenses this file
  ~ to you under the Apache License, Version 2.0 (the
  ~ "License"); you may not use this file except in compliance
  ~ with the License.  You may obtain a copy of the License at
  ~
  ~     http://www.apache.org/licenses/LICENSE-2.0
  ~
  ~ Unless required by applicable law or agreed to in writing,
  ~ software distributed under the License is distributed on an
  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  ~ KIND, either express or implied.  See the License for the
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->

<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:
 schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>


    <parent>
        <groupId>org.apache.maven.surefire</groupId>
        <artifactId>it-parent</artifactId>
        <version>1.0</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <groupId>org.apache.maven.plugins.surefire</groupId>
    <artifactId>surefire-1260</artifactId>
    <version>1.0</version>

    <url>http://maven.apache.org</url>

    <developers>
        <developer>
            <id>tibordigana</id>
            <name>Tibor Digaňa (tibor17)</name>
            <email>tibordigana@apache.org</email>
            <roles>
                <role>PMC</role>
            </roles>
            <timezone>Europe/Bratislava</timezone>
        </developer>
    </developers>

    <dependencies>
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <version>4.0</version>
   
          <scope>test</scope>
        </dependency>
    </dependencies>
</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+
+    <parent>
+        <groupId>org.apache.maven.surefire</groupId>
+        <artifactId>it-parent</artifactId>
+        <version>1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.maven.plugins.surefire</groupId>
+    <artifactId>surefire-1260</artifactId>
+    <version>1.0</version>
+
+    <url>http://maven.apache.org</url>
+
+    <developers>
+        <developer>
+            <id>tibordigana</id>
+            <name>Tibor Diga??a (tibor17)</name>
+            <email>tibordigana@apache.org</email>
+            <roles>
+                <role>PMC</role>
+            </roles>
+            <timezone>Europe/Bratislava</timezone>
+        </developer>
+    </developers>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1265/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1265/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1265/pom.xml
index a702f30..ec74a49 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1265/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1265/pom.xml
@@ -19,7 +19,7 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/pom.xml
index 022073d..b1764ba 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1278-group-name-ending/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml b/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml
index 5614e35..14f9739 100644
--- a/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml b/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
index e97f541..b222456 100644
--- a/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml b/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
index d4f21ef..ff7f25f 100644
--- a/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-224-wellFormedXmlFailures/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/pom.xml b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/pom.xml
index 9540cf4..90ca5c6 100644
--- a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module1/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/pom.xml b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/pom.xml
index fa0ea51..2685c13 100644
--- a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/module2/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml
index 5dd2028..02f581d 100644
--- a/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-257-rerunningTests/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.surefire-257-rerunningTests</groupId>
   <artifactId>surefire-257-rerunningTests</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml b/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
index 6677318..8d555b3 100644
--- a/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml b/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml
index 41a6be3..f01e319 100644
--- a/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-34-securityManager-success/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml b/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml
index 41a6be3..f01e319 100644
--- a/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-34-securityManager/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml b/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml
index adb30d4..72a1c7b 100644
--- a/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml b/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml
index da095cc..f65975b 100644
--- a/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.example</groupId>
   <artifactId>surefire-500</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml b/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml
index dcd4c62..b6534c4 100644
--- a/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-510-testClassPath/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
index 9b4847c..d173770 100644
--- a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/module1/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml
index d2574fc..e69ac9d 100644
--- a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml
index f13be52..7778331 100644
--- a/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-569-RunTestFromDependencyJars/testjar/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
index 4e8f590..5b8fd7c 100644
--- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml
index 67ef201..9972a51 100644
--- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
index d007cf2..0bd6b91 100644
--- a/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.surefire-report</groupId>
   <artifactId>surefire-570-multipleReportDirectories</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml b/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
index a4531b6..02a2dc8 100644
--- a/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-613-testCount-in-parallel/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins.surefire</groupId>
   <artifactId>junit4-test</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml b/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
index d37d7a3..d6ed765 100644
--- a/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.maven.plugins.surefire</groupId>
     <artifactId>surefire-test</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml b/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
index 8a23ac6..571e7fb 100644
--- a/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-628-consoleoutputbeforeandafterclass/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins.surefire</groupId>
   <artifactId>junit4-test</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml b/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
index 44036a7..cc023ec 100644
--- a/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-634-systemPropertiesWarning/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml b/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml
index c07b49a..378f5fa 100644
--- a/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-649-systemProperties/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml b/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
index e22209c..18b402d 100644
--- a/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-649-systemPropertyVariables/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml b/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml
index eb38cd7..72eb549 100644
--- a/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-673-mockito/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins.surefire</groupId>
   <artifactId>MockitoTest</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml b/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
index c17f55e..2b7a8b0 100644
--- a/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-674-buildFailingWhenErrors/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins.surefire</groupId>
   <artifactId>buildFailingWhenErrors</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml b/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml
index d64b1e7..5e6d272 100644
--- a/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-685-commaseparatedIncludes/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml b/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml
index bd4fd1c..9f1872c 100644
--- a/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-697-niceSummary/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml b/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
index c091594..da2299e 100644
--- a/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-733-allOverridesCaptured/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/pom.xml b/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/pom.xml
index f6e60a0..5291cc6 100644
--- a/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-740-comma-truncated/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-772-both-reports/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/pom.xml b/surefire-integration-tests/src/test/resources/surefire-772-both-reports/pom.xml
index dcbbf94..6ce429f 100644
--- a/surefire-integration-tests/src/test/resources/surefire-772-both-reports/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-772-both-reports/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/pom.xml b/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/pom.xml
index ed420c8..5aa8b93 100644
--- a/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-772-no-failsafe-reports/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-772-no-reports/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-no-reports/pom.xml b/surefire-integration-tests/src/test/resources/surefire-772-no-reports/pom.xml
index 6ff2b8e..ab99166 100644
--- a/surefire-integration-tests/src/test/resources/surefire-772-no-reports/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-772-no-reports/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/pom.xml b/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/pom.xml
index bc716f1..1d8df09 100644
--- a/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-772-no-surefire-reports/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/pom.xml b/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/pom.xml
index 01151b9..c44effd 100644
--- a/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-772-specified-reports/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml
index 856708b..7b09393 100644
--- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-multi/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml
index b7ae5ff..717417f 100644
--- a/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-806-specifiedTests-single/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml
index ea2ad63..68ed936 100644
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-junit48/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml
index f7eaa72..f229292 100644
--- a/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-809-groupExpr-testng/pom.xml
@@ -10,7 +10,7 @@
     -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml b/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
index ea6d164..2da8cc3 100644
--- a/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-812-log4j-classloader/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins.surefire</groupId>
   <artifactId>log4jClassloader</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml
index 4809487..8a27298 100644
--- a/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-817-system-exit/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
index 2438abc..4207278 100644
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-junit48/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
index 92515ef..ea83f5d 100644
--- a/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-828-emptyGroupExpr-testng/pom.xml
@@ -10,7 +10,7 @@
     -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml
index 2d80cea..afabbbe 100644
--- a/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-832-provider-selection/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml
index bca3e1e..fdc17fc 100644
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-bundle/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml
index 1635a67..c6e15fc 100644
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-jar/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml
index 5dea1b0..61502c8 100644
--- a/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-855-failsafe-use-war/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml b/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml
index d783e10..683628a 100644
--- a/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-930-failsafe-runtests/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.maven.plugins</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
index eb0fe59..fa8fd48 100644
--- a/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-946-killMainProcessInReusableFork/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/boom/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/boom/pom.xml b/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/boom/pom.xml
index d5e9fbc..fa075ab 100644
--- a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/boom/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/boom/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>class-rule-boom-boom</artifactId>
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/class-rule/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/class-rule/pom.xml b/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/class-rule/pom.xml
index e9f44e3..8eaf187 100644
--- a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/class-rule/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/class-rule/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>class-rule</artifactId>
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml b/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml
index be4df33..711048e 100644
--- a/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-972-bizarre-noclassdef/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.surefire</groupId>
   <artifactId>class-rule-boom</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml b/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml
index 705d388..dd6ec41 100755
--- a/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-975-wrong-encoding/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>encoding-bug</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml b/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml
index 71d26cd..ba90b5b 100644
--- a/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-985-parameterized-and-categories/pom.xml
@@ -11,7 +11,7 @@
   License for the ~ specific language governing permissions and limitations 
   ~ under the License. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml b/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml
index 7245ccb..d483c43 100644
--- a/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-995-categoryInheritance/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/system-properties/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/system-properties/pom.xml b/surefire-integration-tests/src/test/resources/system-properties/pom.xml
index 70d056a..0fcfb22 100644
--- a/surefire-integration-tests/src/test/resources/system-properties/pom.xml
+++ b/surefire-integration-tests/src/test/resources/system-properties/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml b/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml
index f738827..5ad8dbc 100644
--- a/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-afterSuiteFailure/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml b/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml
index af46b6b..277024a 100644
--- a/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-beforeMethod/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml b/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml
index bda724c..f05f369 100644
--- a/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml b/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml
index ae1a1d1..c6809dc 100644
--- a/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml b/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml
index f0ad40c..5cb7c0f 100644
--- a/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-group-thread-parallel/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-groups/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-groups/pom.xml b/surefire-integration-tests/src/test/resources/testng-groups/pom.xml
index 5ef5e4f..5abccb2 100644
--- a/surefire-integration-tests/src/test/resources/testng-groups/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-groups/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml b/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml
index 5f9dcd8..c7bc3c3 100644
--- a/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-jdk14/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml b/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml
index dac6b9b..295d1cb 100644
--- a/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml b/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml
index d7700a4..afe9f05 100644
--- a/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-junit4-together/pom.xml
@@ -19,7 +19,7 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml b/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml
index 975eff5..809c4b7 100644
--- a/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-listener-reporter/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml b/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml
index 4cb27c6..760211d 100644
--- a/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-method-pattern-after/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml b/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
index 4cb27c6..760211d 100644
--- a/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-method-pattern-before/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

[6/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8

Posted by ti...@apache.org.
[SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8


Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/b54e33e6
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/b54e33e6
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/b54e33e6

Branch: refs/heads/master
Commit: b54e33e68e9c3e13f8fca4b66dbb5c89a0a30715
Parents: cba4adb
Author: Tibor17 <ti...@lycos.com>
Authored: Sun Apr 23 10:20:35 2017 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Mon May 1 14:21:46 2017 +0200

----------------------------------------------------------------------
 maven-failsafe-plugin/pom.xml                   |  23 ++
 .../plugin/failsafe/IntegrationTestMojo.java    | 203 ++++++++++--------
 .../maven/plugin/failsafe/VerifyMojo.java       |   2 +-
 .../failsafe/util/FailsafeSummaryXmlUtils.java  |  94 ++++++++
 .../apache/maven/plugin/failsafe/util/JAXB.java | 104 +++++++++
 .../plugin/failsafe/xmlsummary/ErrorType.java   |   1 -
 .../failsafe/xmlsummary/FailsafeSummary.java    |   1 -
 .../xmlsummary/FailsafeSummaryXmlUtils.java     | 104 ---------
 .../maven/plugin/failsafe/xmlsummary/JAXB.java  |   1 -
 .../failsafe/xmlsummary/ObjectFactory.java      |   1 -
 .../failsafe/MarshallerUnmarshallerTest.java    |  62 ++----
 .../maven/plugin/failsafe/RunResultTest.java    |   2 +-
 maven-surefire-common/pom.xml                   |   1 -
 .../plugin/surefire/AbstractSurefireMojo.java   | 214 ++++++++++---------
 .../surefire/InPluginVMSurefireStarter.java     |   2 +-
 .../surefire/StartupReportConfiguration.java    |   6 +-
 .../surefire/SurefireExecutionParameters.java   |   1 -
 .../surefire/SurefireReportParameters.java      |   1 -
 .../surefire/booterclient/BooterSerializer.java |   4 +-
 .../booterclient/ForkConfiguration.java         |   3 +-
 .../surefire/booterclient/ForkStarter.java      |   4 +-
 .../surefire/booterclient/ProviderDetector.java |   1 -
 .../lazytestprovider/AbstractCommandStream.java |   4 +
 .../TestProvidingInputStream.java               |   6 +-
 .../output/DeserializedStacktraceWriter.java    |   2 +-
 .../booterclient/output/ForkClient.java         |   6 +-
 .../output/ThreadedStreamConsumer.java          |   8 +-
 .../report/ConsoleOutputFileReporter.java       |   2 +-
 .../surefire/report/DefaultReporterFactory.java |   4 +-
 .../surefire/report/DirectConsoleOutput.java    |   2 +-
 .../surefire/report/StatelessXmlReporter.java   |   5 +-
 .../surefire/report/TestSetRunListener.java     |   2 +-
 .../org/apache/maven/surefire/spi/IDefault.java |   4 +-
 .../maven/plugin/surefire/SurefirePlugin.java   | 204 +++++++++---------
 .../src/site/resources/xsd/bindings.xml         |   1 -
 .../src/site/resources/xsd/failsafe-summary.xjb |  31 +++
 maven-surefire-report-plugin/pom.xml            |   1 -
 .../surefire/report/FailsafeReportMojo.java     |   2 +-
 .../surefire/report/SurefireReportMojo.java     |   2 +-
 .../resources/surefire-report_sv.properties     |   2 +
 pom.xml                                         |  53 ++++-
 .../maven/surefire/booter/CommandReader.java    |   4 +-
 .../surefire/booter/DumpErrorSingleton.java     |   2 +-
 .../maven/surefire/booter/FailFastAware.java    |   2 +-
 .../surefire/booter/ForkingReporterFactory.java |   2 -
 .../surefire/booter/ForkingRunListener.java     |   6 +-
 .../maven/surefire/booter/ShutdownAware.java    |   2 +-
 .../surefire/booter/SurefireReflector.java      |   2 +-
 .../maven/surefire/cli/CommandLineOption.java   |   2 +-
 .../providerapi/ProviderParameters.java         |   8 +-
 .../surefire/providerapi/SurefireProvider.java  |  17 +-
 .../surefire/report/ConsoleOutputCapture.java   |   2 +-
 .../report/LegacyPojoStackTraceWriter.java      |   1 -
 .../maven/surefire/report/ReportEntry.java      |   3 +-
 .../surefire/report/ReporterConfiguration.java  |   2 +-
 .../maven/surefire/report/RunListener.java      |   2 +-
 .../surefire/report/SimpleReportEntry.java      |  45 ++--
 .../apache/maven/surefire/suite/RunResult.java  |   2 +-
 .../maven/surefire/testset/ResolvedTest.java    |  29 ++-
 .../surefire/testset/TestListResolver.java      |   8 +-
 .../maven/surefire/testset/TestRequest.java     |   2 +
 .../testset/TestSetFailedException.java         |  23 +-
 .../util/SurefireReflectionException.java       |   5 +-
 .../util/internal/DaemonThreadFactory.java      |   1 +
 .../surefire/util/internal/DumpFileUtils.java   |   3 +
 .../surefire/util/internal/StringUtils.java     |  66 ++----
 .../surefire/testset/FundamentalFilterTest.java |   1 +
 .../surefire/booter/BooterDeserializer.java     |   4 +-
 .../apache/maven/surefire/booter/Classpath.java |   3 +
 .../surefire/booter/ClasspathConfiguration.java |   2 +-
 .../maven/surefire/booter/ForkedBooter.java     |   6 +-
 .../surefire/booter/IsolatedClassLoader.java    |   2 +-
 .../surefire/booter/ProviderConfiguration.java  |   2 +-
 .../maven/surefire/booter/ProviderFactory.java  |   2 +-
 .../surefire/booter/StartupConfiguration.java   |   4 +-
 .../maven/surefire/its/AbstractFailFastIT.java  |   2 +-
 .../maven/surefire/its/FailFastJUnitIT.java     |   2 +-
 .../maven/surefire/its/FailFastTestNgIT.java    |   2 +-
 .../its/IncludesExcludesFromFileIT.java         |   2 +-
 .../its/JUnit47ParallelNotThreadSafeIT.java     |   2 +-
 .../maven/surefire/its/UnicodeTestNamesIT.java  |   2 +-
 .../surefire/its/fixture/MavenLauncher.java     |   2 +-
 .../SurefireJUnit4IntegrationTestCase.java      |   2 +-
 .../surefire/its/fixture/SurefireLauncher.java  |   2 +-
 .../Surefire1024VerifyFailsafeIfTestedIT.java   |   2 +-
 .../jiras/Surefire1028UnableToRunSingleIT.java  |   8 +-
 ...onFilterableJUnitRunnerWithCategoriesIT.java |   2 +-
 .../jiras/Surefire1053SystemPropertiesIT.java   |   2 +-
 .../Surefire1080ParallelForkDoubleTestIT.java   |   6 +-
 ...urefire1082ParallelJUnitParameterizedIT.java |   2 +-
 .../its/jiras/Surefire1095NpeInRunListener.java |   7 +-
 .../jiras/Surefire1098BalancedRunOrderIT.java   |  14 +-
 .../Surefire1122ParallelAndFlakyTestsIT.java    |   2 +-
 ...Surefire1146RerunFailedAndParameterized.java |   2 +-
 .../jiras/Surefire1158RemoveInfoLinesIT.java    |   2 +-
 .../its/jiras/Surefire1202RerunAndSkipIT.java   |   2 +-
 .../jiras/Surefire1209RerunAndForkCountIT.java  |  76 ++++++-
 .../its/jiras/Surefire1211JUnitTestNgIT.java    |  64 +++++-
 .../its/jiras/Surefire1260NewTestsPattern.java  |  50 ++++-
 .../surefire/its/jiras/Surefire1265Java9IT.java |   3 +-
 ...urefire649EmptyStringSystemPropertiesIT.java |   2 +-
 .../its/jiras/Surefire817SystemExitIT.java      |   2 +-
 ...refire855AllowFailsafeUseArtifactFileIT.java |   2 +-
 .../jiras/Surefire995CategoryInheritanceIT.java |   2 +-
 .../test/resources/SurefireToolchains/pom.xml   |   2 +-
 .../test/resources/additional-classpath/pom.xml |   2 +-
 .../resources/aggregate-report/child1/pom.xml   |   2 +-
 .../resources/aggregate-report/child2/pom.xml   |   2 +-
 .../src/test/resources/aggregate-report/pom.xml |   2 +-
 .../src/test/resources/ant-ignore/pom.xml       |   2 +-
 .../test/resources/argLine-parameter/pom.xml    |   2 +-
 .../test/resources/argLine-properties/pom.xml   |   2 +-
 .../resources/assumpationFailureReport/pom.xml  |   2 +-
 .../test/resources/classpath-filtering/pom.xml  |   2 +-
 .../src/test/resources/classpath-order/pom.xml  |   2 +-
 .../resources/classpath-scope-filtering/pom.xml |   2 +-
 .../src/test/resources/consoleOutput/pom.xml    |   2 +-
 .../resources/consoleOutputEncoding/pom.xml     |   2 +-
 .../test/resources/consoleoutput-noisy/pom.xml  |   2 +-
 .../src/test/resources/crash-detection/pom.xml  |   2 +-
 .../test/resources/crash-during-test/pom.xml    |   2 +-
 .../default-configuration-abstract/pom.xml      |   2 +-
 .../pom.xml                                     |   2 +-
 .../default-configuration-noTests/pom.xml       |   2 +-
 .../resources/default-configuration/pom.xml     |   2 +-
 .../resources/environment-variables/pom.xml     |   2 +-
 .../src/test/resources/fail-fast-junit/pom.xml  |   2 +-
 .../src/test/resources/fail-fast-testng/pom.xml |   2 +-
 .../src/test/resources/failingBuilds/pom.xml    |   2 +-
 .../resources/failure-result-counting/pom.xml   |   2 +-
 .../src/test/resources/failureOutput/pom.xml    |   2 +-
 .../test/resources/fork-consoleOutput/pom.xml   |   2 +-
 .../fork-consoleOutputWithErrors/pom.xml        |   2 +-
 .../src/test/resources/fork-fail/pom.xml        |   2 +-
 .../fork-mode-multimodule/module-a/pom.xml      |   2 +-
 .../fork-mode-multimodule/module-b/pom.xml      |   2 +-
 .../resources/fork-mode-multimodule/pom.xml     |   2 +-
 .../fork-mode-resource-loading/pom.xml          |   2 +-
 .../src/test/resources/fork-mode-testng/pom.xml |   2 +-
 .../src/test/resources/fork-mode/pom.xml        |   2 +-
 .../src/test/resources/fork-timeout/pom.xml     |   2 +-
 .../test/resources/isolated-classloader/pom.xml |   2 +-
 .../resources/junit-fork-mode-always/pom.xml    |   2 +-
 .../src/test/resources/junit-ignore/pom.xml     |   2 +-
 .../src/test/resources/junit-innerClass/pom.xml |   2 +-
 .../junit-notExtendingTestCase/pom.xml          |   2 +-
 .../test/resources/junit-pathWithUmlaut/pom.xml |   2 +-
 .../resources/junit-twoTestCaseSuite/pom.xml    |   2 +-
 .../test/resources/junit-twoTestCases/pom.xml   |   2 +-
 .../junit4-forkAlways-staticInit/pom.xml        |   2 +-
 .../junit4-rerun-failing-tests/pom.xml          |   2 +-
 .../test/resources/junit4-runlistener/pom.xml   |   2 +-
 .../resources/junit4-twoTestCaseSuite/pom.xml   |   2 +-
 .../src/test/resources/junit4/pom.xml           |   2 +-
 .../src/test/resources/junit44-dep/pom.xml      |   2 +-
 .../test/resources/junit44-environment/pom.xml  |   2 +-
 .../src/test/resources/junit44-hamcrest/pom.xml |   2 +-
 .../resources/junit44-method-pattern/pom.xml    |   2 +-
 .../resources/junit44-multiple-methods/pom.xml  |   2 +-
 .../resources/junit44-single-method/pom.xml     |   2 +-
 .../test/resources/junit47-concurrency/pom.xml  |   2 +-
 .../test/resources/junit47-parallel-nts/pom.xml |   2 +-
 .../junit47-parallel-with-suite/pom.xml         |   2 +-
 .../src/test/resources/junit47-parallel/pom.xml |   2 +-
 .../resources/junit47-redirect-output/pom.xml   |   2 +-
 .../junit47-static-inner-class-tests/pom.xml    |   2 +-
 .../test/resources/junit48-categories/pom.xml   |   2 +-
 .../resources/junit48-method-pattern/pom.xml    |   2 +-
 .../junit48-multiple-method-patterns/pom.xml    |   2 +-
 .../resources/junit48-multiple-methods/pom.xml  |   2 +-
 .../resources/junit48-single-method/pom.xml     |   2 +-
 .../resources/junit48-smartStackTrace/pom.xml   |   2 +-
 .../test/resources/large-test-results/pom.xml   |   2 +-
 .../src/test/resources/norunnableTests/pom.xml  |   2 +-
 .../src/test/resources/parallel-runtime/pom.xml |   2 +-
 .../resources/plain-old-java-classpath/pom.xml  |   2 +-
 .../src/test/resources/plexus-conflict/pom.xml  |   2 +-
 .../src/test/resources/pojo-simple/pom.xml      |   2 +-
 .../src/test/resources/reporters/pom.xml        |   2 +-
 .../src/test/resources/result-counting/pom.xml  |   2 +-
 .../src/test/resources/runOrder/pom.xml         |   2 +-
 .../test/resources/runorder-parallel/pom.xml    |   2 +-
 .../sibling-aggregator/aggregator/pom.xml       |   2 +-
 .../resources/sibling-aggregator/child1/pom.xml |   2 +-
 .../resources/sibling-aggregator/child2/pom.xml |   2 +-
 .../resources/small-result-counting/pom.xml     |   2 +-
 .../jiras-surefire-1024-it/pom.xml              |   2 +-
 .../jiras-surefire-1024-testjar/pom.xml         |   2 +-
 .../src/test/resources/surefire-1024/pom.xml    |   2 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 .../surefire-1053-system-properties/pom.xml     |   2 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 .../surefire-1095-npe-in-runlistener/pom.xml    |   2 +-
 .../surefire-1098-balanced-runorder/pom.xml     |   2 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 .../resources/surefire-1144-xml-runtime/pom.xml |   2 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 .../surefire-1158-remove-info-lines/pom.xml     |   2 +-
 .../src/test/resources/surefire-1185/pom.xml    |   2 +-
 .../src/test/resources/surefire-1211/pom.xml    |   2 +-
 .../surefire-1260-new-tests-pattern/pom.xml     |  61 +++++-
 .../src/test/resources/surefire-1265/pom.xml    |   2 +-
 .../surefire-1278-group-name-ending/pom.xml     |   2 +-
 .../surefire-141-pluggableproviders/pom.xml     |   2 +-
 .../surefire-146-forkPerTestNoSetup/pom.xml     |   2 +-
 .../surefire-224-wellFormedXmlFailures/pom.xml  |   2 +-
 .../surefire-257-rerunningTests/module1/pom.xml |   2 +-
 .../surefire-257-rerunningTests/module2/pom.xml |   2 +-
 .../surefire-257-rerunningTests/pom.xml         |   2 +-
 .../surefire-260-testWithIdenticalNames/pom.xml |   2 +-
 .../surefire-34-securityManager-success/pom.xml |   2 +-
 .../surefire-34-securityManager/pom.xml         |   2 +-
 .../pom.xml                                     |   2 +-
 .../surefire-500-puzzling-error/pom.xml         |   2 +-
 .../surefire-510-testClassPath/pom.xml          |   2 +-
 .../module1/pom.xml                             |   2 +-
 .../pom.xml                                     |   2 +-
 .../testjar/pom.xml                             |   2 +-
 .../module1/pom.xml                             |   2 +-
 .../module2/pom.xml                             |   2 +-
 .../pom.xml                                     |   2 +-
 .../surefire-613-testCount-in-parallel/pom.xml  |   2 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 .../surefire-649-systemProperties/pom.xml       |   2 +-
 .../pom.xml                                     |   2 +-
 .../test/resources/surefire-673-mockito/pom.xml |   2 +-
 .../surefire-674-buildFailingWhenErrors/pom.xml |   2 +-
 .../surefire-685-commaseparatedIncludes/pom.xml |   2 +-
 .../resources/surefire-697-niceSummary/pom.xml  |   2 +-
 .../surefire-733-allOverridesCaptured/pom.xml   |   2 +-
 .../surefire-740-comma-truncated/pom.xml        |   2 +-
 .../resources/surefire-772-both-reports/pom.xml |   2 +-
 .../surefire-772-no-failsafe-reports/pom.xml    |   2 +-
 .../resources/surefire-772-no-reports/pom.xml   |   2 +-
 .../surefire-772-no-surefire-reports/pom.xml    |   2 +-
 .../surefire-772-specified-reports/pom.xml      |   2 +-
 .../surefire-806-specifiedTests-multi/pom.xml   |   2 +-
 .../surefire-806-specifiedTests-single/pom.xml  |   2 +-
 .../surefire-809-groupExpr-junit48/pom.xml      |   2 +-
 .../surefire-809-groupExpr-testng/pom.xml       |   2 +-
 .../surefire-812-log4j-classloader/pom.xml      |   2 +-
 .../resources/surefire-817-system-exit/pom.xml  |   2 +-
 .../surefire-828-emptyGroupExpr-junit48/pom.xml |   2 +-
 .../surefire-828-emptyGroupExpr-testng/pom.xml  |   2 +-
 .../surefire-832-provider-selection/pom.xml     |   2 +-
 .../surefire-855-failsafe-use-bundle/pom.xml    |   2 +-
 .../surefire-855-failsafe-use-jar/pom.xml       |   2 +-
 .../surefire-855-failsafe-use-war/pom.xml       |   2 +-
 .../surefire-930-failsafe-runtests/pom.xml      |   2 +-
 .../pom.xml                                     |   2 +-
 .../boom/pom.xml                                |   2 +-
 .../class-rule/pom.xml                          |   2 +-
 .../surefire-972-bizarre-noclassdef/pom.xml     |   2 +-
 .../surefire-975-wrong-encoding/pom.xml         |   2 +-
 .../pom.xml                                     |   2 +-
 .../surefire-995-categoryInheritance/pom.xml    |   2 +-
 .../test/resources/system-properties/pom.xml    |   2 +-
 .../resources/testng-afterSuiteFailure/pom.xml  |   2 +-
 .../test/resources/testng-beforeMethod/pom.xml  |   2 +-
 .../testng-beforeMethodFailure/pom.xml          |   2 +-
 .../test/resources/testng-execute-error/pom.xml |   2 +-
 .../testng-group-thread-parallel/pom.xml        |   2 +-
 .../src/test/resources/testng-groups/pom.xml    |   2 +-
 .../src/test/resources/testng-jdk14/pom.xml     |   2 +-
 .../resources/testng-junit-together/pom.xml     |   2 +-
 .../resources/testng-junit4-together/pom.xml    |   2 +-
 .../resources/testng-listener-reporter/pom.xml  |   2 +-
 .../testng-method-pattern-after/pom.xml         |   2 +-
 .../testng-method-pattern-before/pom.xml        |   2 +-
 .../resources/testng-method-pattern/pom.xml     |   2 +-
 .../testng-multiple-method-patterns/pom.xml     |   2 +-
 .../resources/testng-parallel-suites/pom.xml    |   2 +-
 .../testng-parallel-with-annotations/pom.xml    |   2 +-
 .../resources/testng-path with spaces/pom.xml   |   2 +-
 .../src/test/resources/testng-simple/pom.xml    |   2 +-
 .../testng-single-method-5-14-9/pom.xml         |   2 +-
 .../test/resources/testng-single-method/pom.xml |   2 +-
 .../resources/testng-succes-percentage/pom.xml  |   2 +-
 .../src/test/resources/testng-suite-xml/pom.xml |   2 +-
 .../resources/testng-twoTestCaseSuite/pom.xml   |   2 +-
 .../src/test/resources/timeout-forked/pom.xml   |   2 +-
 .../test/resources/unicode-testnames/pom.xml    |   2 +-
 .../src/test/resources/webapp/pom.xml           |   2 +-
 .../pom.xml                                     |   2 +-
 .../resources/working-directory-missing/pom.xml |   2 +-
 .../resources/working-directory/child/pom.xml   |   2 +-
 .../test/resources/working-directory/pom.xml    |   2 +-
 .../plugin/surefire/log/api/ConsoleLogger.java  |   7 +-
 .../common/junit4/JUnit4RunListener.java        |   5 +-
 .../surefire/common/junit48/FilterFactory.java  |   2 +-
 .../common/junit48/JUnit46StackTraceWriter.java |   2 +-
 .../junitcore/ConcurrentRunListener.java        |   2 +-
 .../maven/surefire/junitcore/JUnitCore.java     |   2 +-
 .../surefire/junitcore/JUnitCoreParameters.java |   5 +-
 .../junitcore/JUnitCoreRunListener.java         |   2 +-
 .../maven/surefire/junitcore/TestMethod.java    |   2 +-
 .../maven/surefire/junitcore/ThreadSafe.java    |   2 +-
 .../maven/surefire/junitcore/pc/Balancer.java   |   4 +-
 .../surefire/junitcore/pc/BalancerFactory.java  |   3 +
 .../surefire/junitcore/pc/ExecutionStatus.java  |   2 +-
 .../junitcore/pc/ParallelComputerBuilder.java   |   5 +-
 .../junitcore/pc/ParallelComputerUtil.java      |   3 +-
 .../maven/surefire/junitcore/pc/Scheduler.java  |  54 +++--
 .../junitcore/pc/SchedulingStrategies.java      |   2 +-
 .../junitcore/pc/SchedulingStrategy.java        |  32 +--
 .../junitcore/pc/SingleThreadScheduler.java     |   4 +-
 .../junitcore/pc/ThreadResourcesBalancer.java   |   4 +-
 .../surefire/junitcore/pc/WrappedRunners.java   |   2 +-
 .../MavenSurefireJUnit47RunnerTest.java         |  16 +-
 .../MavenSurefireJUnit48RunnerTest.java         |  16 +-
 .../surefire/junitcore/Surefire746Test.java     |   2 +-
 .../junitcore/pc/SchedulingStrategiesTest.java  |   6 +-
 .../surefire/testng/utils/MethodSelector.java   |   1 -
 .../maven/surefire/testng/utils/Stoppable.java  |   2 +-
 .../ConfigurationAwareTestNGReporter.java       |   1 -
 .../maven/surefire/testng/TestNGProvider.java   |   1 -
 .../maven/surefire/testng/TestNGReporter.java   |   5 +-
 .../testng/conf/TestNG4751Configurator.java     |   4 +-
 .../testng/conf/TestNG513Configurator.java      |   2 +-
 .../testng/conf/TestNG5143Configurator.java     |   2 +-
 .../testng/conf/TestNG52Configurator.java       |   4 +-
 .../testng/conf/TestNGMapConfigurator.java      |  14 +-
 329 files changed, 1418 insertions(+), 956 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-failsafe-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index ed1d751..506b3c4 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -83,6 +83,29 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-xjc-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <id>generate-failsafe-summary</id>
+            <goals>
+              <goal>xsdtojava</goal>
+            </goals>
+            <configuration>
+              <sourceRoot>${project.build.directory}/generated-sources/jaxb</sourceRoot>
+              <xsdOptions>
+                <xsdOption>
+                  <xsd>../maven-surefire-plugin/src/site/resources/xsd/failsafe-summary.xsd</xsd>
+                  <bindingFile>../maven-surefire-plugin/src/site/resources/xsd/failsafe-summary.xjb</bindingFile>
+                  <packagename>org.apache.maven.plugin.failsafe.xmlsummary</packagename>
+                </xsdOption>
+              </xsdOptions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
         <configuration>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
index 1ad317f..a336e28 100644
--- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
@@ -39,7 +39,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
-import static org.apache.maven.plugin.failsafe.xmlsummary.FailsafeSummaryXmlUtils.writeSummary;
+import static org.apache.maven.plugin.failsafe.util.FailsafeSummaryXmlUtils.writeSummary;
 import static org.apache.maven.shared.utils.ReaderFactory.FILE_ENCODING;
 
 /**
@@ -47,7 +47,6 @@ import static org.apache.maven.shared.utils.ReaderFactory.FILE_ENCODING;
  *
  * @author Jason van Zyl
  * @author Stephen Connolly
- * @noinspection JavaDoc,
  */
 @Mojo( name = "integration-test", requiresProject = true, requiresDependencyResolution = ResolutionScope.TEST,
              defaultPhase = LifecyclePhase.INTEGRATION_TEST, threadSafe = true )
@@ -60,7 +59,7 @@ public class IntegrationTestMojo
     /**
      * The path representing project <em>JAR</em> file, if exists; Otherwise the directory containing generated
      * classes of the project being tested. This will be included after the test classes in the test classpath.
-     * Defaults to built artifact <em>JAR</em> file or ${project.build.outputDirectory}.
+     * Defaults to built artifact <em>JAR</em> file or <code>${project.build.outputDirectory}</code>.
      */
     @Parameter
     private File classesDirectory;
@@ -83,25 +82,28 @@ public class IntegrationTestMojo
     @Parameter( defaultValue = "${project.build.directory}/failsafe-reports" )
     private File reportsDirectory;
 
+    @SuppressWarnings( "checkstyle:linelength" )
     /**
-     * Specify this parameter to run individual tests by file name, overriding the <code>includes/excludes</code>
-     * parameters. Each pattern you specify here will be used to create an include pattern formatted like
-     * <code>**&#47;${it.test}.java</code>, so you can just type "-Dit.test=MyIT" to run a single test called
-     * "foo/MyIT.java".<br/>
-     * This parameter overrides the <code>includes/excludes</code> parameters, and the TestNG <code>suiteXmlFiles</code>
-     * parameter.
-     * <p/>
-     * Since 2.7.3 You can execute a limited number of methods in the test with adding #myMethod or #my*ethod. E.g. type
-     * "-Dit.test=MyIT#myMethod" <b>supported for junit 4.x and testNg</b>
-     * <br/>
-     * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG):<br/>
-     * "-Dit.test=???IT, !Unstable*, pkg&#47;**&#47;Ci*leIT.java, *IT#test*One+testTwo?????, #fast*+slowTest"<br/>
-     * "-Dit.test=Basic*, !%regex[.*.Unstable.*], !%regex[.*.MyIT.class#one.*|two.*], %regex[#fast.*|slow.*]"<br/>
-     * <br/>
-     * The Parameterized JUnit runner <em>describes</em> test methods using an index in brackets, so the non-regex
-     * method pattern would become: <em>#testMethod[*]</em>. If using <em>@Parameters(name="{index}: fib({0})={1}")</em>
-     * and selecting the index e.g. 5 in pattern, the non-regex method pattern would become <em>#testMethod[5:*]</em>.
-     * <br/>
+     * Specify this parameter to run individual tests by file name, overriding parameter {@code includes} and
+     * {@code excludes}. Each pattern you specify here will be used to create an include pattern formatted like
+     * <code>**{@literal /}${it.test}.java</code>, so you can just type {@code -Dit.test=MyIT} to run
+     * a single test file called "foo/MyIT.java". The test patterns prefixed with a <em>!</em> will be excluded.
+     * <br>
+     * This parameter overrides the parameter {@code includes} and {@code excludes}, and the TestNG parameter
+     * {@code suiteXmlFiles}.
+     * <br>
+     * Since 2.7.3 You can execute a limited number of methods in the test with adding <i>#myMethod</i> or
+     * <i>#my*ethod</i>. E.g. type {@code -Dit.test=MyIT#myMethod} <b>supported for junit 4.x and TestNg.</b>
+     * <br>
+     * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG):
+     * <pre><code>"-Dit.test=???IT, !Unstable*, pkg{@literal /}**{@literal /}Ci*leIT.java, *IT#test*One+testTwo?????, #fast*+slowTest"</code></pre>
+     * or e.g.
+     * <br>
+     * <pre><code>"-Dit.test=Basic*, !%regex[.*.Unstable.*], !%regex[.*.MyIT.class#one.*|two.*], %regex[#fast.*|slow.*]"</code></pre>
+     * <br>
+     * The Parameterized JUnit runner {@code describes} test methods using an index in brackets, so the non-regex
+     * method pattern would become: {@code #testMethod[*]}. If using <code>@Parameters(name="{index}: fib({0})={1}")</code>
+     * and selecting the index e.g. 5 in pattern, the non-regex method pattern would become {@code #testMethod[5:*]}.
      */
     @Parameter( property = "it.test" )
     private String test;
@@ -143,7 +145,7 @@ public class IntegrationTestMojo
     /**
      * Attach a debugger to the forked JVM. If set to "true", the process will suspend and wait for a debugger to attach
      * on port 5005. If set to some other string, that string will be appended to the argLine, allowing you to configure
-     * arbitrary debuggability options (without overwriting the other options specified through the <code>argLine</code>
+     * arbitrary debugging ability options (without overwriting the other options specified through the {@code argLine}
      * parameter).
      *
      * @since 2.4
@@ -163,7 +165,7 @@ public class IntegrationTestMojo
     /**
      * Forked process is normally terminated without any significant delay after given tests have completed.
      * If the particular tests started non-daemon Thread(s), the process hangs instead of been properly terminated
-     * by <em>System.exit()</em>. Use this parameter in order to determine the timeout of terminating the process.
+     * by {@code System.exit()}. Use this parameter in order to determine the timeout of terminating the process.
      * <a href="http://maven.apache.org/surefire/maven-failsafe-plugin/examples/shutdown.html">see the documentation:
      * http://maven.apache.org/surefire/maven-failsafe-plugin/examples/shutdown.html</a>
      *
@@ -174,11 +176,11 @@ public class IntegrationTestMojo
 
     /**
      * Stop executing queued parallel JUnit tests after a certain number of seconds.
-     * <br/>
-     * Example values: "3.5", "4"<br/>
-     * <br/>
+     * <br>
+     * Example values: "3.5", "4"<br>
+     * <br>
      * If set to 0, wait forever, never timing out.
-     * Makes sense with specified <code>parallel</code> different from "none".
+     * Makes sense with specified {@code parallel} different from "none".
      *
      * @since 2.16
      */
@@ -187,40 +189,45 @@ public class IntegrationTestMojo
 
     /**
      * Stop executing queued parallel JUnit tests
-     * and <em>interrupt</em> currently running tests after a certain number of seconds.
-     * <br/>
-     * Example values: "3.5", "4"<br/>
-     * <br/>
+     * and <i>interrupt</i> currently running tests after a certain number of seconds.
+     * <br>
+     * Example values: "3.5", "4"<br>
+     * <br>
      * If set to 0, wait forever, never timing out.
-     * Makes sense with specified <code>parallel</code> different from "none".
+     * Makes sense with specified {@code parallel} different from "none".
      *
      * @since 2.16
      */
     @Parameter( property = "failsafe.parallel.forcedTimeout" )
     private double parallelTestsTimeoutForcedInSeconds;
 
+    @SuppressWarnings( "checkstyle:linelength" )
     /**
-     * A list of &lt;include> elements specifying the tests (by pattern) that should be included in testing. When not
-     * specified and when the <code>test</code> parameter is not specified, the default includes will be <code><br/>
-     * &lt;includes><br/>
-     * &nbsp;&lt;include>**&#47;IT*.java&lt;/include><br/>
-     * &nbsp;&lt;include>**&#47;*IT.java&lt;/include><br/>
-     * &nbsp;&lt;include>**&#47;*ITCase.java&lt;/include><br/>
-     * &lt;/includes><br/>
-     * </code>
-     * <p/>
+     * A list of {@literal <include>} elements specifying the test filter (by pattern) of tests which should be
+     * included in testing. If it is not specified and the {@code test} parameter is unspecified as well, the default
+     * includes is
+     * <pre><code>
+     * {@literal <includes>}
+     *     {@literal <include>}**{@literal /}IT*.java{@literal </include>}
+     *     {@literal <include>}**{@literal /}*IT.java{@literal </include>}
+     *     {@literal <include>}**{@literal /}*ITCase.java{@literal </include>}
+     * {@literal </includes>}
+     * </code></pre>
+     * <br>
      * Each include item may also contain a comma-separated sublist of items, which will be treated as multiple
-     * &nbsp;&lt;include> entries.<br/>
-     * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG):<br/>
-     * &nbsp;&lt;include>%regex[.*[Cat|Dog].*], Basic????, !Unstable*&lt;/include><br/>
-     * &nbsp;&lt;include>%regex[.*[Cat|Dog].*], !%regex[pkg.*Slow.*.class], pkg&#47;**&#47;*Fast*.java&lt;/include><br/>
-     * <p/>
-     * This parameter is ignored if the TestNG <code>suiteXmlFiles</code> parameter is specified.<br/>
-     * <br/>
-     * <em>Notice that</em> these values are relative to the directory containing generated test classes of the project
-     * being tested. This directory is declared by the parameter <code>testClassesDirectory</code> which defaults
-     * to the POM property <code>${project.build.testOutputDirectory}</code>, typically <em>src/test/java</em>
-     * unless overridden.
+     * {@literal <include>} entries.<br>
+     * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG):
+     * <pre><code>
+     * {@literal <include>}%regex[.*[Cat|Dog].*], Basic????, !Unstable*{@literal </include>}
+     * {@literal <include>}%regex[.*[Cat|Dog].*], !%regex[pkg.*Slow.*.class], pkg{@literal /}**{@literal /}*Fast*.java{@literal </include>}
+     * </code></pre>
+     * <br>
+     * This parameter is ignored if the TestNG {@code suiteXmlFiles} parameter is specified.<br>
+     * <br>
+     * <b>Notice that</b> these values are relative to the directory containing generated test classes of the project
+     * being tested. This directory is declared by the parameter {@code testClassesDirectory} which defaults
+     * to the POM property <code>${project.build.testOutputDirectory}</code>, typically
+     * <code>{@literal src/test/java}</code> unless overridden.
      */
     @Parameter
     private List<String> includes;
@@ -241,7 +248,7 @@ public class IntegrationTestMojo
      * <a href="http://maven.apache.org/plugins/maven-failsafe-plugin/examples/class-loading.html">
      * http://maven.apache.org/plugins/maven-failsafe-plugin/examples/class-loading.html</a>
      * for a more detailed explanation of manifest-only JARs and their benefits.)
-     * <br/>
+     * <br>
      * Beware, setting this to "false" may cause your tests to fail on Windows if your classpath is too long.
      *
      * @since 2.4.3
@@ -265,10 +272,10 @@ public class IntegrationTestMojo
     private int rerunFailingTestsCount;
 
     /**
-     * (TestNG) List of &lt;suiteXmlFile> elements specifying TestNG suite xml file locations. Note that
-     * <code>suiteXmlFiles</code> is incompatible with several other parameters of this plugin, like
-     * <code>includes/excludes</code>.<br/>
-     * This parameter is ignored if the <code>test</code> parameter is specified (allowing you to run a single test
+     * (TestNG) List of &lt;suiteXmlFile&gt; elements specifying TestNG suite xml file locations. Note that
+     * {@code suiteXmlFiles} is incompatible with several other parameters of this plugin, like
+     * {@code includes} and {@code excludes}.<br>
+     * This parameter is ignored if the {@code test} parameter is specified (allowing you to run a single test
      * instead of an entire suite).
      *
      * @since 2.2
@@ -277,26 +284,26 @@ public class IntegrationTestMojo
     private File[] suiteXmlFiles;
 
     /**
-     * Defines the order the tests will be run in. Supported values are "alphabetical", "reversealphabetical", "random",
-     * "hourly" (alphabetical on even hours, reverse alphabetical on odd hours), "failedfirst", "balanced" and
-     * "filesystem".
-     * <br/>
-     * <br/>
+     * Defines the order the tests will be run in. Supported values are {@code alphabetical},
+     * {@code reversealphabetical}, {@code random}, {@code hourly} (alphabetical on even hours, reverse alphabetical
+     * on odd hours), {@code failedfirst}, {@code balanced} and {@code filesystem}.
+     * <br>
+     * <br>
      * Odd/Even for hourly is determined at the time the of scanning the classpath, meaning it could change during a
      * multi-module build.
-     * <br/>
-     * <br/>
+     * <br>
+     * <br>
      * Failed first will run tests that failed on previous run first, as well as new tests for this run.
-     * <br/>
-     * <br/>
+     * <br>
+     * <br>
      * Balanced is only relevant with parallel=classes, and will try to optimize the run-order of the tests reducing the
      * overall execution time. Initially a statistics file is created and every next test run will reorder classes.
-     * <br/>
-     * <br/>
-     * Note that the statistics are stored in a file named .surefire-XXXXXXXXX beside pom.xml, and should not be checked
-     * into version control. The "XXXXX" is the SHA1 checksum of the entire surefire configuration, so different
-     * configurations will have different statistics files, meaning if you change any config settings you will re-run
-     * once before new statistics data can be established.
+     * <br>
+     * <br>
+     * Note that the statistics are stored in a file named <b>.surefire-XXXXXXXXX</b> beside <i>pom.xml</i> and
+     * should not be checked into version control. The "XXXXX" is the SHA1 checksum of the entire surefire
+     * configuration, so different configurations will have different statistics files, meaning if you change any
+     * configuration settings you will re-run once before new statistics data can be established.
      *
      * @since 2.7
      */
@@ -304,31 +311,37 @@ public class IntegrationTestMojo
     private String runOrder;
 
     /**
-     * A file containing include patterns. Blank lines, or lines starting with # are ignored. If {@code includes} are
-     * also specified, these patterns are appended. Example with path, simple and regex includes:<br/>
-     * &#042;&#047;it/*<br/>
-     * &#042;&#042;&#047;NotIncludedByDefault.java<br/>
-     * %regex[.*IT.*|.*Not.*]<br/>
+     * A file containing include patterns, each in a next line. Blank lines, or lines starting with # are ignored.
+     * If {@code includes} are also specified, these patterns are appended. Example with path, simple and regex
+     * includes:
+     * <pre><code>
+     * *{@literal /}it{@literal /}*
+     * **{@literal /}NotIncludedByDefault.java
+     * %regex[.*IT.*|.*Not.*]
+     * </code></pre>
      */
     @Parameter( property = "failsafe.includesFile" )
     private File includesFile;
 
     /**
-     * A file containing exclude patterns. Blank lines, or lines starting with # are ignored. If {@code excludes} are
-     * also specified, these patterns are appended. Example with path, simple and regex excludes:<br/>
-     * &#042;&#047;it/*<br/>
-     * &#042;&#042;&#047;DontRunIT.*<br/>
-     * %regex[.*IT.*|.*Not.*]<br/>
+     * A file containing exclude patterns, each in a next line. Blank lines, or lines starting with # are ignored.
+     * If {@code excludes} are also specified, these patterns are appended.
+     * Example with path, simple and regex excludes:
+     * <pre><code>
+     * *{@literal /}it{@literal /}*
+     * **{@literal /}DontRunIT.*
+     * %regex[.*IT.*|.*Not.*]
+     * </code></pre>
      */
     @Parameter( property = "failsafe.excludesFile" )
     private File excludesFile;
 
     /**
      * Set to error/failure count in order to skip remaining tests.
-     * Due to race conditions in parallel/forked execution this may not be fully guaranteed.<br/>
-     * Enable with system property -Dfailsafe.skipAfterFailureCount=1 or any number greater than zero.
-     * Defaults to "0".<br/>
-     * See the prerequisites and limitations in documentation:<br/>
+     * Due to race conditions in parallel/forked execution this may not be fully guaranteed.<br>
+     * Enable with system property {@code -Dfailsafe.skipAfterFailureCount=1} or any number greater than zero.
+     * Defaults to "0".<br>
+     * See the prerequisites and limitations in documentation:<br>
      * <a href="http://maven.apache.org/plugins/maven-failsafe-plugin/examples/skip-after-failure.html">
      * http://maven.apache.org/plugins/maven-failsafe-plugin/examples/skip-after-failure.html</a>
      *
@@ -338,12 +351,18 @@ public class IntegrationTestMojo
     private int skipAfterFailureCount;
 
     /**
-     * After the plugin process is shutdown by sending SIGTERM signal (CTRL+C), SHUTDOWN command is received by every
-     * forked JVM. By default (shutdown=testset) forked JVM would not continue with new test which means that
-     * the current test may still continue to run.<br/>
-     * The parameter can be configured with other two values "exit" and "kill".<br/>
-     * Using "exit" forked JVM executes System.exit(1) after the plugin process has received SIGTERM signal.<br/>
-     * Using "kill" the JVM executes Runtime.halt(1) and kills itself.
+     * After the plugin process is shutdown by sending <i>SIGTERM signal (CTRL+C)</i>, <i>SHUTDOWN command</i> is
+     * received by every forked JVM.
+     * <br>
+     * By default ({@code shutdown=testset}) forked JVM would not continue with new test which means that
+     * the current test may still continue to run.
+     * <br>
+     * The parameter can be configured with other two values {@code exit} and {@code kill}.
+     * <br>
+     * Using {@code exit} forked JVM executes {@code System.exit(1)} after the plugin process has received
+     * <i>SIGTERM signal</i>.
+     * <br>
+     * Using {@code kill} the JVM executes {@code Runtime.halt(1)} and kills itself.
      *
      * @since 2.19
      */

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
index 0ad7f80..04cc72c 100644
--- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
@@ -23,7 +23,7 @@ import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.failsafe.xmlsummary.FailsafeSummaryXmlUtils;
+import org.apache.maven.plugin.failsafe.util.FailsafeSummaryXmlUtils;
 import org.apache.maven.plugin.surefire.SurefireHelper;
 import org.apache.maven.plugin.surefire.SurefireReportParameters;
 import org.apache.maven.plugin.surefire.log.PluginConsoleLogger;

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java
new file mode 100644
index 0000000..1f3f64d
--- /dev/null
+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java
@@ -0,0 +1,94 @@
+package org.apache.maven.plugin.failsafe.util;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.plugin.failsafe.xmlsummary.ErrorType;
+import org.apache.maven.plugin.failsafe.xmlsummary.FailsafeSummary;
+import org.apache.maven.surefire.suite.RunResult;
+
+import javax.xml.bind.JAXBException;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+
+import static org.apache.maven.surefire.util.internal.StringUtils.UTF_8;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.20
+ */
+public final class FailsafeSummaryXmlUtils
+{
+    private FailsafeSummaryXmlUtils()
+    {
+        throw new IllegalStateException( "No instantiable constructor." );
+    }
+
+    public static RunResult toRunResult( File failsafeSummaryXml ) throws JAXBException
+    {
+        FailsafeSummary failsafeSummary = JAXB.unmarshal( failsafeSummaryXml, FailsafeSummary.class );
+
+        return new RunResult( failsafeSummary.getCompleted(), failsafeSummary.getErrors(),
+                                    failsafeSummary.getFailures(), failsafeSummary.getSkipped(),
+                                    failsafeSummary.getFailureMessage(), failsafeSummary.isTimeout()
+        );
+    }
+
+    public static void fromRunResultToFile( RunResult fromRunResult, File toFailsafeSummaryXml )
+            throws JAXBException, IOException
+    {
+        fromRunResultToFile( fromRunResult, toFailsafeSummaryXml, UTF_8 );
+    }
+
+    public static void fromRunResultToFile( RunResult fromRunResult, File toFailsafeSummaryXml, Charset encoding )
+            throws JAXBException, IOException
+    {
+        FailsafeSummary summary = new FailsafeSummary();
+        summary.setCompleted( fromRunResult.getCompletedCount() );
+        summary.setFailureMessage( fromRunResult.getFailure() );
+        summary.setErrors( fromRunResult.getErrors() );
+        summary.setFailures( fromRunResult.getFailures() );
+        summary.setSkipped( fromRunResult.getSkipped() );
+        summary.setTimeout( fromRunResult.isTimeout() );
+        Integer errorCode = fromRunResult.getFailsafeCode();
+        summary.setResult( errorCode == null ? null : ErrorType.fromValue( String.valueOf( errorCode ) ) );
+
+        JAXB.marshal( summary, encoding, toFailsafeSummaryXml );
+    }
+
+    public static void writeSummary( RunResult mergedSummary, File mergedSummaryFile, boolean inProgress,
+                                     Charset encoding )
+            throws IOException, JAXBException
+    {
+        if ( !mergedSummaryFile.getParentFile().isDirectory() )
+        {
+            //noinspection ResultOfMethodCallIgnored
+            mergedSummaryFile.getParentFile().mkdirs();
+        }
+
+        if ( mergedSummaryFile.exists() && inProgress )
+        {
+            RunResult runResult = toRunResult( mergedSummaryFile );
+            mergedSummary = mergedSummary.aggregate( runResult );
+        }
+
+        fromRunResultToFile( mergedSummary, mergedSummaryFile, encoding );
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/JAXB.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/JAXB.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/JAXB.java
new file mode 100644
index 0000000..ac51292
--- /dev/null
+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/JAXB.java
@@ -0,0 +1,104 @@
+package org.apache.maven.plugin.failsafe.util;
+
+/*
+ * 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.
+ */
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.PropertyException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.helpers.DefaultValidationEventHandler;
+import javax.xml.namespace.QName;
+import javax.xml.transform.stream.StreamSource;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import static javax.xml.bind.JAXBContext.newInstance;
+import static javax.xml.bind.Marshaller.JAXB_ENCODING;
+import static javax.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT;
+import static javax.xml.bind.Marshaller.JAXB_FRAGMENT;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @since 2.20
+ */
+public final class JAXB
+{
+    private JAXB()
+    {
+        throw new IllegalStateException( "Not instantiated constructor." );
+    }
+
+    public static <T> T unmarshal( File source, Class<T> rootXmlNode ) throws JAXBException
+    {
+        return unmarshal( source, rootXmlNode, Collections.<String, Object>emptyMap() );
+    }
+
+    public static <T> T unmarshal( File source, Class<T> rootXmlNode, Map<String, ?> props )
+            throws JAXBException
+    {
+        Class<?>[] classesToBeBound = { rootXmlNode };
+        JAXBContext ctx = newInstance( classesToBeBound );
+        Unmarshaller unmarshaller = ctx.createUnmarshaller();
+        properties( props, unmarshaller );
+        unmarshaller.setEventHandler( new DefaultValidationEventHandler() );
+        JAXBElement<T> element = unmarshaller.unmarshal( new StreamSource( source ), rootXmlNode );
+        return element.getValue();
+    }
+
+    @SuppressWarnings( "unchecked" )
+    public static <T> void marshal( T bean, Charset encoding, File destination ) throws JAXBException, IOException
+    {
+        Class<T> type = (Class<T>) bean.getClass();
+        JAXBElement<T> rootElement = buildJaxbElement( bean, type );
+        Class<?>[] classesToBeBound = { type };
+        JAXBContext context = newInstance( classesToBeBound );
+        Marshaller marshaller = context.createMarshaller();
+        marshaller.setProperty( JAXB_ENCODING, encoding.name() );
+        marshaller.setProperty( JAXB_FORMATTED_OUTPUT, true );
+        marshaller.setProperty( JAXB_FRAGMENT, true );
+        marshaller.marshal( rootElement, destination );
+    }
+
+    private static <T> JAXBElement<T> buildJaxbElement( T bean, Class<T> type )
+    {
+        XmlRootElement xmlRootElement = type.getAnnotation( XmlRootElement.class );
+        if ( xmlRootElement == null )
+        {
+            return null;
+        }
+        QName root = new QName( "", xmlRootElement.name() );
+        return new JAXBElement<T>( root, type, bean );
+    }
+
+    private static void properties( Map<String, ?> props, Unmarshaller unmarshaller ) throws PropertyException
+    {
+        for ( Entry<String, ?> e : props.entrySet() )
+        {
+            unmarshaller.setProperty( e.getKey(), e.getValue() );
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/ErrorType.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/ErrorType.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/ErrorType.java
deleted file mode 100644
index f301527..0000000
--- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/ErrorType.java
+++ /dev/null
@@ -1 +0,0 @@
-package org.apache.maven.plugin.failsafe.xmlsummary;

/*
 * 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.
 */

import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
 
/**
 * <p>Java class for errorType.
 * <p/>
 * <p>The following schema fragment specifies the expected content contained within this class.
 * <p/>
 * <pre>
 * &lt;simpleType name="errorType">
 *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
 *     &lt;enumeration value="255"/>
 *     &lt;enumeration value="254"/>
 *   &lt;/restriction>
 * &lt;/simpleType>
 * </pre>
 */
@XmlType( name = "errorType" )
@XmlEnum( Integer.class )
public enum ErrorType
{

    @XmlEnumValue( "255" )
    FAILURE( 255 ),

    @XmlEnumValue( "254" )
    NO_TESTS( 254 );

    private final int value;

    ErrorType( int v )
    {
        value = v;
    }

    public static ErrorType fromValue( Integer v )
    {
        if ( v == null )
        {
            return null;
        }

        for ( ErrorType c : ErrorType.values() )
        {
            if ( c.value == v )
            {
                return c;
            }
        }
        throw new IllegalArgumentException( "" + v );
 
    }

    public int value()
    {
        return value;
    }

}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/FailsafeSummary.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/FailsafeSummary.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/FailsafeSummary.java
deleted file mode 100644
index d20fd4f..0000000
--- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/FailsafeSummary.java
+++ /dev/null
@@ -1 +0,0 @@
-package org.apache.maven.plugin.failsafe.xmlsummary;

/*
 * 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.
 */

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.X
 mlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import java.io.IOException;
import java.io.LineNumberReader;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;

import static java.util.Collections.emptyList;
import static org.apache.maven.plugin.failsafe.xmlsummary.ErrorType.FAILURE;
import static org.apache.maven.plugin.failsafe.xmlsummary.ErrorType.NO_TESTS;


/**
 * <p>Java class for anonymous complex type.
 * <p/>
 * <p>The following schema fragment specifies the expected content contained within this class.
 * <p/>
 * <pre>
 * &lt;complexType>
 *   &lt;complexContent>
 *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
 *       &lt;sequence>
 *         &lt;element name="completed" type="{http://www.w3.org/2001/XMLSchema}int"/>
 *         &lt;element name="errors" type="{http://www.w3.org/2001/XMLSc
 hema}int"/>
 *         &lt;element name="failures" type="{http://www.w3.org/2001/XMLSchema}int"/>
 *         &lt;element name="skipped" type="{http://www.w3.org/2001/XMLSchema}int"/>
 *         &lt;element name="failureMessage" type="{http://www.w3.org/2001/XMLSchema}string"/>
 *       &lt;/sequence>
 *       &lt;attribute name="result" type="{}errorType" />
 *       &lt;attribute name="timeout" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
 *     &lt;/restriction>
 *   &lt;/complexContent>
 * &lt;/complexType>
 * </pre>
 */
@XmlAccessorType( XmlAccessType.FIELD )
@XmlType( name = "", propOrder = {
                                         "completed",
                                         "errors",
                                         "failures",
                                         "skipped",
                                         "failureMessage"
} )
@XmlRootElement( name = "failsafe-summary" )
public class FailsafeSummary
{
    private static fin
 al String ERROR_MSG_PREFIX = "org.apache.maven.surefire.booter.SurefireBooterForkException: ";
    private static final Pattern STACK_TRACE_ELEMENT1 = Pattern.compile( "^\\tat.*\\(.*\\.java\\:[\\d]+\\)$" );
    private static final Pattern STACK_TRACE_ELEMENT2 = Pattern.compile( "^\\tat.*\\(Native Method\\)$" );
    private static final Pattern STACK_TRACE_ELEMENT3 = Pattern.compile( "^Caused by\\: .*" );

    private int completed;

    private int errors;

    private int failures;

    private int skipped;

    @XmlElement( required = true, nillable = true )
    private String failureMessage;

    @XmlAttribute( name = "result" )
    private ErrorType result;

    @XmlAttribute( name = "timeout", required = true )
    private boolean timeout;

    /**
     * Gets the value of the completed property.
     */
    public int getCompleted()
    {
        return completed;
    }

    /**
     * Sets the value of the completed property.
     */
    public void setCompleted( int value )
 
    {
        this.completed = value;
    }

    /**
     * Gets the value of the errors property.
     */
    public int getErrors()
    {
        return errors;
    }

    /**
     * Sets the value of the errors property.
     */
    public void setErrors( int value )
    {
        this.errors = value;
    }

    /**
     * Gets the value of the failures property.
     */
    public int getFailures()
    {
        return failures;
    }

    /**
     * Sets the value of the failures property.
     */
    public void setFailures( int value )
    {
        this.failures = value;
    }

    /**
     * Gets the value of the skipped property.
     */
    public int getSkipped()
    {
        return skipped;
    }

    /**
     * Sets the value of the skipped property.
     */
    public void setSkipped( int value )
    {
        this.skipped = value;
    }

    /**
     * Gets the value of the failureMessage property.
     *
     * @return possible object is
     * {@link String }
   
   */
    public String getFailureMessage()
    {
        return failureMessage;
    }

    /**
     * Sets the value of the failureMessage property.
     *
     * @param value allowed object is
     *              {@link String }
     */
    public void setFailureMessage( String value )
    {
        this.failureMessage = value;
    }

    /**
     * Gets the value of the result property.
     *
     * @return possible object is
     * {@link ErrorType }
     */
    public ErrorType getResult()
    {
        return result;
    }

    /**
     * Sets the value of the result property.
     *
     * @param value allowed object is
     *              {@link ErrorType }
     */
    public void setResult( ErrorType value )
    {
        this.result = value;
    }

    /**
     * Gets the value of the timeout property.
     */
    public boolean isTimeout()
    {
        return timeout;
    }

    /**
     * Sets the value of the timeout property.
     */
    public void setTimeout( boolea
 n value )
    {
        this.timeout = value;
    }

    public boolean hasNoTests()
    {
        return getResult() == NO_TESTS;
    }

    public boolean isFailure()
    {
        return getResult() == FAILURE;
    }

    public List<String> extractExceptionMessageLines() throws IOException
    {
        if ( getFailureMessage() == null )
        {
            return emptyList();
        }

        List<String> msg = new ArrayList<String>();
        LineNumberReader reader = new LineNumberReader( new StringReader( getFailureMessage() ) );
        for ( @SuppressWarnings( "checkstyle:innerassignment" ) String line; ( line = reader.readLine() ) != null; )
        {
            if ( !STACK_TRACE_ELEMENT1.matcher( line ).matches()
                         && !STACK_TRACE_ELEMENT2.matcher( line ).matches()
                         && !STACK_TRACE_ELEMENT3.matcher( line ).matches() )
            {
                line = line.trim();
                msg.add( line.startsWith( ERROR_MSG_P
 REFIX ) ? line.substring( ERROR_MSG_PREFIX.length() ) : line );
            }
            else
            {
                break;
            }
        }
        return msg;
    }

    @Override
    public boolean equals( Object o )
    {
        if ( this == o )
        {
            return true;
        }

        if ( o == null || getClass() != o.getClass() )
        {
            return false;
        }

        FailsafeSummary summary = (FailsafeSummary) o;

        return getCompleted() == summary.getCompleted()
                       && getErrors() == summary.getErrors()
                       && getFailures() == summary.getFailures()
                       && getSkipped() == summary.getSkipped()
                       && isTimeout() == summary.isTimeout()
                       && equal( getFailureMessage(), summary.getFailureMessage() )
                       && getResult() == summary.getResult();
    }

    @Override
    public int hashCode()
    {
        int result1 = 
 getCompleted();
        result1 = 31 * result1 + getErrors();
        result1 = 31 * result1 + getFailures();
        result1 = 31 * result1 + getSkipped();
        result1 = 31 * result1 + ( getFailureMessage() != null ? getFailureMessage().hashCode() : 0 );
        result1 = 31 * result1 + ( getResult() != null ? getResult().hashCode() : 0 );
        result1 = 31 * result1 + ( isTimeout() ? 1 : 0 );
        return result1;
    }

    private boolean equal( String s1, String s2 )
    {
        return s1 == null ? s2 == null : s1.equals( s2 );
    }
}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/FailsafeSummaryXmlUtils.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/FailsafeSummaryXmlUtils.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/FailsafeSummaryXmlUtils.java
deleted file mode 100644
index c5623c1..0000000
--- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/FailsafeSummaryXmlUtils.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.apache.maven.plugin.failsafe.xmlsummary;
-
-/*
- * 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.
- */
-
-import org.apache.maven.surefire.suite.RunResult;
-
-import javax.xml.bind.JAXBException;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.nio.charset.Charset;
-
-import static org.apache.maven.surefire.util.internal.StringUtils.UTF_8;
-
-/**
- * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @since 2.20
- */
-public final class FailsafeSummaryXmlUtils
-{
-    private FailsafeSummaryXmlUtils()
-    {
-        throw new IllegalStateException( "No instantiable constructor." );
-    }
-
-    public static RunResult toRunResult( File failsafeSummaryXml ) throws JAXBException
-    {
-        FailsafeSummary failsafeSummary = JAXB.unmarshal( failsafeSummaryXml, FailsafeSummary.class );
-
-        return new RunResult( failsafeSummary.getCompleted(), failsafeSummary.getErrors(),
-                                    failsafeSummary.getFailures(), failsafeSummary.getSkipped(),
-                                    failsafeSummary.getFailureMessage(), failsafeSummary.isTimeout()
-        );
-    }
-
-    public static void fromRunResultToFile( RunResult fromRunResult, File toFailsafeSummaryXml )
-            throws JAXBException, IOException
-    {
-        fromRunResultToFile( fromRunResult, toFailsafeSummaryXml, UTF_8 );
-    }
-
-    public static void fromRunResultToFile( RunResult fromRunResult, File toFailsafeSummaryXml, Charset encoding )
-            throws JAXBException, IOException
-    {
-        FailsafeSummary summary = new FailsafeSummary();
-        summary.setCompleted( fromRunResult.getCompletedCount() );
-        summary.setFailureMessage( fromRunResult.getFailure() );
-        summary.setErrors( fromRunResult.getErrors() );
-        summary.setFailures( fromRunResult.getFailures() );
-        summary.setSkipped( fromRunResult.getSkipped() );
-        summary.setTimeout( fromRunResult.isTimeout() );
-        summary.setResult( ErrorType.fromValue( fromRunResult.getFailsafeCode() ) );
-
-        String unmarshalled = JAXB.marshal( summary, encoding );
-
-        OutputStreamWriter os = new OutputStreamWriter( new FileOutputStream( toFailsafeSummaryXml ), encoding );
-        try
-        {
-            os.write( unmarshalled );
-            os.flush();
-        }
-        finally
-        {
-            os.close();
-        }
-    }
-
-    public static void writeSummary( RunResult mergedSummary, File mergedSummaryFile, boolean inProgress,
-                                     Charset encoding )
-            throws IOException, JAXBException
-    {
-        if ( !mergedSummaryFile.getParentFile().isDirectory() )
-        {
-            //noinspection ResultOfMethodCallIgnored
-            mergedSummaryFile.getParentFile().mkdirs();
-        }
-
-        if ( mergedSummaryFile.exists() && inProgress )
-        {
-            RunResult runResult = toRunResult( mergedSummaryFile );
-            mergedSummary = mergedSummary.aggregate( runResult );
-        }
-
-        fromRunResultToFile( mergedSummary, mergedSummaryFile, encoding );
-    }
-}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/JAXB.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/JAXB.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/JAXB.java
deleted file mode 100644
index 723200c..0000000
--- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/JAXB.java
+++ /dev/null
@@ -1 +0,0 @@
-package org.apache.maven.plugin.failsafe.xmlsummary;

/*
 * 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.
 */

import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Mar
 shaller;
import javax.xml.bind.PropertyException;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.helpers.DefaultValidationEventHandler;
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.nio.charset.Charset;
import java.util.Collections;
import java.util.Map;
import java.util.Map.Entry;

import static javax.xml.bind.JAXBContext.newInstance;
import static javax.xml.bind.Marshaller.JAXB_ENCODING;
import static javax.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT;
import static javax.xml.bind.Marshaller.JAXB_FRAGMENT;

/**
 * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
 * @since 2.20
 */
public final class JAXB
{
    private JAXB()
    {
        throw new IllegalStateException( "Not instantiated constructor." );
    }

    public static <T> T unmarshal( File s
 ource, Class<T> rootXmlNode ) throws JAXBException
    {
        return unmarshal( source, rootXmlNode, Collections.<String, Object>emptyMap() );
    }

    public static <T> T unmarshal( File source, Class<T> rootXmlNode, Map<String, ?> props )
            throws JAXBException
    {
        Class<?>[] classesToBeBound = { rootXmlNode };
        JAXBContext ctx = newInstance( classesToBeBound );
        Unmarshaller unmarshaller = ctx.createUnmarshaller();
        properties( props, unmarshaller );
        unmarshaller.setEventHandler( new DefaultValidationEventHandler() );
        JAXBElement<T> element = unmarshaller.unmarshal( new StreamSource( source ), rootXmlNode );
        return element.getValue();
    }

    public static <T> String marshal( T bean, Charset encoding ) throws JAXBException, IOException
    {
        return marshal( bean, Collections.<String, Object>emptyMap(), encoding ).toString();
    }

    @SuppressWarnings( "unchecked" )
    public static <T> StringWrit
 er marshal( T bean, Map<String, Object> props, Charset encoding )
            throws JAXBException, IOException
    {
        return marshal( bean, (Class<T>) bean.getClass(), props, encoding );
    }

    public static <T> StringWriter marshal( T bean, Class<T> type, Map<String, Object> props, Charset encoding )
            throws JAXBException, IOException
    {
        JAXBElement<T> rootElement = buildJaxbElement( bean, type );
        return marshal( rootElement, type, props, encoding );
    }

    public static <T> StringWriter marshal( JAXBElement<T> rootElement, Class<T> type,
                                            Map<String, Object> props, Charset encoding )
            throws JAXBException, IOException
    {
        StringWriter destination = new StringWriter( 256 );
        marshal( rootElement, type, props, destination, encoding );
        destination.flush();
        return destination;
    }

    public static <T> void marshal( JAXBElement<T> rootElement, Class<T
 > type, Map<String, Object> props,
                                    Writer destination, Charset encoding ) throws JAXBException
    {
        Class<?>[] classesToBeBound = { type };
        JAXBContext context = newInstance( classesToBeBound );
        Marshaller marshaller = context.createMarshaller();
        marshaller.setProperty( JAXB_ENCODING, encoding.name() );
        marshaller.setProperty( JAXB_FORMATTED_OUTPUT, true );
        marshaller.setProperty( JAXB_FRAGMENT, true );
        properties( props, marshaller );
        marshaller.marshal( rootElement, destination );
    }

    private static <T> JAXBElement<T> buildJaxbElement( T bean, Class<T> type )
    {
        XmlRootElement xmlRootElement = type.getAnnotation( XmlRootElement.class );
        if ( xmlRootElement == null )
        {
            return null;
        }
        QName root = new QName( "", xmlRootElement.name() );
        return new JAXBElement<T>( root, type, bean );
    }

    private static void p
 roperties( Map<String, ?> props, Unmarshaller unmarshaller ) throws PropertyException
    {
        for ( Entry<String, ?> e : props.entrySet() )
        {
            unmarshaller.setProperty( e.getKey(), e.getValue() );
        }
    }

    private static void properties( Map<String, ?> props, Marshaller marshaller ) throws PropertyException
    {
        for ( Entry<String, ?> e : props.entrySet() )
        {
            marshaller.setProperty( e.getKey(), e.getValue() );
        }
    }
}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/ObjectFactory.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/ObjectFactory.java
deleted file mode 100644
index 7e1c252..0000000
--- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/xmlsummary/ObjectFactory.java
+++ /dev/null
@@ -1 +0,0 @@
-package org.apache.maven.plugin.failsafe.xmlsummary;

/*
 * 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.
 */

import javax.xml.bind.annotation.XmlRegistry;


/**
 * This object contains factory methods for each
 * Java content interface and J
 ava element interface
 * generated in the org.apache.maven.surefire.suite package.
 * <p>An ObjectFactory allows you to programatically
 * construct new instances of the Java representation
 * for XML content. The Java representation of XML
 * content can consist of schema derived interfaces
 * and classes representing the binding of schema
 * type definitions, element declarations and model
 * groups.  Factory methods for each of these are
 * provided in this class.
 */
@XmlRegistry
public class ObjectFactory
{


    /**
     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package:
     * org.apache.maven.surefire.suite
     */
    public ObjectFactory()
    {
    }

    /**
     * Create an instance of {@link FailsafeSummary }
     */
    public FailsafeSummary createFailsafeSummary()
    {
        return new FailsafeSummary();
    }

}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/MarshallerUnmarshallerTest.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/MarshallerUnmarshallerTest.java b/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/MarshallerUnmarshallerTest.java
index a448725..8d5d32f 100644
--- a/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/MarshallerUnmarshallerTest.java
+++ b/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/MarshallerUnmarshallerTest.java
@@ -19,13 +19,11 @@ package org.apache.maven.plugin.failsafe;
  * under the License.
  */
 
+import org.apache.maven.plugin.failsafe.util.JAXB;
 import org.apache.maven.plugin.failsafe.xmlsummary.FailsafeSummary;
-import org.apache.maven.plugin.failsafe.xmlsummary.JAXB;
 import org.junit.Test;
 
 import java.io.File;
-import java.io.FileWriter;
-import java.util.List;
 
 import static org.apache.maven.plugin.failsafe.xmlsummary.ErrorType.FAILURE;
 import static org.apache.maven.surefire.util.internal.StringUtils.UTF_8;
@@ -62,32 +60,6 @@ public class MarshallerUnmarshallerTest
                                    + "\n\tat org.apache.maven.plugin.surefire.booterclient.ForkStarter"
                                    + ".awaitResultsDone(ForkStarter.java:489)"
                 );
-
-        List<String> exceptionMessages = summary.extractExceptionMessageLines();
-
-        assertThat( exceptionMessages )
-                .hasSize( 1 );
-
-        assertThat( exceptionMessages.get( 0 ) )
-                .isEqualTo( "ExecutionException There was an error in the forked processtest "
-                                    + "subsystem#no method RuntimeException Hi There!"
-                );
-
-        summary.setFailureMessage( null );
-
-        assertThat( summary.extractExceptionMessageLines() )
-                .isEmpty();
-    }
-
-    @Test
-    public void shouldEqualTwoSameXml() throws Exception
-    {
-        File xml = new File( "target/test-classes/org/apache/maven/plugin/failsafe/failsafe-summary.xml" );
-        FailsafeSummary summary1 = JAXB.unmarshal( xml, FailsafeSummary.class );
-        FailsafeSummary summary2 = JAXB.unmarshal( xml, FailsafeSummary.class );
-
-        assertThat( summary1 )
-                .isEqualTo( summary2 );
     }
 
     @Test
@@ -107,25 +79,29 @@ public class MarshallerUnmarshallerTest
         );
 
         File xml = File.createTempFile( "failsafe-summary", ".xml" );
-        String xmlText = JAXB.marshal( expected, UTF_8 );
-        FileWriter fileWriter = new FileWriter( xml );
-        fileWriter.write( xmlText );
-        fileWriter.flush();
-        fileWriter.close();
+        JAXB.marshal( expected, UTF_8, xml );
 
         FailsafeSummary actual = JAXB.unmarshal( xml, FailsafeSummary.class );
 
-        assertThat( actual )
-                .isEqualTo( expected );
+        assertThat( actual.getFailures() )
+                .isEqualTo( expected.getFailures() );
 
-        List<String> exceptionMessages = actual.extractExceptionMessageLines();
+        assertThat( actual.isTimeout() )
+                .isEqualTo( expected.isTimeout() );
 
-        assertThat( exceptionMessages )
-                .hasSize( 1 );
+        assertThat( actual.getCompleted() )
+                .isEqualTo( expected.getCompleted() );
 
-        assertThat( exceptionMessages.get( 0 ) )
-                .isEqualTo( "There was an error in the forked processtest "
-                                    + "subsystem#no method RuntimeException Hi There!"
-                );
+        assertThat( actual.getErrors() )
+                .isEqualTo( expected.getErrors() );
+
+        assertThat( actual.getFailures() )
+                .isEqualTo( expected.getFailures() );
+
+        assertThat( actual.getSkipped() )
+                .isEqualTo( expected.getSkipped() );
+
+        assertThat( actual.getFailureMessage() )
+                .isEqualTo( expected.getFailureMessage() );
     }
 }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/RunResultTest.java
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/RunResultTest.java b/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/RunResultTest.java
index 811c538..f7b62b6 100644
--- a/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/RunResultTest.java
+++ b/maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/RunResultTest.java
@@ -19,7 +19,7 @@ package org.apache.maven.plugin.failsafe;
  * under the License.
  */
 
-import org.apache.maven.plugin.failsafe.xmlsummary.FailsafeSummaryXmlUtils;
+import org.apache.maven.plugin.failsafe.util.FailsafeSummaryXmlUtils;
 import org.apache.maven.surefire.suite.RunResult;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
index f4bab59..4064bc2 100644
--- a/maven-surefire-common/pom.xml
+++ b/maven-surefire-common/pom.xml
@@ -123,7 +123,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.12</version>
         <executions>
           <execution>
             <id>add-source</id>

[4/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8

Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java
index 9b27c1c..9eccf6b 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java
@@ -26,13 +26,13 @@ import org.apache.maven.surefire.testset.TestSetFailedException;
 
 /**
  * Interface to be implemented by all Surefire providers.
- * <p/>
+ * <br>
  * NOTE: This class is part of the proposed public api for surefire providers for 2.7. It may
  * still be subject to changes, even for minor revisions.
- * <p/>
+ * <br>
  * The api covers this interface and all the types reachable from it. And nothing else.
- * <p/>
- * <p/>
+ * <br>
+ * <br>
  * Called in one of three ways:
  * Forkmode = never: getSuites is not called, invoke is called with null parameter
  * Forkmode = once: getSuites is not called, invoke is called with null parameter
@@ -45,7 +45,7 @@ public interface SurefireProvider
 {
     /**
      * Determines the number of forks.
-     * <p/>
+     * <br>
      * Called when forkmode is different from "never" or "always", allows the provider to define
      * how to behave for the fork.
      *
@@ -64,6 +64,7 @@ public interface SurefireProvider
      *          When reporting fails
      * @throws org.apache.maven.surefire.testset.TestSetFailedException
      *          When testset fails
+     * @throws InvocationTargetException fails in {@code ProviderFactory}
      */
     @SuppressWarnings( "checkstyle:redundantthrows" )
     RunResult invoke( Object forkTestSet )
@@ -72,14 +73,14 @@ public interface SurefireProvider
     /**
      * Makes an attempt at cancelling the current run, giving the provider a chance to notify
      * reporting that the remaining tests have been cancelled due to timeout.
-     * <p/>
+     * <br>
      * If the provider thinks it can terminate properly it is the responsibility of
      * the invoke method to return a RunResult with a booter code of failure.
-     * <p/>
+     * <br>
      * It is up to the provider to find out how to implement this method properly.
      * A provider may also choose to not do anything at all in this method,
      * which means surefire will kill the forked process soon afterwards anyway.
-     * <p/>
+     * <br>
      * Will be called on a different thread than the one calling invoke.
      */
     // Todo: Need to think a lot closer about how/if this works and if there is a use case for it.

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
index 28f111b..d4af679 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
@@ -29,7 +29,7 @@ import static org.apache.maven.surefire.util.internal.StringUtils.NL;
 
 /**
  * Deals with system.out/err.
- * <p/>
+ * <br>
  */
 public class ConsoleOutputCapture
 {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java
index 88552cb..dee095c 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/LegacyPojoStackTraceWriter.java
@@ -29,7 +29,6 @@ import java.io.StringWriter;
  * Write the trace out for a POJO test. Java 1.5 compatible.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @noinspection ThrowableResultOfMethodCallIgnored
  */
 public class LegacyPojoStackTraceWriter
     implements StackTraceWriter

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
index 2bc3fcd..ec0f782 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
@@ -55,8 +55,9 @@ public interface ReportEntry
 
     /**
      * Gets the runtime for the item. Optional parameter. If the value is not set, it will be determined within
-     * the reporting subsustem. Some providers like to calculate this value themselves, and it gets the
+     * the reporting subsystem. Some providers like to calculate this value themselves, and it gets the
      * most accurate value.
+     * @return duration of a test in milli seconds
      */
     Integer getElapsed();
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java
index 5238473..d2bfb13 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReporterConfiguration.java
@@ -24,7 +24,7 @@ import java.io.PrintStream;
 
 /**
  * Bits and pieces of reporting configuration that seem to be necessary on the provider side.
- * <p/>
+ * <br>
  * Todo: Consider moving these fields elsewhere, this concept does not smell too good
  *
  * @author Kristian Rosenvold

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/RunListener.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/RunListener.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/RunListener.java
index b964430..22cda61 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/RunListener.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/RunListener.java
@@ -22,7 +22,7 @@ package org.apache.maven.surefire.report;
 /**
  * Used by providers to report results.
  * Using this interface integrates the providers together into a common reporting infrastructure.
- * <p/>
+ * <br>
  * An instance of a reporter is not guaranteed to be thread-safe and concurrent test frameworks
  * must request an instance of a reporter per-thread from the ReporterFactory.
  */

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
index 28a19f9..0dd4264 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java
@@ -161,9 +161,6 @@ public class SimpleReportEntry
         return message;
     }
 
-    /**
-     * @noinspection RedundantIfStatement
-     */
     @Override
     public boolean equals( Object o )
     {
@@ -177,27 +174,7 @@ public class SimpleReportEntry
         }
 
         SimpleReportEntry that = (SimpleReportEntry) o;
-
-        if ( elapsed != null ? !elapsed.equals( that.elapsed ) : that.elapsed != null )
-        {
-            return false;
-        }
-        if ( name != null ? !name.equals( that.name ) : that.name != null )
-        {
-            return false;
-        }
-        if ( source != null ? !source.equals( that.source ) : that.source != null )
-        {
-            return false;
-        }
-        if ( stackTraceWriter != null
-            ? !stackTraceWriter.equals( that.stackTraceWriter )
-            : that.stackTraceWriter != null )
-        {
-            return false;
-        }
-
-        return true;
+        return isElapsedTimeEqual( that ) && isNameEqual( that ) && isSourceEqual( that ) && isStackEqual( that );
     }
 
     @Override
@@ -215,4 +192,24 @@ public class SimpleReportEntry
     {
         return getName();
     }
+
+    private boolean isElapsedTimeEqual( SimpleReportEntry en )
+    {
+        return elapsed != null ? elapsed.equals( en.elapsed ) : en.elapsed == null;
+    }
+
+    private boolean isNameEqual( SimpleReportEntry en )
+    {
+        return name != null ? name.equals( en.name ) : en.name == null;
+    }
+
+    private boolean isSourceEqual( SimpleReportEntry en )
+    {
+        return source != null ? source.equals( en.source ) : en.source == null;
+    }
+
+    private boolean isStackEqual( SimpleReportEntry en )
+    {
+        return stackTraceWriter != null ? stackTraceWriter.equals( en.stackTraceWriter ) : en.stackTraceWriter == null;
+    }
 }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java b/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
index aa099c8..e318e1f 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/suite/RunResult.java
@@ -24,7 +24,7 @@ import java.io.PrintWriter;
 
 /**
  * Represents a test-run-result; this may be from a single test run or an aggregated result.
- * <p/>
+ * <br>
  * In the case of timeout==true, the run-counts reflect the state of the test-run at the time
  * of the timeout.
  *

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/testset/ResolvedTest.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/ResolvedTest.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/ResolvedTest.java
index 8e46ccb..56bc279 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/ResolvedTest.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/ResolvedTest.java
@@ -73,12 +73,12 @@ public final class ResolvedTest
     /**
      * '*' means zero or more characters<br>
      * '?' means one and only one character
-     * The pattern %regex[] prefix and suffix does not appear. The regex <code>pattern</code> is always
+     * The pattern %regex[] prefix and suffix does not appear. The regex <i>pattern</i> is always
      * unwrapped by the caller.
      *
      * @param classPattern     test class file pattern
      * @param methodPattern    test method
-     * @param isRegex          {@code true} if regex
+     * @param isRegex          {@code true} if pattern is regex
      */
     public ResolvedTest( String classPattern, String methodPattern, boolean isRegex )
     {
@@ -104,7 +104,11 @@ public final class ResolvedTest
     }
 
     /**
-     * The regex <code>pattern</code> is always unwrapped.
+     * The regex {@code pattern} is always unwrapped.
+     *
+     * @param type class or method
+     * @param pattern pattern or regex
+     * @param isRegex {@code true} if pattern is regex
      */
     public ResolvedTest( Type type, String pattern, boolean isRegex )
     {
@@ -123,12 +127,14 @@ public final class ResolvedTest
     }
 
     /**
-     * Test class file pattern, e.g. org&#47;**&#47;Cat*.class<br/>, or null if not any
+     * Test class file pattern, e.g. org&#47;**&#47;Cat*.class<br>, or null if not any
      * and {@link #hasTestClassPattern()} returns false.
-     * Other examples: org&#47;animals&#47;Cat*, org&#47;animals&#47;Ca?.class, %regex[Cat.class|Dog.*]<br/>
-     * <br/>
+     * Other examples: org&#47;animals&#47;Cat*, org&#47;animals&#47;Ca?.class, %regex[Cat.class|Dog.*]<br>
+     * <br>
      * '*' means zero or more characters<br>
      * '?' means one and only one character
+     *
+     * @return class pattern or regex
      */
     public String getTestClassPattern()
     {
@@ -141,11 +147,13 @@ public final class ResolvedTest
     }
 
     /**
-     * Test method, e.g. "realTestMethod".<br/>, or null if not any and {@link #hasTestMethodPattern()} returns false.
-     * Other examples: test* or testSomethin? or %regex[testOne|testTwo] or %ant[testOne|testTwo]<br/>
-     * <br/>
+     * Test method, e.g. "realTestMethod".<br>, or null if not any and {@link #hasTestMethodPattern()} returns false.
+     * Other examples: test* or testSomethin? or %regex[testOne|testTwo] or %ant[testOne|testTwo]<br>
+     * <br>
      * '*' means zero or more characters<br>
      * '?' means one and only one character
+     *
+     * @return method pattern or regex
      */
     public String getTestMethodPattern()
     {
@@ -266,6 +274,9 @@ public final class ResolvedTest
 
     /**
      * Prevents {@link #match(String, String)} from throwing NPE in situations when inclusive returns true.
+     *
+     * @param testClassFile    path to class file
+     * @return {@code true} if examined class in null and class pattern exists
      */
     private boolean alwaysInclusiveQuietly( String testClassFile )
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
index a7f0e28..359ac94 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
@@ -38,9 +38,9 @@ import static org.apache.maven.surefire.testset.ResolvedTest.Type.METHOD;
 // TODO In Surefire 3.0 see SUREFIRE-1309 and use normal fully qualified class name regex instead.
 /**
  * Resolved multi pattern filter e.g. -Dtest=MyTest#test,!AnotherTest#otherTest into an object model
- * composed of included and excluded tests.<br/>
+ * composed of included and excluded tests.<br>
  * The methods {@link #shouldRun(String, String)} are filters easily used in JUnit filter or TestNG.
- * This class is independent of JUnit and TestNG API.<br/>
+ * This class is independent of JUnit and TestNG API.<br>
  * It is accessed by Java Reflection API in {@link org.apache.maven.surefire.booter.SurefireReflector}
  * using specific ClassLoader.
  */
@@ -139,7 +139,7 @@ public class TestListResolver
      *
      * @param resolver    filter possibly having method patterns
      * @return {@code resolver} if {@link TestListResolver#hasMethodPatterns() resolver.hasMethodPatterns()}
-     * returns <tt>true</tt>; Otherwise wildcard filter <em>*.class</em> is returned.
+     * returns {@code true}; Otherwise wildcard filter {@code *.class} is returned.
      */
     public static TestListResolver optionallyWildcardFilter( TestListResolver resolver )
     {
@@ -456,7 +456,7 @@ public class TestListResolver
     }
 
     /**
-     * Requires trimmed <code>request</code> been not equal to "!".
+     * Requires trimmed {@code request} been not equal to "!".
      */
     static void resolveTestRequest( String request, IncludedExcludedPatterns patterns,
                                     Collection<ResolvedTest> includedFilters, Collection<ResolvedTest> excludedFilters )

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java
index a1c9315..ef8d666 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java
@@ -74,6 +74,8 @@ public class TestRequest
 
     /**
      * A specific test request issued with -Dtest= from the command line.
+     *
+     * @return filter
      */
     public TestListResolver getTestListResolver()
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java
index e0b03aa..f6966b0 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java
@@ -30,11 +30,11 @@ public class TestSetFailedException
 {
 
     /**
-     * Create a <code>TestFailedException</code> with a detail message.
+     * Creates {@code TestSetFailedException} with a detail message.
      *
-     * @param message A detail message for this <code>TestFailedException</code>, or
-     *                <code>null</code>. If <code>null</code> is passed, the <code>getMessage</code>
-     *                method will return an empty <code>String</code>.
+     * @param message A detail message for this {@code TestSetFailedException}, or
+     *                {@code null}. If {@code null} is passed, the {@link #getMessage}
+     *                method will return an empty {@link String string}.
      */
     public TestSetFailedException( String message )
     {
@@ -42,15 +42,15 @@ public class TestSetFailedException
     }
 
     /**
-     * Create a <code>TestFailedException</code> with the specified detail
+     * Creates {@code TestSetFailedException} with the specified detail
      * message and cause.
-     * <p/>
+     * <br>
      * <p>Note that the detail message associated with cause is
-     * <em>not</em> automatically incorporated in this throwable's detail
+     * <b>NOT</b> automatically incorporated in this throwable's detail
      * message.
      *
-     * @param message A detail message for this <code>TestFailedException</code>, or <code>null</code>.
-     * @param cause   the cause, which is saved for later retrieval by the <code>getCause</code> method.
+     * @param message A detail message for this {@code TestSetFailedException}, or {@code null}.
+     * @param cause   the cause, which is saved for later retrieval by the {@link #getCause} method.
      *                (A null value is permitted, and indicates that the cause is nonexistent or unknown.)
      */
     public TestSetFailedException( String message, Throwable cause )
@@ -59,9 +59,8 @@ public class TestSetFailedException
     }
 
     /**
-     * Create a <code>TestFailedException</code> with the specified cause.  The
-     * <code>getMessage</code> method of this exception object will return
-     * <code>(cause == null ? "" : cause.toString())</code>.
+     * Creates {@code TestSetFailedException} with the specified cause. The mthod {@link #getMessage} method of this
+     * exception object will return {@code cause == null ? "" : cause.toString()}.
      *
      * @param cause The cause
      */

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireReflectionException.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireReflectionException.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireReflectionException.java
index ca5d2be..eb3b04a 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireReflectionException.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireReflectionException.java
@@ -30,9 +30,8 @@ public class SurefireReflectionException
     extends RuntimeException
 {
     /**
-     * Create a <code>SurefireReflectionException</code> with the specified cause.  The
-     * <code>getMessage</code> method of this exception object will return
-     * <code>(cause == null ? "" : cause.toString())</code>.
+     * Create a {@link SurefireReflectionException} with the specified cause. The method {@link #getMessage} of this
+     * exception object will return {@code cause == null ? "" : cause.toString()}.
      *
      * @param cause The cause of this exception
      */

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DaemonThreadFactory.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DaemonThreadFactory.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DaemonThreadFactory.java
index 4912f8e..3610a4b 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DaemonThreadFactory.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DaemonThreadFactory.java
@@ -57,6 +57,7 @@ public final class DaemonThreadFactory
 
     /**
      * Should be used by thread pools.
+     * @return new instance of {@link ThreadFactory} where each {@link Thread thread} is daemon
      */
     public static ThreadFactory newDaemonThreadFactory()
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DumpFileUtils.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DumpFileUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DumpFileUtils.java
index cad2e7a..302358c 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DumpFileUtils.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/DumpFileUtils.java
@@ -48,6 +48,9 @@ public final class DumpFileUtils
 
     /**
      * New dump file. Synchronized object appears in main memory and perfectly visible in other threads.
+     *
+     * @param dumpFileName    dump file name
+     * @param configuration    only report directory
      */
     public static synchronized File newDumpFile( String dumpFileName, ReporterConfiguration configuration )
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
index bb7c3a7..8f16513 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
@@ -27,12 +27,14 @@ import java.util.StringTokenizer;
 
 /**
  * <p>
- * Common <code>String</code> manipulation routines.
+ * Common {@link String java.lang.String} manipulation routines.
  * </p>
- * <p/>
+ * <br>
  * <p>
  * Originally from <a href="http://jakarta.apache.org/turbine/">Turbine</a> and the GenerationJavaCore library.
  * </p>
+ * <br>
+ * NOTE: This class is not part of any api and is public purely for technical reasons !
  *
  * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
  * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
@@ -46,12 +48,6 @@ import java.util.StringTokenizer;
  * @author <a href="mailto:alex@purpletech.com">Alexander Day Chaffee</a>
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @version $Id: StringUtils.java 8001 2009-01-03 13:17:09Z vsiveton $
- * @noinspection JavaDoc
- *               <p/>
- *               A quick borrow from plexus-utils by Kristian Rosenvold, to restore jdk1.3 compat Threw away all the
- *               unused stuff.
- *               <p/>
- *               NOTE: This class is not part of any api and is public purely for technical reasons !
  * @since 1.0
  */
 public final class StringUtils
@@ -81,8 +77,7 @@ public final class StringUtils
 
     public static String[] split( String text, String separator )
     {
-        int max = -1;
-        StringTokenizer tok;
+        final StringTokenizer tok;
         if ( separator == null )
         {
             // Null separator means we're using StringTokenizer's default
@@ -94,46 +89,21 @@ public final class StringUtils
             tok = new StringTokenizer( text, separator );
         }
 
-        int listSize = tok.countTokens();
-        if ( max > 0 && listSize > max )
+        String[] list = new String[tok.countTokens()];
+        for ( int i = 0; tok.hasMoreTokens(); i++ )
         {
-            listSize = max;
-        }
-
-        String[] list = new String[listSize];
-        int i = 0;
-        int lastTokenBegin;
-        int lastTokenEnd = 0;
-        while ( tok.hasMoreTokens() )
-        {
-            if ( max > 0 && i == listSize - 1 )
-            {
-                // In the situation where we hit the max yet have
-                // tokens left over in our input, the last list
-                // element gets all remaining text.
-                String endToken = tok.nextToken();
-                lastTokenBegin = text.indexOf( endToken, lastTokenEnd );
-                list[i] = text.substring( lastTokenBegin );
-                break;
-            }
-            else
-            {
-                list[i] = tok.nextToken();
-                lastTokenBegin = text.indexOf( list[i], lastTokenEnd );
-                lastTokenEnd = lastTokenBegin + list[i].length();
-            }
-            i++;
+            list[i] = tok.nextToken();
         }
         return list;
     }
 
     /**
      * <p>
-     * Checks if a (trimmed) String is <code>null</code> or blank.
+     * Checks if a (trimmed) String is {@code null} or blank.
      * </p>
      *
      * @param str the String to check
-     * @return <code>true</code> if the String is <code>null</code>, or length zero once trimmed
+     * @return {@code true} if the String is {@code null}, or length zero once trimmed
      */
     public static boolean isBlank( String str )
     {
@@ -142,12 +112,11 @@ public final class StringUtils
 
     /**
      * <p>
-     * Checks if a (trimmed) String is not <code>null</code> and not blank.
+     * Checks if a (trimmed) String is not {@code null} and not blank.
      * </p>
      *
      * @param str the String to check
-     * @return <code>true</code> if the String is not <code>null</code> and length of trimmed
-     * <code>str</code> is not zero.
+     * @return {@code true} if the String is not {@code null} and length of trimmed {@code str} is not zero.
      */
     public static boolean isNotBlank( String str )
     {
@@ -255,7 +224,7 @@ public final class StringUtils
      * <p>
      * A save length of {@code out} is {@code len * 3 + outoff}.
      * <p>
-     * The reverse-method is {@link #unescapeBytes(byte[], String)}.
+     * The reverse-method is {@link #unescapeBytes(String, String)}.
      *
      * @param out output buffer
      * @param outoff offset in the output buffer
@@ -339,9 +308,7 @@ public final class StringUtils
             try
             {
                 decodedFromSourceCharset = sourceCharset.newDecoder().decode( ByteBuffer.wrap( out, 0, outPos ) );
-                ByteBuffer defaultEncoded = DEFAULT_CHARSET.encode( decodedFromSourceCharset );
-
-                return defaultEncoded;
+                return DEFAULT_CHARSET.encode( decodedFromSourceCharset );
             }
             catch ( CharacterCodingException e )
             {
@@ -358,10 +325,11 @@ public final class StringUtils
     }
 
     /**
+     * Determines if {@code buffer} starts with specific literal(s).
      *
      * @param buffer     Examined StringBuffer
-     * @param pattern    a pattern which should start in <code>buffer</code>
-     * @return <tt>true</tt> if buffer's literal starts with given pattern
+     * @param pattern    a pattern which should start in {@code buffer}
+     * @return    {@code true} if buffer's literal starts with given {@code pattern}, or both are empty.
      */
     public static boolean startsWith( StringBuffer buffer, String pattern )
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/test/java/org/apache/maven/surefire/testset/FundamentalFilterTest.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/testset/FundamentalFilterTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/testset/FundamentalFilterTest.java
index 9118448..b99d4f9 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/testset/FundamentalFilterTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/testset/FundamentalFilterTest.java
@@ -23,6 +23,7 @@ import org.junit.Test;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 
+@SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } )
 /**
  * Inclusive test patters:<p>
  *

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
index bb64115..8fa760b 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java
@@ -37,12 +37,12 @@ import static org.apache.maven.surefire.cli.CommandLineOption.*;
 
 /**
  * Knows how to serialize and deserialize the booter configuration.
- * <p/>
+ * <br>
  * The internal serialization format is through a properties file. The long-term goal of this
  * class is not to expose this implementation information to its clients. This still leaks somewhat,
  * and there are some cases where properties are being accessed as "Properties" instead of
  * more representative domain objects.
- * <p/>
+ * <br>
  *
  * @author Jason van Zyl
  * @author Emmanuel Venisse

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
index 84ed9eb..531e7a1 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
@@ -116,6 +116,9 @@ public class Classpath implements Iterable<String>
     /**
      * @deprecated this should be package private method which returns List of Files. It will be
      * removed in the next major version.
+     *
+     * @return list of {@link URL jar files paths} with {@code file} protocol in URL.
+     * @throws MalformedURLException if {@link URL} could not be created upon given class-path element(s)
      */
     @Deprecated
     public List<URL> getAsUrlList()

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
index 7425e3d..0e84315 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ClasspathConfiguration.java
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.booter;
 
 /**
  * Represents the classpaths for the BooterConfiguration.
- * <p/>
+ * <br>
  *
  * @author Jason van Zyl
  * @author Emmanuel Venisse

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
index d5bba1f..8dabaef 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
@@ -63,9 +63,9 @@ import static org.apache.maven.surefire.util.internal.StringUtils.encodeStringFo
 
 /**
  * The part of the booter that is unique to a forked vm.
- * <p/>
+ * <br>
  * Deals with deserialization of the booter wire-level protocol
- * <p/>
+ * <br>
  *
  * @author Jason van Zyl
  * @author Emmanuel Venisse
@@ -82,7 +82,7 @@ public final class ForkedBooter
 
     /**
      * This method is invoked when Surefire is forked - this method parses and organizes the arguments passed to it and
-     * then calls the Surefire class' run method. <p/> The system exit code will be 1 if an exception is thrown.
+     * then calls the Surefire class' run method. <br> The system exit code will be 1 if an exception is thrown.
      *
      * @param args Commandline arguments
      */

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
index a4d7d09..601acd5 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
@@ -25,7 +25,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 /**
- * @noinspection CustomClassloader
+ * Loads classes from jar files added via {@link #addURL(URL)}.
  */
 public class IsolatedClassLoader
     extends URLClassLoader

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
index 79cbd42..c7379e4 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java
@@ -33,7 +33,7 @@ import org.apache.maven.surefire.testset.TestRequest;
 /**
  * Represents the surefire configuration that passes all the way into the provider
  * classloader and the provider.
- * <p/>
+ * <br>
  *
  * @author Jason van Zyl
  * @author Emmanuel Venisse

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
index ae4e08e..e800cfe 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
@@ -34,7 +34,7 @@ import static org.apache.maven.surefire.util.ReflectionUtils.invokeMethodWithArr
 
 /**
  * Creates the surefire provider.
- * <p/>
+ * <br>
  *
  * @author Kristian Rosenvold
  */

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
index ce23d3e..91530b7 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/StartupConfiguration.java
@@ -95,8 +95,8 @@ public class StartupConfiguration
 
     /**
      * <p>Strip any of a supplied String from the end of a String.</p>
-     * <p/>
-     * <p>If the strip String is <code>null</code>, whitespace is
+     * <br>
+     * <p>If the strip String is {@code null}, whitespace is
      * stripped.</p>
      *
      * @param str   the String to remove characters from

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
index 2dfd1cc..9a49d1a 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractFailFastIT.java
@@ -32,7 +32,7 @@ import java.util.Map;
 import static org.junit.runners.Parameterized.Parameter;
 
 /**
- * Base test class for SUREFIRE-580, configuration parameter <em>skipAfterFailureCount</em>.
+ * Base test class for SUREFIRE-580, configuration parameter {@code skipAfterFailureCount}.
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
  * @since 2.19

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java
index 86df7fa..beb1e32 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastJUnitIT.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import static org.junit.runners.Parameterized.Parameters;
 
 /**
- * Test class for SUREFIRE-580, configuration parameter <em>skipAfterFailureCount</em>.
+ * Test class for SUREFIRE-580, configuration parameter {@code skipAfterFailureCount}.
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
  * @since 2.19

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java
index 40ebc9f..f4aa2b7 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/FailFastTestNgIT.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import static org.junit.runners.Parameterized.Parameters;
 
 /**
- * Test class for SUREFIRE-580, configuration parameter <em>skipAfterFailureCount</em>.
+ * Test class for SUREFIRE-580, configuration parameter {@code skipAfterFailureCount}.
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
  * @since 2.19

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
index 58d270a..a6c539c 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesFromFileIT.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 /**
  * Test include/exclude from files.
- * <p/>
+ * <br>
  * Based on {@link IncludesExcludesIT}.
  */
 public class IncludesExcludesFromFileIT

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java
index d6856b3..bf393ca 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ParallelNotThreadSafeIT.java
@@ -24,7 +24,7 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
 import org.junit.Test;
 
 /**
- * Testing <code>@net.jcip.annotations.NotThreadSafe</code> with ParallelComputerBuilder.
+ * Testing {@code @net.jcip.annotations.NotThreadSafe} with ParallelComputerBuilder.
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
  * @since 2.19

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
index a99c142..5470a3f 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UnicodeTestNamesIT.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 
 /**
  * Verifies unicode filenames pass through correctly.
- * <p/>
+ * <br>
  * If the underlying file system turns out not to support unicode, we just fail an assumption.s
  */
 public class UnicodeTestNamesIT

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
index e7aff2e..bd12dda 100755
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
@@ -38,7 +38,7 @@ import static java.util.Collections.unmodifiableList;
 
 /**
  * Encapsulate all needed features to start a maven run
- * <p/>
+ * <br>
  *
  * @author Kristian Rosenvold
  */

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java
index c300abf..ee04dbc 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireJUnit4IntegrationTestCase.java
@@ -22,7 +22,7 @@ package org.apache.maven.surefire.its.fixture;
 /**
  * Contains commonly used features for most tests, encapsulating
  * common use cases.
- * <p/>
+ * <br>
  * Also includes thread-safe access to the extracted resource
  * files, which AbstractSurefireIntegrationTestClass does not.
  * Thread safe only for running in "classes" mode.

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index 4cb162d..e2356f4 100755
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -29,7 +29,7 @@ import static java.util.Collections.singletonList;
 
 /**
  * Encapsulate all needed features to start a surefire run
- * <p/>
+ * <br>
  * Also includes thread-safe access to the extracted resource
  * files
  *

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java
index 9866dd5..886cd07 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1024VerifyFailsafeIfTestedIT.java
@@ -29,7 +29,7 @@ import org.junit.Test;
  * Found in Surefire 2.16.
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1024}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1024">SUREFIRE-1024</a>
  * @since 2.19
  */
 public class Surefire1024VerifyFailsafeIfTestedIT

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
index 6e4d76c..ec63a8a 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1028UnableToRunSingleIT.java
@@ -25,20 +25,20 @@ import org.junit.Test;
 
 /**
  * Plugin Configuration: parallel=classes
- * <p/>
+ * <br>
  * With Surefire 2.15
  * {@code $ mvn test -Dtest=MyTest#testFoo}
  * Results:
  * Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
- * <p/>
+ * <br>
  * With Surefire 2.16
  * {@code $ mvn test -Dtest=MyTest#testFoo}
- * <p/>
+ * <br>
  * Results:
  * Tests run: 0, Failures: 0, Errors: 0, Skipped: 0
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1028}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1028">SUREFIRE-1028</a>
  * @since 2.18
  */
 public class Surefire1028UnableToRunSingleIT

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java
index 1d5d353..0d6d8b6 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1036NonFilterableJUnitRunnerWithCategoriesIT.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.*;
 
 /**
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1036}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1036">SUREFIRE-1036</a>
  * @since 2.18
  */
 public class Surefire1036NonFilterableJUnitRunnerWithCategoriesIT

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
index 6494b79..b3ed744 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1053SystemPropertiesIT.java
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertFalse;
 
 /**
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1053}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1053">SUREFIRE-1053</a>
  * @since 2.18
  */
 public class Surefire1053SystemPropertiesIT

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java
index 27d8cfd..d6a38fa 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1080ParallelForkDoubleTestIT.java
@@ -24,8 +24,8 @@ import org.apache.maven.surefire.its.fixture.SurefireLauncher;
 import org.junit.Test;
 
 /**
- * Description of SUREFIRE-1080: <p/>
- * <p/>
+ * Description of SUREFIRE-1080: <br>
+ * <br>
  * There are 9 tests in total in the attached project, and mvn test will show 9 tests run.
  * When I use the command " mvn test -Dparallel=classes -DforkCount=2 -DuseUnlimitedThreads=true", it shows 13 tests
  * run (and sometimes 16), and some tests are run more than once.
@@ -35,7 +35,7 @@ import org.junit.Test;
  * JUnit 4.11
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1080}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1080">SUREFIRE-1080</a>
  * @since 2.18
  */
 public class Surefire1080ParallelForkDoubleTestIT

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
index a39f870..b1d9d4f 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertThat;
 
 /**
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1082}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1082">SUREFIRE-1082</a>
  * @since 2.18
  */
 public class Surefire1082ParallelJUnitParameterizedIT

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
index 509f3d0..f894265 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1095NpeInRunListener.java
@@ -23,6 +23,7 @@ import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
 import org.apache.maven.surefire.its.fixture.SurefireLauncher;
 import org.junit.Test;
 
+@SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } )
 /**
  *
  * In the surefire plugin, it is possible to specify one or more RunListener when running tests with JUnit.
@@ -41,7 +42,7 @@ import org.junit.Test;
  * Note: other methods in the RunListener I tested seems fine (i.e., they get a valid Description object as input)
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1095}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1095}"/>
  * @since 2.18
  */
 public final class Surefire1095NpeInRunListener
@@ -50,7 +51,7 @@ public final class Surefire1095NpeInRunListener
 
     /**
      * Method Request.classes( String, Class[] ); exists in JUnit 4.0 - 4.4
-     * @see JUnit4Reflector
+     * See JUnit4Reflector.
      */
     @Test
     public void testRunStartedWithJUnit40()
@@ -64,7 +65,7 @@ public final class Surefire1095NpeInRunListener
 
     /**
      * Method Request.classes( Class[] ); Since of JUnit 4.5
-     * @see JUnit4Reflector
+     * See JUnit4Reflector.
      */
     @Test
     public void testRunStartedWithJUnit45()

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
index fc559ec..e81f066 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1098BalancedRunOrderIT.java
@@ -35,17 +35,17 @@ import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.AnyOf.anyOf;
 
 /**
- * The purpose of this IT is to assert that the run order of test classes is according to the settings:<p/>
+ * The purpose of this IT is to assert that the run order of test classes is according to the settings:<br>
  *
- * runOrder=balanced<p/>
- * parallel=classes<p/>
- * threadCount=2<p/>
- * perCoreThreadCount=false<p/>
- * <p/>
+ * runOrder=balanced<br>
+ * parallel=classes<br>
+ * threadCount=2<br>
+ * perCoreThreadCount=false<br>
+ * <br>
  * The list of tests should be reordered to (DTest, CTest, BTest, ATest) in the second run.
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1098}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1098">SUREFIRE-1098</a>
  * @since 2.18
  */
 public class Surefire1098BalancedRunOrderIT

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java
index 03e7639..2f9dca8 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1122ParallelAndFlakyTestsIT.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 
 /**
  * @author agudian
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1122}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1122">SUREFIRE-1122</a>
  */
 public class Surefire1122ParallelAndFlakyTestsIT
     extends SurefireJUnit4IntegrationTestCase

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
index 84735a9..f78c16a 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java
@@ -24,7 +24,7 @@ import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
 import org.junit.Test;
 
 /**
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1146}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1146">SUREFIRE-1146</a>
  */
 public class Surefire1146RerunFailedAndParameterized
     extends SurefireJUnit4IntegrationTestCase

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java
index 17064c0..706f6b5 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1158RemoveInfoLinesIT.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
 /**
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1158}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1158">SUREFIRE-1158</a>
  * @since 2.19
  */
 @RunWith( Parameterized.class )

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java
index 7d60138..f886446 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1202RerunAndSkipIT.java
@@ -28,7 +28,7 @@ import org.junit.Test;
  * Allow rerunFailingTestsCount, skipAfterFailureCount together
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1202}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1202">SUREFIRE-1202</a>
  * @since 2.19.1
  */
 public class Surefire1202RerunAndSkipIT

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
index a6cb73d..6ee87fb 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
@@ -1 +1,75 @@
-package org.apache.maven.surefire.its.jiras;

/*
 * 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.
 */

import org.apache.maven.it.VerificationException;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org
 .apache.maven.surefire.its.fixture.SurefireLauncher;
import org.junit.Test;

/**
 * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
 * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1209}
 * @since 2.19
 */
public class Surefire1209RerunAndForkCountIT
        extends SurefireJUnit4IntegrationTestCase
{
    @Test
    public void reusableForksJUnit47()
            throws VerificationException
    {
        unpack().executeTest()
                .assertTestSuiteResults( 5, 0, 0, 0, 4 );
    }

    @Test
    public void notReusableForksJUnit47()
            throws VerificationException
    {
        unpack().reuseForks( false )
                .executeTest()
                .assertTestSuiteResults( 5, 0, 0, 0, 4 );
    }

    @Test
    public void reusableForksJUnit4()
            throws VerificationException
    {
        unpack().addGoal( "-Pjunit4" )
                .executeTest()
                .assertTestSuiteResults( 5, 0, 0, 0, 4 );
    }
     @Test
    public void notReusableForksJUnit4()
            throws VerificationException
    {
        unpack().addGoal( "-Pjunit4" )
                .reuseForks( false )
                .executeTest()
                .assertTestSuiteResults( 5, 0, 0, 0, 4 );
    }

    private SurefireLauncher unpack()
    {
        return unpack( "surefire-1209-rerun-and-forkcount" );
    }
}
\ No newline at end of file
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1209">SUREFIRE-1209</a>
+ * @since 2.19
+ */
+public class Surefire1209RerunAndForkCountIT
+        extends SurefireJUnit4IntegrationTestCase
+{
+    @Test
+    public void reusableForksJUnit47()
+            throws VerificationException
+    {
+        unpack().executeTest()
+                .assertTestSuiteResults( 5, 0, 0, 0, 4 );
+    }
+
+    @Test
+    public void notReusableForksJUnit47()
+            throws VerificationException
+    {
+        unpack().reuseForks( false )
+                .executeTest()
+                .assertTestSuiteResults( 5, 0, 0, 0, 4 );
+    }
+
+    @Test
+    public void reusableForksJUnit4()
+            throws VerificationException
+    {
+        unpack().addGoal( "-Pjunit4" )
+                .executeTest()
+                .assertTestSuiteResults( 5, 0, 0, 0, 4 );
+    }
+
+    @Test
+    public void notReusableForksJUnit4()
+            throws VerificationException
+    {
+        unpack().addGoal( "-Pjunit4" )
+                .reuseForks( false )
+                .executeTest()
+                .assertTestSuiteResults( 5, 0, 0, 0, 4 );
+    }
+
+    private SurefireLauncher unpack()
+    {
+        return unpack( "surefire-1209-rerun-and-forkcount" );
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java
index da69e9d..27b4da8 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1211JUnitTestNgIT.java
@@ -1 +1,63 @@
-package org.apache.maven.surefire.its.jiras;

/*
 * 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.
 */

import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLaunche
 r;
import org.junit.Test;

import static org.apache.commons.lang3.JavaVersion.JAVA_1_7;
import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;

/**
 * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
 * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-1211}
 * @since 2.19.1
 */
public class Surefire1211JUnitTestNgIT
        extends SurefireJUnit4IntegrationTestCase
{

    @Test
    public void withJUnit()
    {
        assumeJavaVersion( JAVA_1_7 );

        unpack().threadCount( 1 )
                .executeTest()
                .verifyErrorFree( 2 );
    }

    @Test
    public void withoutJUnit()
    {
        assumeJavaVersion( JAVA_1_7 );

        unpack().threadCount( 1 )
                .sysProp( "junit", "false" )
                .executeTest()
                .verifyErrorFree( 1 );
    }

    private SurefireLauncher unpack()
    {
        return unpack( "surefire-1211" );
    }
}
\ No newline at end of file
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.junit.Test;
+
+import static org.apache.commons.lang3.JavaVersion.JAVA_1_7;
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
+
+/**
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1211">SUREFIRE-1211</a>
+ * @since 2.19.1
+ */
+public class Surefire1211JUnitTestNgIT
+        extends SurefireJUnit4IntegrationTestCase
+{
+
+    @Test
+    public void withJUnit()
+    {
+        assumeJavaVersion( JAVA_1_7 );
+
+        unpack().threadCount( 1 )
+                .executeTest()
+                .verifyErrorFree( 2 );
+    }
+
+    @Test
+    public void withoutJUnit()
+    {
+        assumeJavaVersion( JAVA_1_7 );
+
+        unpack().threadCount( 1 )
+                .sysProp( "junit", "false" )
+                .executeTest()
+                .verifyErrorFree( 1 );
+    }
+
+    private SurefireLauncher unpack()
+    {
+        return unpack( "surefire-1211" );
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java
index 870daf1..c4031c2 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1260NewTestsPattern.java
@@ -1 +1,49 @@
-package org.apache.maven.surefire.its.jiras;

/*
 * 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.
 */

import org.apache.maven.surefire.its.fixture.*;
import org.junit.Test;

/**
 * Added included pattern Tests.java.
 * <p>
 * Found in Surefir
 e 2.19.1.
 *
 * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
 * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-12-60}
 * @since 2.20
 */
public class Surefire1260NewTestsPattern
        extends SurefireJUnit4IntegrationTestCase
{
    @Test
    public void defaultConfig()
    {
        unpack()
                .executeTest()
                .verifyErrorFree( 5 );
    }

    private SurefireLauncher unpack()
    {
        return unpack( "/surefire-1260-new-tests-pattern" );
    }
}
\ No newline at end of file
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.surefire.its.fixture.*;
+import org.junit.Test;
+
+/**
+ * Added included pattern Tests.java.
+ * <p>
+ * Found in Surefire 2.19.1.
+ *
+ * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1260">SUREFIRE-1260</a>
+ * @since 2.20
+ */
+public class Surefire1260NewTestsPattern
+        extends SurefireJUnit4IntegrationTestCase
+{
+    @Test
+    public void defaultConfig()
+    {
+        unpack()
+                .executeTest()
+                .verifyErrorFree( 5 );
+    }
+
+    private SurefireLauncher unpack()
+    {
+        return unpack( "/surefire-1260-new-tests-pattern" );
+    }
+}

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java
index 88c0daa..9e06e8e 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java
@@ -25,6 +25,7 @@ import org.junit.Test;
 
 import static org.junit.Assume.assumeTrue;
 
+@SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } )
 /**
  * IsolatedClassLoader should take platform ClassLoader as a parent ClassLoader if running on the top of JDK9.
  * The IsolatedClassLoader should not fail like this:
@@ -35,7 +36,7 @@ import static org.junit.Assume.assumeTrue;
  * java.lang.NoClassDefFoundError: java/sql/SQLException: java.sql.SQLException -> [Help 1]
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://issues.apache.org/jira/browse/SUREFIRE-1265}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-1265">SUREFIRE-1265</a>
  * @since 2.20.1
  */
 public class Surefire1265Java9IT

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java
index 96efa5a..d6f0a0e 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire649EmptyStringSystemPropertiesIT.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.fail;
 
 /**
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-649}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-649">SUREFIRE-649</a>
  * @since 2.18
  */
 public class Surefire649EmptyStringSystemPropertiesIT

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java
index 7ab1568..215bd5d 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire817SystemExitIT.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 /**
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-817}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-817">SUREFIRE-817</a>
  * @since 2.18
  */
 public class Surefire817SystemExitIT

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java
index 9ee7a41..1263ab3 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 
 /**
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-855}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-855">SUREFIRE-855</a>
  * @since 2.19
  */
 public class Surefire855AllowFailsafeUseArtifactFileIT

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java
index 2085d93..d776724 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire995CategoryInheritanceIT.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 
 /**
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
- * @see {@linkplain https://jira.codehaus.org/browse/SUREFIRE-995}
+ * @see <a href="https://issues.apache.org/jira/browse/SUREFIRE-995">SUREFIRE-995</a>
  * @since 2.18.1
  */
 public class Surefire995CategoryInheritanceIT

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/SurefireToolchains/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/SurefireToolchains/pom.xml b/surefire-integration-tests/src/test/resources/SurefireToolchains/pom.xml
index 623c226..2d066eb 100644
--- a/surefire-integration-tests/src/test/resources/SurefireToolchains/pom.xml
+++ b/surefire-integration-tests/src/test/resources/SurefireToolchains/pom.xml
@@ -1,7 +1,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>test</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml b/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml
index 4020be5..01ce10c 100644
--- a/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml
+++ b/surefire-integration-tests/src/test/resources/additional-classpath/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml b/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml
index b28ab64..9897a25 100644
--- a/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml
+++ b/surefire-integration-tests/src/test/resources/aggregate-report/child1/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml b/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml
index 35dee50..b67c49a 100644
--- a/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml
+++ b/surefire-integration-tests/src/test/resources/aggregate-report/child2/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml b/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
index 631ca7c..42f0f32 100644
--- a/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
+++ b/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

[5/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8

Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index f2c32d0..551d980 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -135,7 +135,7 @@ public abstract class AbstractSurefireMojo
     protected boolean skipTests;
 
     /**
-     * This old parameter is just like <code>skipTests</code>, but bound to the old property "maven.test.skip.exec".
+     * This old parameter is just like {@code skipTests}, but bound to the old property "maven.test.skip.exec".
      *
      * @since 2.3
      * @deprecated Use skipTests instead.
@@ -147,7 +147,7 @@ public abstract class AbstractSurefireMojo
     /**
      * Set this to "true" to bypass unit tests entirely. Its use is NOT RECOMMENDED, especially if you enable it using
      * the "maven.test.skip" property, because maven.test.skip disables both running the tests and compiling the tests.
-     * Consider using the <code>skipTests</code> parameter instead.
+     * Consider using the {@code skipTests} parameter instead.
      */
     @Parameter( property = "maven.test.skip", defaultValue = "false" )
     protected boolean skip;
@@ -184,7 +184,7 @@ public abstract class AbstractSurefireMojo
     /**
      * A dependency scope to exclude from the test classpath. The scope should be one of the scopes defined by
      * org.apache.maven.artifact.Artifact. This includes the following:
-     * <p/>
+     * <br>
      * <ul>
      * <li><i>compile</i> - system, provided, compile
      * <li><i>runtime</i> - compile, runtime
@@ -215,23 +215,28 @@ public abstract class AbstractSurefireMojo
     private File testSourceDirectory;
 
     /**
-     * A list of &lt;exclude> elements specifying the tests (by pattern) that should be excluded in testing. When not
-     * specified and when the <code>test</code> parameter is not specified, the default excludes will be <code><br/>
-     * &lt;excludes><br/>
-     * &nbsp;&lt;exclude>**&#47;*$*&lt;/exclude><br/>
-     * &lt;/excludes><br/>
-     * </code> (which excludes all inner classes).<br>
-     * This parameter is ignored if the TestNG <code>suiteXmlFiles</code> parameter is specified.
-     * <p/>
-     * Each exclude item may also contain a comma-separated sublist of items, which will be treated as multiple
-     * &nbsp;&lt;exclude> entries.<br/>
-     * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG):<br/>
-     * <exclude>%regex[pkg.*Slow.*.class], Unstable*</exclude><br/>
-     * <br/>
-     * <em>Notice that</em> these values are relative to the directory containing generated test classes of the project
-     * being tested. This directory is declared by the parameter <code>testClassesDirectory</code> which defaults
-     * to the POM property <code>${project.build.testOutputDirectory}</code>, typically <em>src/test/java</em>
-     * unless overridden.
+     * A list of &lt;exclude&gt; elements specifying the tests (by pattern) that should be excluded in testing. When not
+     * specified and when the {@code test} parameter is not specified, the default excludes will be <br>
+     * <pre><code>
+     * {@literal <excludes>}
+     *     {@literal <exclude>}**{@literal /}*$*{@literal </exclude>}
+     * {@literal </excludes>}
+     * </code></pre>
+     * (which excludes all inner classes).
+     * <br>
+     * This parameter is ignored if the TestNG {@code suiteXmlFiles} parameter is specified.
+     * <br>
+     * Each exclude item may also contain a comma-separated sub-list of items, which will be treated as multiple
+     * &nbsp;&lt;exclude&gt; entries.<br>
+     * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG):
+     * <pre><code>
+     * {@literal <exclude>}%regex[pkg.*Slow.*.class], Unstable*{@literal </exclude>}
+     * </code></pre>
+     * <br>
+     * <b>Notice that</b> these values are relative to the directory containing generated test classes of the project
+     * being tested. This directory is declared by the parameter {@code testClassesDirectory} which defaults
+     * to the POM property <code>${project.build.testOutputDirectory}</code>, typically
+     * <code>{@literal src/test/java}</code> unless overridden.
      */
     @Parameter
     // TODO use regex for fully qualified class names in 3.0 and change the filtering abilities
@@ -319,13 +324,14 @@ public abstract class AbstractSurefireMojo
     private Boolean failIfNoTests;
 
     /**
-     * <strong>DEPRECATED</strong> since version 2.14. Use <code>forkCount</code> and <code>reuseForks</code> instead.
-     * <br/>
-     * <br/>
-     * Option to specify the forking mode. Can be "never", "once", "always", "perthread". "none" and "pertest" are also
-     * accepted for backwards compatibility. "always" forks for each test-class. "perthread" will create
-     * <code>threadCount</code> parallel forks, each executing one test-class. See also parameter
-     * <code>reuseForks</code>.<br/>
+     * <strong>DEPRECATED</strong> since version 2.14. Use {@code forkCount} and {@code reuseForks} instead.
+     * <br>
+     * <br>
+     * Option to specify the forking mode. Can be {@code never}, {@code once}, {@code always}, {@code perthread}.<br>
+     * The {@code none} and {@code pertest} are also accepted for backwards compatibility.<br>
+     * The {@code always} forks for each test-class.<br>
+     * The {@code perthread} creates the number of parallel forks specified by {@code threadCount}, where each forked
+     * JVM is executing one test-class. See also the parameter {@code reuseForks} for the lifetime of JVM.
      *
      * @since 2.1
      */
@@ -353,15 +359,15 @@ public abstract class AbstractSurefireMojo
 
     /**
      * Arbitrary JVM options to set on the command line.
-     * <br/>
-     * <br/>
-     * Since the Version 2.17 using an alternate syntax for <em>argLine</em>, <pre>@{...}</pre> allows late replacement
+     * <br>
+     * <br>
+     * Since the Version 2.17 using an alternate syntax for {@code argLine}, <b>@{...}</b> allows late replacement
      * of properties when the plugin is executed, so properties that have been modified by other plugins will be picked
      * up correctly.
-     * See the Frequently Asked Questions page with more details:<br/>
+     * See the Frequently Asked Questions page with more details:<br>
      * <a href="http://maven.apache.org/surefire/maven-surefire-plugin/faq.html">
      *     http://maven.apache.org/surefire/maven-surefire-plugin/faq.html</a>
-     * <br/>
+     * <br>
      * <a href="http://maven.apache.org/surefire/maven-failsafe-plugin/faq.html">
      *     http://maven.apache.org/surefire/maven-failsafe-plugin/faq.html</a>
      *
@@ -388,7 +394,7 @@ public abstract class AbstractSurefireMojo
 
     /**
      * When false it makes tests run using the standard classloader delegation instead of the default Maven isolated
-     * classloader. Only used when forking (forkMode is not "none").<br/>
+     * classloader. Only used when forking ({@code forkMode} is not {@code none}).<br>
      * Setting it to false helps with some problems caused by conflicts between xml parsers in the classpath and the
      * Java 5 provider parser.
      *
@@ -399,12 +405,12 @@ public abstract class AbstractSurefireMojo
 
     /**
      * (TestNG/JUnit47 provider with JUnit4.8+ only) Groups for this test. Only classes/methods/etc decorated with one
-     * of the groups specified here will be included in test run, if specified.<br/>
-     * For JUnit, this parameter forces the use of the 4.7 provider<br/>
-     * This parameter is ignored if the <code>suiteXmlFiles</code> parameter is specified.<br/>
-     * Since version 2.18.1 and JUnit 4.12, the <em>@Category<em> annotation type is automatically inherited from
-     * superclasses, see <em>@java.lang.annotation.Inherited</em>. Make sure that test class inheritance still makes
-     * sense together with <em>@Category<em> annotation of the JUnit 4.12 or higher appeared in superclass.
+     * of the groups specified here will be included in test run, if specified.<br>
+     * For JUnit, this parameter forces the use of the 4.7 provider<br>
+     * This parameter is ignored if the {@code suiteXmlFiles} parameter is specified.<br>
+     * Since version 2.18.1 and JUnit 4.12, the {@code @Category} annotation type is automatically inherited from
+     * superclasses, see {@code @java.lang.annotation.Inherited}. Make sure that test class inheritance still makes
+     * sense together with {@code @Category} annotation of the JUnit 4.12 or higher appeared in superclass.
      *
      * @since 2.2
      */
@@ -413,12 +419,12 @@ public abstract class AbstractSurefireMojo
 
     /**
      * (TestNG/JUnit47 provider with JUnit4.8+ only) Excluded groups. Any methods/classes/etc with one of the groups
-     * specified in this list will specifically not be run.<br/>
-     * For JUnit, this parameter forces the use of the 4.7 provider<br/>
-     * This parameter is ignored if the <code>suiteXmlFiles</code> parameter is specified.<br/>
-     * Since version 2.18.1 and JUnit 4.12, the <em>@Category<em> annotation type is automatically inherited from
-     * superclasses, see <em>@java.lang.annotation.Inherited</em>. Make sure that test class inheritance still makes
-     * sense together with <em>@Category<em> annotation of the JUnit 4.12 or higher appeared in superclass.
+     * specified in this list will specifically not be run.<br>
+     * For JUnit, this parameter forces the use of the 4.7 provider.<br>
+     * This parameter is ignored if the {@code suiteXmlFiles} parameter is specified.<br>
+     * Since version 2.18.1 and JUnit 4.12, the {@code @Category} annotation type is automatically inherited from
+     * superclasses, see {@code @java.lang.annotation.Inherited}. Make sure that test class inheritance still makes
+     * sense together with {@code @Category} annotation of the JUnit 4.12 or higher appeared in superclass.
      *
      * @since 2.2
      */
@@ -426,7 +432,7 @@ public abstract class AbstractSurefireMojo
     private String excludedGroups;
 
     /**
-     * Allows you to specify the name of the JUnit artifact. If not set, <code>junit:junit</code> will be used.
+     * Allows you to specify the name of the JUnit artifact. If not set, {@code junit:junit} will be used.
      *
      * @since 2.3.1
      */
@@ -434,7 +440,7 @@ public abstract class AbstractSurefireMojo
     private String junitArtifactName;
 
     /**
-     * Allows you to specify the name of the TestNG artifact. If not set, <code>org.testng:testng</code> will be used.
+     * Allows you to specify the name of the TestNG artifact. If not set, {@code org.testng:testng} will be used.
      *
      * @since 2.3.1
      */
@@ -443,7 +449,7 @@ public abstract class AbstractSurefireMojo
 
     /**
      * (TestNG/JUnit 4.7 provider) The attribute thread-count allows you to specify how many threads should be
-     * allocated for this execution. Only makes sense to use in conjunction with the <code>parallel</code> parameter.
+     * allocated for this execution. Only makes sense to use in conjunction with the {@code parallel} parameter.
      *
      * @since 2.2
      */
@@ -453,14 +459,14 @@ public abstract class AbstractSurefireMojo
     /**
      * Option to specify the number of VMs to fork in parallel in order to execute the tests. When terminated with "C",
      * the number part is multiplied with the number of CPU cores. Floating point value are only accepted together with
-     * "C". If set to "0", no VM is forked and all tests are executed within the main process.<br/>
-     * <br/>
-     * Example values: "1.5C", "4"<br/>
-     * <br/>
-     * The system properties and the <code>argLine</code> of the forked processes may contain the place holder string
+     * "C". If set to "0", no VM is forked and all tests are executed within the main process.<br>
+     * <br>
+     * Example values: "1.5C", "4"<br>
+     * <br>
+     * The system properties and the {@code argLine} of the forked processes may contain the place holder string
      * <code>${surefire.forkNumber}</code>, which is replaced with a fixed number for each of the parallel forks,
-     * ranging from <code>1</code> to the effective value of <code>forkCount</code> times the maximum number of parallel
-     * Surefire executions in maven parallel builds, i.e. the effective value of the <code>-T</code> command line
+     * ranging from <b>1</b> to the effective value of {@code forkCount} times the maximum number of parallel
+     * Surefire executions in maven parallel builds, i.e. the effective value of the <b>-T</b> command line
      * argument of maven core.
      *
      * @since 2.14
@@ -470,7 +476,7 @@ public abstract class AbstractSurefireMojo
 
     /**
      * Indicates if forked VMs can be reused. If set to "false", a new VM is forked for each test class to be executed.
-     * If set to "true", up to <code>forkCount</code> VMs will be forked and then reused to execute all tests.
+     * If set to "true", up to {@code forkCount} VMs will be forked and then reused to execute all tests.
      *
      * @since 2.13
      */
@@ -488,9 +494,9 @@ public abstract class AbstractSurefireMojo
     private boolean perCoreThreadCount;
 
     /**
-     * (JUnit 4.7 provider) Indicates that the thread pool will be unlimited. The <code>parallel</code> parameter and
+     * (JUnit 4.7 provider) Indicates that the thread pool will be unlimited. The {@code parallel} parameter and
      * the actual number of classes/methods will decide. Setting this to "true" effectively disables
-     * <code>perCoreThreadCount</code> and <code>threadCount</code>. Defaults to "false".
+     * {@code perCoreThreadCount} and {@code threadCount}. Defaults to "false".
      *
      * @since 2.5
      */
@@ -498,18 +504,21 @@ public abstract class AbstractSurefireMojo
     private boolean useUnlimitedThreads;
 
     /**
-     * (TestNG provider) When you use the <code>parallel</code> attribute, TestNG will try to run all your test methods
+     * (TestNG provider) When you use the parameter {@code parallel}, TestNG will try to run all your test methods
      * in separate threads, except for methods that depend on each other, which will be run in the same thread in order
      * to respect their order of execution.
-     * <p/>
-     * (JUnit 4.7 provider) Supports values "classes"/"methods"/"both" to run in separate threads, as controlled by
-     * <code>threadCount</code>.<br/>
-     * <br/>
-     * Since version 2.16 (JUnit 4.7 provider), the value "both" is <strong>DEPRECATED</strong>.
-     * Use <strong>"classesAndMethods"</strong> instead.<br/>
-     * <br/>
-     * Since version 2.16 (JUnit 4.7 provider), additional vales are available
-     * "suites"/"suitesAndClasses"/"suitesAndMethods"/"classesAndMethods"/"all".
+     * <br>
+     * (JUnit 4.7 provider) Supports values {@code classes}, {@code methods}, {@code both} to run
+     * in separate threads been controlled by {@code threadCount}.
+     * <br>
+     * <br>
+     * Since version 2.16 (JUnit 4.7 provider), the value {@code both} is <strong>DEPRECATED</strong>.
+     * Use {@code classesAndMethods} instead.
+     * <br>
+     * <br>
+     * Since version 2.16 (JUnit 4.7 provider), additional vales are available:
+     * <br>
+     * {@code suites}, {@code suitesAndClasses}, {@code suitesAndMethods}, {@code classesAndMethods}, {@code all}.
      *
      * @since 2.2
      */
@@ -519,7 +528,7 @@ public abstract class AbstractSurefireMojo
     /**
      * (JUnit 4.7 / provider only) The thread counts do not exceed the number of parallel suite, class runners and
      * average number of methods per class if set to <strong>true</strong>.
-     * <p/>
+     * <br>
      * True by default.
      *
      * @since 2.17
@@ -530,16 +539,16 @@ public abstract class AbstractSurefireMojo
     /**
      * (JUnit 4.7 provider) This attribute allows you to specify the concurrency in test suites, i.e.:
      * <ul>
-     *  <li>number of concurrent suites if <code>threadCount</code> is 0 or unspecified</li>
-     *  <li>limited suites concurrency if <code>useUnlimitedThreads</code> is set to <strong>true</strong></li>
-     *  <li>if <code>threadCount</code> and certain thread-count parameters are &gt; 0 for <code>parallel</code>, the
-     *  concurrency is computed from ratio. For instance parallel=all and the ratio between
-     *      <em>threadCountSuites</em>:<code>threadCountClasses</code>:<code>threadCountMethods</code> is
-     *      <em>2</em>:3:5, there is 20% of <code>threadCount</code> in concurrent suites.</li>
+     *  <li>number of concurrent suites if {@code threadCount} is 0 or unspecified</li>
+     *  <li>limited suites concurrency if {@code useUnlimitedThreads} is set to <strong>true</strong></li>
+     *  <li>if {@code threadCount} and certain thread-count parameters are &gt; 0 for {@code parallel}, the
+     *  concurrency is computed from ratio. For instance {@code parallel=all} and the ratio between
+     *      {@code threadCountSuites}:{@code threadCountClasses}:{@code threadCountMethods} is
+     *      <b>2</b>:3:5, there is 20% of {@code threadCount} which appeared in concurrent suites.</li>
      * </ul>
      *
-     * Only makes sense to use in conjunction with the <code>parallel</code> parameter.
-     * The default value <code>0</code> behaves same as unspecified one.
+     * Only makes sense to use in conjunction with the {@code parallel} parameter.
+     * The default value <b>0</b> behaves same as unspecified one.
      *
      * @since 2.16
      */
@@ -549,20 +558,20 @@ public abstract class AbstractSurefireMojo
     /**
      * (JUnit 4.7 provider) This attribute allows you to specify the concurrency in test classes, i.e.:
      * <ul>
-     *  <li>number of concurrent classes if <code>threadCount</code> is 0 or unspecified</li>
-     *  <li>limited classes concurrency if <code>useUnlimitedThreads</code> is set to <strong>true</strong></li>
-     *  <li>if <code>threadCount</code> and certain thread-count parameters are &gt; 0 for <code>parallel</code>, the
-     *  concurrency is computed from ratio. For instance parallel=all and the ratio between
-     *      <code>threadCountSuites</code>:<em>threadCountClasses</em>:<code>threadCountMethods</code> is
-     *      2:<em>3</em>:5, there is 30% of <code>threadCount</code> in concurrent classes.</li>
-     *  <li>as in the previous case but without this leaf thread-count. Example: parallel=suitesAndClasses,
-     *  threadCount=16, threadCountSuites=5, threadCountClasses is unspecified leaf, the number of concurrent classes
-     *  is varying from &gt;= 11 to 14 or 15. The threadCountSuites become number of threads.
-     *  </li>
+     *  <li>number of concurrent classes if {@code threadCount} is 0 or unspecified</li>
+     *  <li>limited classes concurrency if {@code useUnlimitedThreads} is set to <strong>true</strong></li>
+     *  <li>if {@code threadCount} and certain thread-count parameters are &gt; 0 for {@code parallel}, the
+     *  concurrency is computed from ratio. For instance {@code parallel=all} and the ratio between
+     *      {@code threadCountSuites}:{@code threadCountClasses}:{@code threadCountMethods} is
+     *      2:<b>3</b>:5, there is 30% of {@code threadCount} in concurrent classes.</li>
+     *  <li>as in the previous case but without this leaf thread-count. Example: {@code parallel=suitesAndClasses},
+     *  {@code threadCount=16}, {@code threadCountSuites=5}, {@code threadCountClasses} is unspecified leaf, the number
+     *  of concurrent classes is varying from &gt;= 11 to 14 or 15. The {@code threadCountSuites} become
+     *  given number of threads.</li>
      * </ul>
      *
-     * Only makes sense to use in conjunction with the <code>parallel</code> parameter.
-     * The default value <code>0</code> behaves same as unspecified one.
+     * Only makes sense to use in conjunction with the {@code parallel} parameter.
+     * The default value <b>0</b> behaves same as unspecified one.
      *
      * @since 2.16
      */
@@ -572,18 +581,18 @@ public abstract class AbstractSurefireMojo
     /**
      * (JUnit 4.7 provider) This attribute allows you to specify the concurrency in test methods, i.e.:
      * <ul>
-     * <li>number of concurrent methods if <code>threadCount</code> is 0 or unspecified</li>
-     * <li>limited concurrency of methods if <code>useUnlimitedThreads</code> is set to <strong>true</strong></li>
-     * <li>if <code>threadCount</code> and certain thread-count parameters are &gt; 0 for <code>parallel</code>, the
+     * <li>number of concurrent methods if {@code threadCount} is 0 or unspecified</li>
+     * <li>limited concurrency of methods if {@code useUnlimitedThreads} is set to <strong>true</strong></li>
+     * <li>if {@code threadCount} and certain thread-count parameters are &gt; 0 for {@code parallel}, the
      * concurrency is computed from ratio. For instance parallel=all and the ratio between
-     * <code>threadCountSuites</code>:<code>threadCountClasses</code>:<em>threadCountMethods</em> is 2:3:<em>5</em>,
-     * there is 50% of <code>threadCount</code> in concurrent methods.</li>
-     * <li>as in the previous case but without this leaf thread-count. Example: parallel=all, threadCount=16,
-     * threadCountSuites=2, threadCountClasses=3, but threadCountMethods is unspecified leaf, the number of concurrent
-     * methods is varying from &gt;= 11 to 14 or 15. The threadCountSuites and threadCountClasses become number of
-     * threads.</li>
+     * {@code threadCountSuites}:{@code threadCountClasses}:{@code threadCountMethods} is 2:3:<b>5</b>,
+     * there is 50% of {@code threadCount} which appears in concurrent methods.</li>
+     * <li>as in the previous case but without this leaf thread-count. Example: {@code parallel=all},
+     * {@code threadCount=16}, {@code threadCountSuites=2}, {@code threadCountClasses=3}, but {@code threadCountMethods}
+     * is unspecified leaf, the number of concurrent methods is varying from &gt;= 11 to 14 or 15.
+     * The {@code threadCountSuites} and {@code threadCountClasses} become given number of threads.</li>
      * </ul>
-     * Only makes sense to use in conjunction with the <code>parallel</code> parameter. The default value <code>0</code>
+     * Only makes sense to use in conjunction with the {@code parallel} parameter. The default value <b>0</b>
      * behaves same as unspecified one.
      *
      * @since 2.16
@@ -723,11 +732,13 @@ public abstract class AbstractSurefireMojo
     /**
      * Calls {@link #getSuiteXmlFiles()} as {@link List list}.
      * Never returns <tt>null</tt>.
+     *
+     * @return list of TestNG suite XML files provided by MOJO
      */
     protected abstract List<File> suiteXmlFiles();
 
     /**
-     * @return <tt>true</tt> if {@link #getSuiteXmlFiles() suite-xml files array} is not empty.
+     * @return {@code true} if {@link #getSuiteXmlFiles() suite-xml files array} is not empty.
      */
     protected abstract boolean hasSuiteXmlFiles();
 
@@ -2838,9 +2849,6 @@ public abstract class AbstractSurefireMojo
         this.localRepository = localRepository;
     }
 
-    /**
-     * @noinspection deprecation
-     */
     public Properties getSystemProperties()
     {
         return systemProperties;

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java
index f0d299e..b97c192 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/InPluginVMSurefireStarter.java
@@ -35,7 +35,7 @@ import static org.apache.maven.surefire.booter.ProviderFactory.invokeProvider;
 
 /**
  * Starts the provider in the same VM as the surefire plugin.
- * <p/>
+ * <br>
  * This part of the booter is always guaranteed to be in the
  * same vm as the tests will be run in.
  *

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
index 482ce00..d3cca28 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java
@@ -41,7 +41,7 @@ import static org.apache.maven.plugin.surefire.report.ConsoleReporter.PLAIN;
 
 /**
  * All the parameters used to construct reporters
- * <p/>
+ * <br>
  *
  * @author Kristian Rosenvold
  */
@@ -111,6 +111,8 @@ public final class StartupReportConfiguration
 
     /**
      * For testing purposes only.
+     *
+     * @return StartupReportConfiguration fo testing purposes
      */
     public static StartupReportConfiguration defaultValue()
     {
@@ -122,6 +124,8 @@ public final class StartupReportConfiguration
 
     /**
      * For testing purposes only.
+     *
+     * @return StartupReportConfiguration fo testing purposes
      */
     public static StartupReportConfiguration defaultNoXml()
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
index 96fb09e..240427f 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
@@ -27,7 +27,6 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
  * This interface contains all the common parameters that have different implementations in Surefire vs IntegrationTest
  *
  * @author Stephen Connolly
- * @noinspection UnusedDeclaration, UnusedDeclaration
  */
 public interface SurefireExecutionParameters
 {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireReportParameters.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireReportParameters.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireReportParameters.java
index 2999787..f345b46 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireReportParameters.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireReportParameters.java
@@ -25,7 +25,6 @@ import java.io.File;
  * The parameters required to report on a surefire execution.
  *
  * @author Stephen Connolly
- * @noinspection UnusedDeclaration
  */
 public interface SurefireReportParameters
 {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
index 114150d..0299525 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
@@ -44,12 +44,12 @@ import static org.apache.maven.surefire.booter.BooterConstants.*;
 
 /**
  * Knows how to serialize and deserialize the booter configuration.
- * <p/>
+ * <br>
  * The internal serialization format is through a properties file. The long-term goal of this
  * class is not to expose this implementation information to its clients. This still leaks somewhat,
  * and there are some cases where properties are being accessed as "Properties" instead of
  * more representative domain objects.
- * <p/>
+ * <br>
  *
  * @author Jason van Zyl
  * @author Emmanuel Venisse

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
index c56453a..8ff6768 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
@@ -129,6 +129,7 @@ public class ForkConfiguration
      * @param classPath            cla the classpath arguments
      * @param startupConfiguration The startup configuration
      * @param threadNumber         the thread number, to be the replacement in the argLine   @return A commandline
+     * @return CommandLine able to flush entire command going to be sent to forked JVM
      * @throws org.apache.maven.surefire.booter.SurefireBooterForkException
      *          when unable to perform the fork
      */
@@ -255,7 +256,7 @@ public class ForkConfiguration
      * Create a jar with just a manifest containing a Main-Class entry for BooterConfiguration and a Class-Path entry
      * for all classpath elements.
      *
-     * @param classPath      List&lt;String> of all classpath elements.
+     * @param classPath      List&lt;String&gt; of all classpath elements.
      * @param startClassName  The classname to start (main-class)
      * @return The file pointint to the jar
      * @throws java.io.IOException When a file operation fails.

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index c46cfb6..7619d0b 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -101,9 +101,9 @@ import static org.apache.maven.surefire.util.internal.StringUtils.ISO_8859_1;
 
 /**
  * Starts the fork or runs in-process.
- * <p/>
+ * <br>
  * Lives only on the plugin-side (not present in remote vms)
- * <p/>
+ * <br>
  * Knows how to fork new vms and also how to delegate non-forking invocation to SurefireStarter directly
  *
  * @author Jason van Zyl

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java
index 3b93eff..3460e3e 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java
@@ -28,7 +28,6 @@ import java.util.Set;
 /**
  * @author Stephen Conolly
  * @author Kristian Rosenvold
- * @noinspection UnusedDeclaration
  */
 public final class ProviderDetector
 {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
index 3531ccf..0bc2036 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractCommandStream.java
@@ -42,6 +42,7 @@ public abstract class AbstractCommandStream
 
     /**
      * Opposite to {@link #isClosed()}.
+     * @return {@code true} if not closed
      */
     protected boolean canContinue()
     {
@@ -51,6 +52,8 @@ public abstract class AbstractCommandStream
     /**
      * Possibly waiting for next command (see {@link #nextCommand()}) unless the stream is atomically
      * closed (see {@link #isClosed()} returns {@code true}) before this method has returned.
+     *
+     * @throws IOException stream error while waiting for notification regarding next test required by forked jvm
      */
     protected void beforeNextCommand()
         throws IOException
@@ -68,6 +71,7 @@ public abstract class AbstractCommandStream
         currentPos = 0;
     }
 
+    @Deprecated
     protected final MasterProcessCommand getLastCommand()
     {
         return lastCommand;

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
index 35cb2d4..bc26ab2 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStream.java
@@ -36,13 +36,13 @@ import static org.apache.maven.surefire.booter.Command.toShutdown;
 
 /**
  * An {@link java.io.InputStream} that, when read, provides test class names out of a queue.
- * <p/>
+ * <br>
  * The Stream provides only one test at a time, but only after {@link #provideNewTest()} has been invoked.
- * <p/>
+ * <br>
  * After providing each test class name, followed by a newline character, a flush is performed on the
  * {@link FlushReceiver} provided by the {@link FlushReceiverProvider} that can be set using
  * {@link #setFlushReceiverProvider(FlushReceiverProvider)}.
- * <p/>
+ * <br>
  * The instance is used only in reusable forks in {@link org.apache.maven.plugin.surefire.booterclient.ForkStarter}
  * by one Thread.
  *

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/DeserializedStacktraceWriter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/DeserializedStacktraceWriter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/DeserializedStacktraceWriter.java
index b5a53b4..d7a01b6 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/DeserializedStacktraceWriter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/DeserializedStacktraceWriter.java
@@ -25,7 +25,7 @@ import org.apache.maven.surefire.report.StackTraceWriter;
 /**
  * Represents a deserialize stacktracewriter that has been
  * marshalled across to the plugin from the fork.
- * <p/>
+ * <br>
  * Might be better to represent this whole thing differently
  *
  * @author Kristian Rosenvold

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
index b02ae54..b94fba6 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
@@ -90,7 +90,7 @@ public class ForkClient
     private final Queue<String> testsInProgress = new ConcurrentLinkedQueue<String>();
 
     /**
-     * <t>testSetStartedAt</t> is set to non-zero after received
+     * {@code testSetStartedAt} is set to non-zero after received
      * {@link org.apache.maven.surefire.booter.ForkingRunListener#BOOTERCODE_TESTSET_STARTING test-set}.
      */
     private final AtomicLong testSetStartedAt = new AtomicLong( START_TIME_ZERO );
@@ -131,6 +131,10 @@ public class ForkClient
 
     /**
      * Called in concurrent Thread.
+     * Will shutdown if timeout was reached.
+     *
+     * @param currentTimeMillis    current time in millis seconds
+     * @param forkedProcessTimeoutInSeconds timeout in seconds given by MOJO
      */
     public final void tryToTimeout( long currentTimeMillis, int forkedProcessTimeoutInSeconds )
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
index 972eaa7..093c191 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ThreadedStreamConsumer.java
@@ -63,12 +63,12 @@ public final class ThreadedStreamConsumer
         }
 
         /**
-         * Calls {@link ForkClient#consumeLine(String)} which may throw any {@link RuntimeException}.<p/>
+         * Calls {@link ForkClient#consumeLine(String)} which may throw any {@link RuntimeException}.<br>
          * Even if {@link ForkClient} is not fault-tolerant, this method MUST be fault-tolerant and thus the
          * try-catch block must be inside of the loop which prevents from loosing events from {@link StreamConsumer}.
-         * <p/>
+         * <br>
          * If {@link org.apache.maven.plugin.surefire.report.ConsoleOutputFileReporter#writeTestOutput} throws
-         * {@link java.io.IOException} and then <em>target.consumeLine()</em> throws any RuntimeException, this method
+         * {@link java.io.IOException} and then {@code target.consumeLine()} throws any RuntimeException, this method
          * MUST NOT skip reading the events from the forked JVM; otherwise we could simply lost events
          * e.g. acquire-next-test which means that {@link ForkClient} could hang on waiting for old test to complete
          * and therefore the plugin could be permanently in progress.
@@ -159,7 +159,7 @@ public final class ThreadedStreamConsumer
      * Compared item with {@link #END_ITEM} by identity.
      *
      * @param item    element from <code>items</code>
-     * @return <tt>true</tt> if tail of the queue
+     * @return {@code true} if tail of the queue
      */
     private boolean shouldStopQueueing( String item )
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
index 35ee965..84cbabe 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
@@ -31,7 +31,7 @@ import static org.apache.maven.plugin.surefire.report.FileReporter.getReportFile
 
 /**
  * Surefire output consumer proxy that writes test output to a {@link java.io.File} for each test suite.
- * <p/>
+ * <br>
  * This class is not threadsafe, but can be serially handed off from thread to thread.
  *
  * @author Kristian Rosenvold

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
index 3b8d765..bbc9591 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java
@@ -56,7 +56,7 @@ import static org.apache.maven.surefire.util.internal.ObjectUtils.useNonNull;
 
 /**
  * Provides reporting modules on the plugin side.
- * <p/>
+ * <br>
  * Keeps a centralized count of test run results.
  *
  * @author Kristian Rosenvold
@@ -209,6 +209,8 @@ public class DefaultReporterFactory
 
     /**
      * For testing purposes only.
+     *
+     * @return DefaultReporterFactory for testing purposes
      */
     public static DefaultReporterFactory defaultNoXml()
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DirectConsoleOutput.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DirectConsoleOutput.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DirectConsoleOutput.java
index ab33cb8..acc19ba 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DirectConsoleOutput.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DirectConsoleOutput.java
@@ -30,7 +30,7 @@ import static java.nio.charset.Charset.defaultCharset;
 
 /**
  * Outputs test system out/system err directly to the console
- * <p/>
+ * <br>
  * Just a step on the road to getting the separation of reporting concerns
  * operating properly.
  *

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index d10151a..aa858f2 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -47,13 +47,14 @@ import static org.apache.maven.plugin.surefire.report.FileReporterUtils.stripIll
 import static org.apache.maven.surefire.util.internal.StringUtils.UTF_8;
 import static org.apache.maven.surefire.util.internal.StringUtils.isBlank;
 
+@SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } )
 // CHECKSTYLE_OFF: LineLength
 /**
  * XML format reporter writing to <code>TEST-<i>reportName</i>[-<i>suffix</i>].xml</code> file like written and read
  * by Ant's <a href="http://ant.apache.org/manual/Tasks/junit.html"><code>&lt;junit&gt;</code></a> and
  * <a href="http://ant.apache.org/manual/Tasks/junitreport.html"><code>&lt;junitreport&gt;</code></a> tasks,
  * then supported by many tools like CI servers.
- * <p/>
+ * <br>
  * <pre>&lt;?xml version="1.0" encoding="UTF-8"?>
  * &lt;testsuite name="<i>suite name</i>" [group="<i>group</i>"] tests="<i>0</i>" failures="<i>0</i>" errors="<i>0</i>" skipped="<i>0</i>" time="<i>0,###.###</i>">
  *  &lt;properties>
@@ -453,7 +454,7 @@ public class StatelessXmlReporter
 
     /**
      * Adds system properties to the XML report.
-     * <p/>
+     * <br>
      *
      * @param xmlWriter The test suite to report to
      */

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
index 472586b..eea8a7e 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
@@ -37,7 +37,7 @@ import static org.apache.maven.plugin.surefire.report.ReportEntryType.SUCCESS;
 
 /**
  * Reports data for a single test set.
- * <p/>
+ * <br>
  *
  * @author Kristian Rosenvold
  */

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/IDefault.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/IDefault.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/IDefault.java
index db8127e..740798d 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/IDefault.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/spi/IDefault.java
@@ -26,8 +26,8 @@ package org.apache.maven.surefire.spi;
 public interface IDefault
 {
     /**
-     * @return <tt>true</tt> if SPI implementation vendor is maven-surefire-plugin or maven-failsafe-plugin.
-     * <tt>false</tt> if customized by users.
+     * @return {@code true} if SPI implementation vendor is maven-surefire-plugin or maven-failsafe-plugin.
+     * {@code false} if customized by users.
      */
     boolean isDefault();
 }

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
index 4a404df..c93d2c9 100644
--- a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
+++ b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
@@ -37,7 +37,6 @@ import static org.apache.maven.plugin.surefire.SurefireHelper.reportExecution;
  * Run tests using Surefire.
  *
  * @author Jason van Zyl
- * @noinspection JavaDoc
  */
 @Mojo( name = "test", defaultPhase = LifecyclePhase.TEST, threadSafe = true,
        requiresDependencyResolution = ResolutionScope.TEST )
@@ -66,25 +65,28 @@ public class SurefirePlugin
     @Parameter( defaultValue = "${project.build.directory}/surefire-reports" )
     private File reportsDirectory;
 
+    @SuppressWarnings( "checkstyle:linelength" )
     /**
-     * Specify this parameter to run individual tests by file name, overriding the <code>includes/excludes</code>
-     * parameters. Each pattern you specify here will be used to create an include pattern formatted like
-     * <code>**&#47;${test}.java</code>, so you can just type "-Dtest=MyTest" to run a single test called
-     * "foo/MyTest.java". The test patterns prefixed with a <code>!</code> will be excluded.<br/>
-     * This parameter overrides the <code>includes/excludes</code> parameters, and the TestNG <code>suiteXmlFiles</code>
-     * parameter.
-     * <p/>
-     * Since 2.7.3, you can execute a limited number of methods in the test by adding #myMethod or #my*ethod. For
-     * example, "-Dtest=MyTest#myMethod". This is supported for junit 4.x and testNg.<br/>
-     * <br/>
-     * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG):<br/>
-     * "-Dtest=???Test, !Unstable*, pkg&#47;**&#47;Ci*leTest.java, *Test#test*One+testTwo?????, #fast*+slowTest"<br/>
-     * "-Dtest=Basic*, !%regex[.*.Unstable.*], !%regex[.*.MyTest.class#one.*|two.*], %regex[#fast.*|slow.*]"<br/>
-     * <br/>
-     * The Parameterized JUnit runner <em>describes</em> test methods using an index in brackets, so the non-regex
-     * method pattern would become: <em>#testMethod[*]</em>. If using <em>@Parameters(name="{index}: fib({0})={1}")</em>
-     * and selecting the index e.g. 5 in pattern, the non-regex method pattern would become <em>#testMethod[5:*]</em>.
-     * <br/>
+     * Specify this parameter to run individual tests by file name, overriding the parameter {@code includes} and
+     * {@code excludes}. Each pattern you specify here will be used to create an include pattern formatted like
+     * <code>**{@literal /}${test}.java</code>, so you can just type {@code -Dtest=MyTest} to run a single test called
+     * "foo/MyTest.java". The test patterns prefixed with a <em>!</em> will be excluded.
+     * <br>
+     * This parameter overrides the parameter {@code includes}, {@code excludes}, and the TestNG parameter
+     * {@code suiteXmlFiles}.
+     * <br>
+     * Since 2.7.3, you can execute a limited number of methods in the test by adding <i>#myMethod</i> or
+     * <i>#my*ethod</i>. For example, {@code -Dtest=MyTest#myMethod}. This is supported for junit 4.x and TestNg.<br>
+     * <br>
+     * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG):
+     * <pre><code>"-Dtest=???Test, !Unstable*, pkg{@literal /}**{@literal /}Ci*leTest.java, *Test#test*One+testTwo?????, #fast*+slowTest"</code></pre>
+     * or e.g.
+     * <pre><code>"-Dtest=Basic*, !%regex[.*.Unstable.*], !%regex[.*.MyTest.class#one.*|two.*], %regex[#fast.*|slow.*]"</code></pre>
+     * <br>
+     * The Parameterized JUnit runner {@code describes} test methods using an index in brackets, so the non-regex
+     * method pattern would become: {@code #testMethod[*]}.
+     * If using <code>@Parameters(name="{index}: fib({0})={1}")</code> and selecting the index e.g. 5 in pattern, the
+     * non-regex method pattern would become {@code #testMethod[5:*]}.
      */
     @Parameter( property = "test" )
     private String test;
@@ -120,7 +122,7 @@ public class SurefirePlugin
     /**
      * Attach a debugger to the forked JVM. If set to "true", the process will suspend and wait for a debugger to attach
      * on port 5005. If set to some other string, that string will be appended to the argLine, allowing you to configure
-     * arbitrary debuggability options (without overwriting the other options specified through the <code>argLine</code>
+     * arbitrary debuggability options (without overwriting the other options specified through the {@code argLine}
      * parameter).
      *
      * @since 2.4
@@ -140,7 +142,7 @@ public class SurefirePlugin
     /**
      * Forked process is normally terminated without any significant delay after given tests have completed.
      * If the particular tests started non-daemon Thread(s), the process hangs instead of been properly terminated
-     * by <em>System.exit()</em>. Use this parameter in order to determine the timeout of terminating the process.
+     * by {@code System.exit()}. Use this parameter in order to determine the timeout of terminating the process.
      * <a href="http://maven.apache.org/surefire/maven-surefire-plugin/examples/shutdown.html">see the documentation:
      * http://maven.apache.org/surefire/maven-surefire-plugin/examples/shutdown.html</a>
      * Turns to default fallback value of 30 seconds if negative integer.
@@ -152,11 +154,11 @@ public class SurefirePlugin
 
     /**
      * Stop executing queued parallel JUnit tests after a certain number of seconds.
-     * <br/>
-     * Example values: "3.5", "4"<br/>
-     * <br/>
+     * <br>
+     * Example values: "3.5", "4"<br>
+     * <br>
      * If set to 0, wait forever, never timing out.
-     * Makes sense with specified <code>parallel</code> different from "none".
+     * Makes sense with specified {@code parallel} different from "none".
      *
      * @since 2.16
      */
@@ -165,41 +167,45 @@ public class SurefirePlugin
 
     /**
      * Stop executing queued parallel JUnit tests
-     * and <em>interrupt</em> currently running tests after a certain number of seconds.
-     * <br/>
-     * Example values: "3.5", "4"<br/>
-     * <br/>
+     * and {@code interrupt} currently running tests after a certain number of seconds.
+     * <br>
+     * Example values: "3.5", "4"<br>
+     * <br>
      * If set to 0, wait forever, never timing out.
-     * Makes sense with specified <code>parallel</code> different from "none".
+     * Makes sense with specified {@code parallel} different from "none".
      *
      * @since 2.16
      */
     @Parameter( property = "surefire.parallel.forcedTimeout" )
     private double parallelTestsTimeoutForcedInSeconds;
 
+    @SuppressWarnings( "checkstyle:linelength" )
     /**
-     * A list of &lt;include> elements specifying the tests (by pattern) that should be included in testing. When not
-     * specified and when the <code>test</code> parameter is not specified, the default includes will be <code><br/>
-     * &lt;includes><br/>
-     * &nbsp;&lt;include>**&#47;Test*.java&lt;/include><br/>
-     * &nbsp;&lt;include>**&#47;*Test.java&lt;/include><br/>
-     * &nbsp;&lt;include>**&#47;*Tests.java&lt;/include><br/>
-     * &nbsp;&lt;include>**&#47;*TestCase.java&lt;/include><br/>
-     * &lt;/includes><br/>
-     * </code>
-     * <p/>
-     * Each include item may also contain a comma-separated sublist of items, which will be treated as multiple
-     * &nbsp;&lt;include> entries.<br/>
-     * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG):<br/>
-     * &nbsp;&lt;include>%regex[.*[Cat|Dog].*], Basic????, !Unstable*&lt;/include><br/>
-     * &nbsp;&lt;include>%regex[.*[Cat|Dog].*], !%regex[pkg.*Slow.*.class], pkg&#47;**&#47;*Fast*.java&lt;/include><br/>
-     * <p/>
-     * This parameter is ignored if the TestNG <code>suiteXmlFiles</code> parameter is specified.<br/>
-     * <br/>
-     * <em>Notice that</em> these values are relative to the directory containing generated test classes of the project
-     * being tested. This directory is declared by the parameter <code>testClassesDirectory</code> which defaults
-     * to the POM property <code>${project.build.testOutputDirectory}</code>, typically <em>src/test/java</em>
-     * unless overridden.
+     * A list of &lt;include&gt; elements specifying the tests (by pattern) that should be included in testing. When not
+     * specified and when the {@code test} parameter is not specified, the default includes will be
+     * <pre><code>
+     * {@literal <includes>}
+     *     {@literal <include>}**{@literal /}Test*.java{@literal </include>}
+     *     {@literal <include>}**{@literal /}*Test.java{@literal </include>}
+     *     {@literal <include>}**{@literal /}*Tests.java{@literal </include>}
+     *     {@literal <include>}**{@literal /}*TestCase.java{@literal </include>}
+     * {@literal </includes>}
+     * </code></pre>
+     * Each include item may also contain a comma-separated sub-list of items, which will be treated as multiple
+     * &nbsp;&lt;include&gt; entries.<br>
+     * Since 2.19 a complex syntax is supported in one parameter (JUnit 4, JUnit 4.7+, TestNG):
+     * <pre><code>
+     *
+     * </code></pre>
+     * {@literal <include>}%regex[.*[Cat|Dog].*], Basic????, !Unstable*{@literal </include>}
+     * {@literal <include>}%regex[.*[Cat|Dog].*], !%regex[pkg.*Slow.*.class], pkg{@literal /}**{@literal /}*Fast*.java{@literal </include>}
+     * <br>
+     * This parameter is ignored if the TestNG {@code suiteXmlFiles} parameter is specified.<br>
+     * <br>
+     * <b>Notice that</b> these values are relative to the directory containing generated test classes of the project
+     * being tested. This directory is declared by the parameter {@code testClassesDirectory} which defaults
+     * to the POM property {@code ${project.build.testOutputDirectory}}, typically
+     * <code>{@literal src/test/java}</code> unless overridden.
      */
     @Parameter
     private List<String> includes;
@@ -207,7 +213,7 @@ public class SurefirePlugin
     /**
      * Option to pass dependencies to the system's classloader instead of using an isolated class loader when forking.
      * Prevents problems with JDKs which implement the service provider lookup mechanism by using the system's
-     * classloader.
+     * ClassLoader.
      *
      * @since 2.3
      */
@@ -220,7 +226,7 @@ public class SurefirePlugin
      * <a href="http://maven.apache.org/plugins/maven-surefire-plugin/examples/class-loading.html">
      *     http://maven.apache.org/plugins/maven-surefire-plugin/examples/class-loading.html</a>
      * for a more detailed explanation of manifest-only JARs and their benefits.)
-     * <br/>
+     * <br>
      * Beware, setting this to "false" may cause your tests to fail on Windows if your classpath is too long.
      *
      * @since 2.4.3
@@ -238,10 +244,10 @@ public class SurefirePlugin
     private int rerunFailingTestsCount;
 
     /**
-     * (TestNG) List of &lt;suiteXmlFile> elements specifying TestNG suite xml file locations. Note that
-     * <code>suiteXmlFiles</code> is incompatible with several other parameters of this plugin, like
-     * <code>includes/excludes</code>.<br/>
-     * This parameter is ignored if the <code>test</code> parameter is specified (allowing you to run a single test
+     * (TestNG) List of &lt;suiteXmlFile&gt; elements specifying TestNG suite xml file locations. Note that
+     * {@code suiteXmlFiles} is incompatible with several other parameters of this plugin, like
+     * {@code includes} and {@code excludes}.<br>
+     * This parameter is ignored if the {@code test} parameter is specified (allowing you to run a single test
      * instead of an entire suite).
      *
      * @since 2.2
@@ -250,26 +256,26 @@ public class SurefirePlugin
     private File[] suiteXmlFiles;
 
     /**
-     * Defines the order the tests will be run in. Supported values are "alphabetical", "reversealphabetical", "random",
-     * "hourly" (alphabetical on even hours, reverse alphabetical on odd hours), "failedfirst", "balanced" and
-     * "filesystem".
-     * <br/>
-     * <br/>
+     * Defines the order the tests will be run in. Supported values are {@code alphabetical},
+     * {@code reversealphabetical}, {@code random}, {@code hourly} (alphabetical on even hours, reverse alphabetical
+     * on odd hours), {@code failedfirst}, {@code balanced} and {@code filesystem}.
+     * <br>
+     * <br>
      * Odd/Even for hourly is determined at the time the of scanning the classpath, meaning it could change during a
      * multi-module build.
-     * <br/>
-     * <br/>
+     * <br>
+     * <br>
      * Failed first will run tests that failed on previous run first, as well as new tests for this run.
-     * <br/>
-     * <br/>
+     * <br>
+     * <br>
      * Balanced is only relevant with parallel=classes, and will try to optimize the run-order of the tests reducing the
      * overall execution time. Initially a statistics file is created and every next test run will reorder classes.
-     * <br/>
-     * <br/>
-     * Note that the statistics are stored in a file named .surefire-XXXXXXXXX beside pom.xml, and should not be checked
-     * into version control. The "XXXXX" is the SHA1 checksum of the entire surefire configuration, so different
-     * configurations will have different statistics files, meaning if you change any config settings you will re-run
-     * once before new statistics data can be established.
+     * <br>
+     * <br>
+     * Note that the statistics are stored in a file named <b>.surefire-XXXXXXXXX</b> beside <i>pom.xml</i> and
+     * should not be checked into version control. The "XXXXX" is the SHA1 checksum of the entire surefire
+     * configuration, so different configurations will have different statistics files, meaning if you change any
+     * configuration settings you will re-run once before new statistics data can be established.
      *
      * @since 2.7
      */
@@ -278,30 +284,34 @@ public class SurefirePlugin
 
     /**
      * A file containing include patterns. Blank lines, or lines starting with # are ignored. If {@code includes} are
-     * also specified, these patterns are appended. Example with path, simple and regex includes:<br/>
-     * &#042;&#047;test/*<br/>
-     * &#042;&#042;&#047;NotIncludedByDefault.java<br/>
-     * %regex[.*Test.*|.*Not.*]<br/>
+     * also specified, these patterns are appended. Example with path, simple and regex includes:
+     * <pre><code>
+     * *{@literal /}test{@literal /}*
+     * **{@literal /}NotIncludedByDefault.java
+     * %regex[.*Test.*|.*Not.*]
+     * </code></pre>
      */
     @Parameter( property = "surefire.includesFile" )
     private File includesFile;
 
     /**
      * A file containing exclude patterns. Blank lines, or lines starting with # are ignored. If {@code excludes} are
-     * also specified, these patterns are appended. Example with path, simple and regex excludes:<br/>
-     * &#042;&#047;test/*<br/>
-     * &#042;&#042;&#047;DontRunTest.*<br/>
-     * %regex[.*Test.*|.*Not.*]<br/>
+     * also specified, these patterns are appended. Example with path, simple and regex excludes:<br>
+     * <pre><code>
+     * *{@literal /}test{@literal /}*
+     * **{@literal /}DontRunTest.*
+     * %regex[.*Test.*|.*Not.*]
+     * </code></pre>
      */
     @Parameter( property = "surefire.excludesFile" )
     private File excludesFile;
 
     /**
      * Set to error/failure count in order to skip remaining tests.
-     * Due to race conditions in parallel/forked execution this may not be fully guaranteed.<br/>
-     * Enable with system property -Dsurefire.skipAfterFailureCount=1 or any number greater than zero.
-     * Defaults to "0".<br/>
-     * See the prerequisites and limitations in documentation:<br/>
+     * Due to race conditions in parallel/forked execution this may not be fully guaranteed.<br>
+     * Enable with system property {@code -Dsurefire.skipAfterFailureCount=1} or any number greater than zero.
+     * Defaults to "0".<br>
+     * See the prerequisites and limitations in documentation:<br>
      * <a href="http://maven.apache.org/plugins/maven-surefire-plugin/examples/skip-after-failure.html">
      *     http://maven.apache.org/plugins/maven-surefire-plugin/examples/skip-after-failure.html</a>
      *
@@ -311,12 +321,18 @@ public class SurefirePlugin
     private int skipAfterFailureCount;
 
     /**
-     * After the plugin process is shutdown by sending SIGTERM signal (CTRL+C), SHUTDOWN command is received by every
-     * forked JVM. By default (shutdown=testset) forked JVM would not continue with new test which means that
-     * the current test may still continue to run.<br/>
-     * The parameter can be configured with other two values "exit" and "kill".<br/>
-     * Using "exit" forked JVM executes System.exit(1) after the plugin process has received SIGTERM signal.<br/>
-     * Using "kill" the JVM executes Runtime.halt(1) and kills itself.
+     * After the plugin process is shutdown by sending <i>SIGTERM signal (CTRL+C)</i>, <i>SHUTDOWN command</i> is
+     * received by every forked JVM.
+     * <br>
+     * By default ({@code shutdown=testset}) forked JVM would not continue with new test which means that
+     * the current test may still continue to run.
+     * <br>
+     * The parameter can be configured with other two values {@code exit} and {@code kill}.
+     * <br>
+     * Using {@code exit} forked JVM executes {@code System.exit(1)} after the plugin process has received
+     * <i>SIGTERM signal</i>.
+     * <br>
+     * Using {@code kill} the JVM executes {@code Runtime.halt(1)} and kills itself.
      *
      * @since 2.19
      */
@@ -374,18 +390,12 @@ public class SurefirePlugin
         this.skipTests = skipTests;
     }
 
-    /**
-     * @noinspection deprecation
-     */
     @Override
     public boolean isSkipExec()
     {
         return skipExec;
     }
 
-    /**
-     * @noinspection deprecation
-     */
     @Override
     public void setSkipExec( boolean skipExec )
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-plugin/src/site/resources/xsd/bindings.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/resources/xsd/bindings.xml b/maven-surefire-plugin/src/site/resources/xsd/bindings.xml
deleted file mode 100644
index 4e2d949..0000000
--- a/maven-surefire-plugin/src/site/resources/xsd/bindings.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
~ 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.
-->
<jxb:bindings xmlns:xsd="http://www.w3.org/2001/XMLSchema"
        xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
        version="2.0">
    <jxb:bi
 ndings schemaLocation="failsafe-summary.xsd">
        <jxb:bindings node="//xsd:simpleType[@name='errorType']/xsd:restriction/xsd:enumeration[@id='FAILURE']">
            <jxb:typesafeEnumMember name="FAILURE"/>
            <jxb:javaType name="java.lang.Integer"/>
        </jxb:bindings>
        <jxb:bindings node="//xsd:simpleType[@name='errorType']/xsd:restriction/xsd:enumeration[@id='NO_TESTS']">
            <jxb:typesafeEnumMember name="NO_TESTS"/>
            <jxb:javaType name="java.lang.Integer"/>
        </jxb:bindings>
    </jxb:bindings>
</jxb:bindings>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-plugin/src/site/resources/xsd/failsafe-summary.xjb
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/resources/xsd/failsafe-summary.xjb b/maven-surefire-plugin/src/site/resources/xsd/failsafe-summary.xjb
new file mode 100644
index 0000000..1e076d3
--- /dev/null
+++ b/maven-surefire-plugin/src/site/resources/xsd/failsafe-summary.xjb
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+~ 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.
+-->
+<jxb:bindings xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+        version="2.0">
+    <jxb:bindings schemaLocation="failsafe-summary.xsd">
+        <jxb:bindings node="//xsd:simpleType[@name='errorType']/xsd:restriction/xsd:enumeration[@id='FAILURE']">
+            <jxb:typesafeEnumMember name="FAILURE"/>
+        </jxb:bindings>
+        <jxb:bindings node="//xsd:simpleType[@name='errorType']/xsd:restriction/xsd:enumeration[@id='NO_TESTS']">
+            <jxb:typesafeEnumMember name="NO_TESTS"/>
+        </jxb:bindings>
+    </jxb:bindings>
+</jxb:bindings>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-report-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index 9f35967..a4fe7e2 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -136,7 +136,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.12</version>
         <executions>
           <execution>
             <id>add-source</id>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
index b7aa290..c306305 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
@@ -51,7 +51,7 @@ public class FailsafeReportMojo
 
     /**
      * If set to true the failsafe report will be generated even when there are no failsafe result files.
-     * Defaults to <code>false</code> to preserve legacy behaviour pre 2.10
+     * Defaults to {@code false} to preserve legacy behaviour pre 2.10
      *
      * @noinspection UnusedDeclaration
      * @since 2.11

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
index a950bcf..e535a24 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
@@ -48,7 +48,7 @@ public class SurefireReportMojo
 
     /**
      * If set to true the surefire report will be generated even when there are no surefire result files.
-     * Defaults to <code>true</code> to preserve legacy behaviour pre 2.10.
+     * Defaults to {@code true} to preserve legacy behaviour pre 2.10.
      *
      * @noinspection UnusedDeclaration
      * @since 2.11

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/maven-surefire-report-plugin/src/main/resources/surefire-report_sv.properties
----------------------------------------------------------------------
diff --git a/maven-surefire-report-plugin/src/main/resources/surefire-report_sv.properties b/maven-surefire-report-plugin/src/main/resources/surefire-report_sv.properties
index bdf8361..3664c6b 100644
--- a/maven-surefire-report-plugin/src/main/resources/surefire-report_sv.properties
+++ b/maven-surefire-report-plugin/src/main/resources/surefire-report_sv.properties
@@ -35,3 +35,5 @@ report.surefire.label.failuredetails=Detaljer om misslyckade tester
 report.surefire.text.note1=Notera: misslyckade tester \u00e4r f\u00f6rv\u00e4ntade och har kontrollerats med assertions medan felaktiga tester \u00e4r ov\u00e4ntade.
 report.surefire.text.note2=Notera: paketstatistiken ber\u00e4knas inte rekursivt, den summerar bara alla testsviters antal.
 
+report.failsafe.name=Failsafe-rapport
+report.failsafe.description=Rapport om integration testresultaten f\u00f6r projektet.

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 60d6376..962a5bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -284,8 +284,59 @@
     <pluginManagement>
       <plugins>
         <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.12</version>
+        </plugin>
+        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.6.1</version>
+          <executions>
+            <execution>
+              <id>compile-generated</id>
+              <phase>process-sources</phase>
+              <goals>
+                <goal>compile</goal>
+              </goals>
+              <configuration>
+                <includes>
+                  <include>org/apache/maven/shared/utils/logging/*.java</include>
+                  <include>HelpMojo.java</include>
+                  <include>**/HelpMojo.java</include>
+                  <include>org/apache/maven/plugin/failsafe/xmlsummary/*.java</include>
+                </includes>
+                <compilerArgs>
+                  <!-- FIXME: maven-plugin-plugin therefore used -syntax or none due to HelpMojo -->
+                  <arg>-Xdoclint:none</arg>
+                </compilerArgs>
+              </configuration>
+            </execution>
+            <execution>
+              <id>default-compile</id>
+              <phase>compile</phase>
+              <goals>
+                <goal>compile</goal>
+              </goals>
+              <configuration>
+                <excludes>
+                  <exclude>org/apache/maven/shared/utils/logging/*.java</exclude>
+                  <exclude>HelpMojo.java</exclude>
+                  <exclude>**/HelpMojo.java</exclude>
+                  <exclude>org/apache/maven/plugin/failsafe/xmlsummary/*.java</exclude>
+                </excludes>
+                <compilerArgs>
+                  <arg>-Xdoclint:all</arg>
+                </compilerArgs>
+              </configuration>
+            </execution>
+          </executions>
+          <configuration>
+            <fork>true</fork>
+            <compilerArgs>
+              <arg>-Xdoclint:all</arg>
+            </compilerArgs>
+          </configuration>
         </plugin>
         <!-- NOTE: animal sniffer does not check test classes: https://jira.codehaus.org/browse/MANIMALSNIFFER-40 -->
         <plugin>
@@ -367,7 +418,7 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>[1.6.0, 1.9.0)</version>
+                  <version>[1.8.0,)</version>
                 </requireJavaVersion>
               </rules>
             </configuration>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
index a24424b..ed7d4fa 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
@@ -135,7 +135,7 @@ public final class CommandReader
     }
 
     /**
-     * @param listener listener called with <em>Any</em> {@link MasterProcessCommand command type}
+     * @param listener listener called with <b>Any</b> {@link MasterProcessCommand command type}
      */
     public void addListener( CommandListener listener )
     {
@@ -225,7 +225,7 @@ public final class CommandReader
     }
 
     /**
-     * @return <tt>true</tt> if {@link #LAST_TEST_SYMBOL} found at the last index in {@link #testClasses}.
+     * @return {@code true} if {@link #LAST_TEST_SYMBOL} found at the last index in {@link #testClasses}.
      */
     private boolean isQueueFull()
     {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/booter/DumpErrorSingleton.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/DumpErrorSingleton.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/DumpErrorSingleton.java
index fc92c70..e287f05 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/DumpErrorSingleton.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/DumpErrorSingleton.java
@@ -27,7 +27,7 @@ import java.io.File;
 import static org.apache.maven.surefire.util.internal.DumpFileUtils.newDumpFile;
 
 /**
- * Dumps lost commands and caused exceptions in forked JVM. <p/>
+ * Dumps lost commands and caused exceptions in forked JVM. <br>
  * Fail-safe.
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/booter/FailFastAware.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/FailFastAware.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/FailFastAware.java
index 06e47ba..994b60d 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/FailFastAware.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/FailFastAware.java
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.booter;
  */
 
 /**
- * See the plugin configuration parameter <em>skipAfterFailureCount</em>.
+ * See the plugin configuration parameter {@code skipAfterFailureCount}.
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
  * @since 2.19

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingReporterFactory.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingReporterFactory.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingReporterFactory.java
index 89469fa..7459ad9 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingReporterFactory.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingReporterFactory.java
@@ -31,9 +31,7 @@ import org.apache.maven.surefire.suite.RunResult;
  * This factory is only used inside forks.
  *
  * @author Kristian Rosenvold
- * @noinspection UnusedDeclaration
  */
-
 public class ForkingReporterFactory
     implements ReporterFactory
 {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
index f0f0ac6..d2c112b 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
@@ -40,14 +40,14 @@ import static org.apache.maven.surefire.util.internal.StringUtils.escapeToPrinta
 
 /**
  * Encodes the full output of the test run to the stdout stream.
- * <p/>
+ * <br>
  * This class and the ForkClient contain the full definition of the
  * "wire-level" protocol used by the forked process. The protocol
  * is *not* part of any public api and may change without further
  * notice.
- * <p/>
+ * <br>
  * This class is threadsafe.
- * <p/>
+ * <br>
  * The synchronization in the underlying PrintStream (target instance)
  * is used to preserve thread safety of the output stream. To perform
  * multiple writes/prints for a single request, they must

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/booter/ShutdownAware.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ShutdownAware.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ShutdownAware.java
index a843b27..0bfcdb8 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ShutdownAware.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ShutdownAware.java
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.booter;
  */
 
 /**
- * See the plugin configuration parameter <em>shutdown</em>.
+ * See the plugin configuration parameter {@code shutdown}.
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
  * @since 2.19

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
index 54677a7..4c88179 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/SurefireReflector.java
@@ -58,7 +58,7 @@ import static org.apache.maven.surefire.util.ReflectionUtils.newInstance;
 
 /**
  * Does reflection based invocation of the surefire methods.
- * <p/>
+ * <br>
  * This is to avoid complications with linkage issues
  *
  * @author Kristian Rosenvold

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/cli/CommandLineOption.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/cli/CommandLineOption.java b/surefire-api/src/main/java/org/apache/maven/surefire/cli/CommandLineOption.java
index 2f82814..a806370 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/cli/CommandLineOption.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/cli/CommandLineOption.java
@@ -28,7 +28,7 @@ import java.util.List;
  *
  * @author <a href="mailto:tibordigana@apache.org">Tibor Digana (tibor17)</a>
  * @since 2.19
- * @see http://books.sonatype.com/mvnref-book/reference/running-sect-options.html
+ * @see <a href="http://books.sonatype.com/mvnref-book/reference/running-sect-options.html">command line options</a>
  */
 public enum CommandLineOption
 {

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java
index 9ef7a94..b487f06 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java
@@ -36,10 +36,10 @@ import java.util.Map;
 
 /**
  * Injected into the providers upon provider construction. Allows the provider to request services and data it needs.
- * <p/>
+ * <br>
  * NOTE: This class is part of the proposed public api for surefire providers from 2.7 and up. It may
  * still be subject to changes, even for minor revisions.
- * <p/>
+ * <br>
  * The api covers this interface and all the types reachable from it. And nothing else.
  *
  * @author Kristian Rosenvold
@@ -80,7 +80,7 @@ public interface ProviderParameters
 
     /**
      * Gets a logger intended for console output.
-     * <p/>
+     * <br>
      * This output is intended for provider-oriented messages that are not attached to a single test-set
      * and will normally be written to something console-like immediately.
      *
@@ -136,7 +136,7 @@ public interface ProviderParameters
     List<CommandLineOption> getMainCliOptions();
 
     /**
-     * Defaults to 0. Configured with parameter <em>skipAfterFailureCount</em> in POM.
+     * @return Defaults to 0. Configured with parameter {@code skipAfterFailureCount} in POM.
      */
     int getSkipAfterFailureCount();

[3/6] maven-surefire git commit: [SUREFIRE-1366] mvn javadoc:javadoc fails on Javadoc syntax with JDK 1.8

Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml b/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
index 3cc74a1..6360bed 100644
--- a/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
+++ b/surefire-integration-tests/src/test/resources/ant-ignore/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml b/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml
index 2eed551..0cce4c9 100644
--- a/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml
+++ b/surefire-integration-tests/src/test/resources/argLine-parameter/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml b/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml
index e679767..2a6d6c2 100644
--- a/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml
+++ b/surefire-integration-tests/src/test/resources/argLine-properties/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml b/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml
index 069dacf..8530eca 100644
--- a/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml
+++ b/surefire-integration-tests/src/test/resources/assumpationFailureReport/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml b/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml
index 6b16431..49c4e34 100644
--- a/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml
+++ b/surefire-integration-tests/src/test/resources/classpath-filtering/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/classpath-order/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/classpath-order/pom.xml b/surefire-integration-tests/src/test/resources/classpath-order/pom.xml
index a72c2f5..b49fda7 100644
--- a/surefire-integration-tests/src/test/resources/classpath-order/pom.xml
+++ b/surefire-integration-tests/src/test/resources/classpath-order/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/classpath-scope-filtering/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/classpath-scope-filtering/pom.xml b/surefire-integration-tests/src/test/resources/classpath-scope-filtering/pom.xml
index 84789c5..7dcdfa2 100644
--- a/surefire-integration-tests/src/test/resources/classpath-scope-filtering/pom.xml
+++ b/surefire-integration-tests/src/test/resources/classpath-scope-filtering/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/consoleOutput/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/consoleOutput/pom.xml b/surefire-integration-tests/src/test/resources/consoleOutput/pom.xml
index 2602eef..407f909 100644
--- a/surefire-integration-tests/src/test/resources/consoleOutput/pom.xml
+++ b/surefire-integration-tests/src/test/resources/consoleOutput/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/consoleOutputEncoding/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/consoleOutputEncoding/pom.xml b/surefire-integration-tests/src/test/resources/consoleOutputEncoding/pom.xml
index 059a99c..5dec5d8 100644
--- a/surefire-integration-tests/src/test/resources/consoleOutputEncoding/pom.xml
+++ b/surefire-integration-tests/src/test/resources/consoleOutputEncoding/pom.xml
@@ -19,7 +19,7 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml b/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml
index 192134a..e80b978 100644
--- a/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml
+++ b/surefire-integration-tests/src/test/resources/consoleoutput-noisy/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/crash-detection/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/crash-detection/pom.xml b/surefire-integration-tests/src/test/resources/crash-detection/pom.xml
index 92a1e5f..81e9c6a 100644
--- a/surefire-integration-tests/src/test/resources/crash-detection/pom.xml
+++ b/surefire-integration-tests/src/test/resources/crash-detection/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>it-parent</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/crash-during-test/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/crash-during-test/pom.xml b/surefire-integration-tests/src/test/resources/crash-during-test/pom.xml
index 38134bd..0d9e3e7 100644
--- a/surefire-integration-tests/src/test/resources/crash-during-test/pom.xml
+++ b/surefire-integration-tests/src/test/resources/crash-during-test/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>it-parent</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/default-configuration-abstract/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration-abstract/pom.xml b/surefire-integration-tests/src/test/resources/default-configuration-abstract/pom.xml
index 2d24d31..1bd1f91 100644
--- a/surefire-integration-tests/src/test/resources/default-configuration-abstract/pom.xml
+++ b/surefire-integration-tests/src/test/resources/default-configuration-abstract/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/pom.xml b/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/pom.xml
index 9d2f682..dafe6e5 100644
--- a/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/default-configuration-classWithNoTests/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/default-configuration-noTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration-noTests/pom.xml b/surefire-integration-tests/src/test/resources/default-configuration-noTests/pom.xml
index 453130f..fc77535 100644
--- a/surefire-integration-tests/src/test/resources/default-configuration-noTests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/default-configuration-noTests/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/default-configuration/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/default-configuration/pom.xml b/surefire-integration-tests/src/test/resources/default-configuration/pom.xml
index b5b1686..1d9587a 100644
--- a/surefire-integration-tests/src/test/resources/default-configuration/pom.xml
+++ b/surefire-integration-tests/src/test/resources/default-configuration/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
 

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/environment-variables/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/environment-variables/pom.xml b/surefire-integration-tests/src/test/resources/environment-variables/pom.xml
index c18b3b9..79f4eda 100644
--- a/surefire-integration-tests/src/test/resources/environment-variables/pom.xml
+++ b/surefire-integration-tests/src/test/resources/environment-variables/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml b/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml
index 14fcdfd..6d6aca2 100644
--- a/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fail-fast-junit/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml b/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml
index 4ad397f..47e5e24 100644
--- a/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fail-fast-testng/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml b/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml
index 200c4c4..46da1bf 100644
--- a/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml
+++ b/surefire-integration-tests/src/test/resources/failingBuilds/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.surefire</groupId>
   <artifactId>failingBuilds-test</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml b/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml
index 5940e67..59f60cd 100644
--- a/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml
+++ b/surefire-integration-tests/src/test/resources/failure-result-counting/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>maven-surefire</groupId>
   <artifactId>small-result-counting</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/failureOutput/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/failureOutput/pom.xml b/surefire-integration-tests/src/test/resources/failureOutput/pom.xml
index 5be8fc4..71ff2c4 100644
--- a/surefire-integration-tests/src/test/resources/failureOutput/pom.xml
+++ b/surefire-integration-tests/src/test/resources/failureOutput/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins.surefire</groupId>
   <artifactId>failureOutput</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml b/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml
index 931dc53..29610f9 100644
--- a/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-consoleOutput/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins.surefire</groupId>
   <artifactId>fork-consoleOutput</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml b/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml
index 6e86279..fd92dde 100644
--- a/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-consoleOutputWithErrors/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins.surefire</groupId>
   <artifactId>fork-consoleOutput</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/fork-fail/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-fail/pom.xml b/surefire-integration-tests/src/test/resources/fork-fail/pom.xml
index c71fc02..e0de5b0 100644
--- a/surefire-integration-tests/src/test/resources/fork-fail/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-fail/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/pom.xml
index cbaf407..9de3941 100644
--- a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-a/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/pom.xml
index ba076ce..61fd8a0 100644
--- a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/module-b/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml
index 98e073f..7535569 100644
--- a/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-mode-multimodule/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml
index 49fb2f8..1c00ea6 100644
--- a/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-mode-resource-loading/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml
index ec5d3c6..a622fa5 100644
--- a/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml
@@ -4,7 +4,7 @@
   in writing, ~ software distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the License for the ~ specific language governing permissions and limitations ~ under 
   the License. -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-mode/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
index ca7d365..cf77bb0 100644
--- a/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-mode/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml b/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml
index 55889c6..c0d03c5 100644
--- a/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml
+++ b/surefire-integration-tests/src/test/resources/fork-timeout/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins.surefire</groupId>
   <artifactId>fork-timeout-test</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml b/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml
index 6187cdd..dbed07b 100644
--- a/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml
+++ b/surefire-integration-tests/src/test/resources/isolated-classloader/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml b/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml
index 20f829c..ed2d930 100644
--- a/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit-fork-mode-always/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml b/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
index a40b986..a73c362 100644
--- a/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit-ignore/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml b/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml
index 7e61c3e..40b5060 100644
--- a/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit-innerClass/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml b/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml
index 69fb247..e459f45 100644
--- a/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit-notExtendingTestCase/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml b/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml
index e40c80a..321aba7 100644
--- a/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml b/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml
index 92db68d..0e2a12c 100644
--- a/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml b/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
index bcc89e0..e74f485 100644
--- a/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml b/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
index 59a9d10..57765e0 100644
--- a/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.surefire.test</groupId>
   <artifactId>junit4-forkAlways-staticInit</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml b/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml
index 5652336..95e8471 100644
--- a/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit4-rerun-failing-tests/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml b/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml
index b11496b..1487d3a 100644
--- a/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit4-runlistener/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml b/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml
index 64e4348..6c83538 100644
--- a/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit4-twoTestCaseSuite/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit4/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit4/pom.xml b/surefire-integration-tests/src/test/resources/junit4/pom.xml
index 3d1f971..894b608 100644
--- a/surefire-integration-tests/src/test/resources/junit4/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit4/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml b/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml
index 6e6d476..b19f5f7 100644
--- a/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit44-dep/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml b/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml
index d97aeb4..b7904d2 100644
--- a/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit44-environment/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml b/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml
index 8eeea1b..8bc0e93 100644
--- a/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit44-hamcrest/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml b/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml
index 5c00713..2ef4471 100644
--- a/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit44-multiple-methods/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/pom.xml b/surefire-integration-tests/src/test/resources/junit44-multiple-methods/pom.xml
index 101dad1..2757d54 100644
--- a/surefire-integration-tests/src/test/resources/junit44-multiple-methods/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit44-multiple-methods/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml b/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml
index f0810c4..e3d28ac 100644
--- a/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit47-concurrency/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-concurrency/pom.xml b/surefire-integration-tests/src/test/resources/junit47-concurrency/pom.xml
index 4f648df..21bd802 100644
--- a/surefire-integration-tests/src/test/resources/junit47-concurrency/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit47-concurrency/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit47-parallel-nts/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel-nts/pom.xml b/surefire-integration-tests/src/test/resources/junit47-parallel-nts/pom.xml
index eb3c7fe..d984c58 100644
--- a/surefire-integration-tests/src/test/resources/junit47-parallel-nts/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit47-parallel-nts/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml b/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml
index eb68f3e..e8b08d7 100644
--- a/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit47-parallel-with-suite/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins.surefire</groupId>
   <artifactId>junit4-test</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml b/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml
index b4b0723..1a61ae1 100644
--- a/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit47-parallel/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml b/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
index 7cdb0a1..f5e7f80 100644
--- a/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit47-redirect-output/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins.surefire</groupId>
   <artifactId>fork-consoleOutput</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/pom.xml b/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/pom.xml
index a7ac055..60d3b99 100644
--- a/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit47-static-inner-class-tests/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins.surefire</groupId>
   <artifactId>junit4-test</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit48-categories/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-categories/pom.xml b/surefire-integration-tests/src/test/resources/junit48-categories/pom.xml
index 02914f8..ef40d2e 100644
--- a/surefire-integration-tests/src/test/resources/junit48-categories/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit48-categories/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml b/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml
index fe1690c..d7b99fe 100644
--- a/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/pom.xml b/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/pom.xml
index 00ebfa5..f6de751 100644
--- a/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit48-multiple-method-patterns/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit48-multiple-methods/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/pom.xml b/surefire-integration-tests/src/test/resources/junit48-multiple-methods/pom.xml
index 83b3044..999627b 100644
--- a/surefire-integration-tests/src/test/resources/junit48-multiple-methods/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit48-multiple-methods/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml b/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml
index ff701a3..3ab2235 100644
--- a/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/pom.xml b/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/pom.xml
index ef0c854..eaafcde 100644
--- a/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit48-smartStackTrace/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/large-test-results/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/large-test-results/pom.xml b/surefire-integration-tests/src/test/resources/large-test-results/pom.xml
index 24a816c..36caa01 100644
--- a/surefire-integration-tests/src/test/resources/large-test-results/pom.xml
+++ b/surefire-integration-tests/src/test/resources/large-test-results/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/norunnableTests/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/norunnableTests/pom.xml b/surefire-integration-tests/src/test/resources/norunnableTests/pom.xml
index cb08ed7..cde195f 100644
--- a/surefire-integration-tests/src/test/resources/norunnableTests/pom.xml
+++ b/surefire-integration-tests/src/test/resources/norunnableTests/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/parallel-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/parallel-runtime/pom.xml b/surefire-integration-tests/src/test/resources/parallel-runtime/pom.xml
index 560fe35..dba4c97 100644
--- a/surefire-integration-tests/src/test/resources/parallel-runtime/pom.xml
+++ b/surefire-integration-tests/src/test/resources/parallel-runtime/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins.surefire</groupId>
   <artifactId>parallel-runtime</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml b/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
index edf1031..22ef8a6 100644
--- a/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
+++ b/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml b/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml
index f2abf3b..19c5486 100644
--- a/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml
+++ b/surefire-integration-tests/src/test/resources/plexus-conflict/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/pojo-simple/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/pojo-simple/pom.xml b/surefire-integration-tests/src/test/resources/pojo-simple/pom.xml
index a97b872..ae30de0 100644
--- a/surefire-integration-tests/src/test/resources/pojo-simple/pom.xml
+++ b/surefire-integration-tests/src/test/resources/pojo-simple/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/reporters/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/reporters/pom.xml b/surefire-integration-tests/src/test/resources/reporters/pom.xml
index a28409d..8ea3d17 100644
--- a/surefire-integration-tests/src/test/resources/reporters/pom.xml
+++ b/surefire-integration-tests/src/test/resources/reporters/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins.surefire</groupId>
   <artifactId>reporters</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/result-counting/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/result-counting/pom.xml b/surefire-integration-tests/src/test/resources/result-counting/pom.xml
index 564deae..7e7f262 100644
--- a/surefire-integration-tests/src/test/resources/result-counting/pom.xml
+++ b/surefire-integration-tests/src/test/resources/result-counting/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>mag</groupId>
   <artifactId>junit4-test</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/runOrder/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runOrder/pom.xml b/surefire-integration-tests/src/test/resources/runOrder/pom.xml
index 1319a58..063e82b 100644
--- a/surefire-integration-tests/src/test/resources/runOrder/pom.xml
+++ b/surefire-integration-tests/src/test/resources/runOrder/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml b/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml
index f5c967d..edbc7fa 100644
--- a/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml
+++ b/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins.surefire</groupId>
   <artifactId>runorder-parallel</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml b/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml
index b1733c6..eb5f25c 100644
--- a/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml
+++ b/surefire-integration-tests/src/test/resources/sibling-aggregator/aggregator/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire.its.sibling-aggregator</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml b/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml
index 500216a..ba34f0a 100644
--- a/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml
+++ b/surefire-integration-tests/src/test/resources/sibling-aggregator/child1/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire.its.sibling-aggregator</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml b/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml
index 023af1c..5ca21cd 100644
--- a/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml
+++ b/surefire-integration-tests/src/test/resources/sibling-aggregator/child2/pom.xml
@@ -20,7 +20,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire.its.sibling-aggregator</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/small-result-counting/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/small-result-counting/pom.xml b/surefire-integration-tests/src/test/resources/small-result-counting/pom.xml
index f40eefc..d48eb92 100644
--- a/surefire-integration-tests/src/test/resources/small-result-counting/pom.xml
+++ b/surefire-integration-tests/src/test/resources/small-result-counting/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>maven-surefire</groupId>
   <artifactId>small-result-counting</artifactId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-it/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-it/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-it/pom.xml
index 1629429..5285fb1 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-it/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-it/pom.xml
@@ -19,7 +19,7 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
index f38b200..b613fcb 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1024/jiras-surefire-1024-testjar/pom.xml
@@ -19,7 +19,7 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1024/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1024/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1024/pom.xml
index bc28104..340c494 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1024/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1024/pom.xml
@@ -19,7 +19,7 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml
index edbfeb3..2b7659e 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1028-unable-to-run-single-test/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml
index 6a036e5..00ed618 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1036-NonFilterableJUnitRunnerWithCategories/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml
index e1331cb..efd19e8 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1041-exception-in-junit-runner/pom.xml
@@ -19,7 +19,7 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/pom.xml
index eeb446b..4c69f8f 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1053-system-properties/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
index 5d3eb93..86f29f3 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1080-parallel-fork-double-test/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
index ef3b87d..64e8559 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1082-parallel-junit-parameterized/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>

http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b54e33e6/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
index b0f79b1..022fddf 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1095-npe-in-runlistener/pom.xml
@@ -18,7 +18,7 @@
   ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.surefire</groupId>