You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2026/03/13 21:15:48 UTC

(maven-surefire) branch clenups-duplicate created (now 28b8d56bd)

This is an automated email from the ASF dual-hosted git repository.

sjaranowski pushed a change to branch clenups-duplicate
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


      at 28b8d56bd Remove redundant ITs and resource cleanups

This branch includes the following new commits:

     new 28b8d56bd Remove redundant ITs and resource cleanups

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(maven-surefire) 01/01: Remove redundant ITs and resource cleanups

Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sjaranowski pushed a commit to branch clenups-duplicate
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git

commit 28b8d56bd5b4d8f4a52c6aa19fe41f8ce76c9d80
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Fri Mar 13 22:15:26 2026 +0100

    Remove redundant ITs and resource cleanups
    
    When we have one provider test with empty, the same profiles are redundant
    
    remove unused ITs resources
---
 .../surefire/its/CheckTestFailIfNoTestsIT.java     |   9 --
 .../maven/surefire/its/TestMultipleMethodsIT.java  |   5 -
 .../maven/surefire/its/TestSingleMethodIT.java     |  28 +-----
 .../its/jiras/Surefire1209RerunAndForkCountIT.java |  21 +---
 .../src/test/resources/SurefireToolchains/pom.xml  |  72 --------------
 .../src/main/java/test/surefiretoolchains/App.java |  29 ------
 .../test/java/test/surefiretoolchains/AppTest.java |  17 ----
 .../src/test/resources/ant-ignore/.gitignore       |   3 -
 .../src/test/resources/ant-ignore/build.xml        |  52 ----------
 surefire-its/src/test/resources/ant-ignore/ivy.xml |   6 --
 surefire-its/src/test/resources/ant-ignore/pom.xml |  47 ---------
 .../src/test/resources/ant-ignore/src/ivy.xml      |   6 --
 .../src/test/java/antignore/BasicTest.java         |  23 -----
 .../test/resources/consoleOutputEncoding/pom.xml   |  73 --------------
 .../src/test/java/consoleOutput/Test1.java         |  28 ------
 .../default-configuration-noTests/pom.xml          |   6 --
 .../src/test/resources/failingBuilds/pom.xml       |  40 --------
 .../test/java/failingbuilds/ExceptionsTest.java    |  19 ----
 .../resources/failsafe-nofail/invoker.properties   |  19 ----
 .../src/test/resources/failsafe-nofail/pom.xml     |  83 ----------------
 .../failsafe-nofail/src/test/java/MyAT.java        |  25 -----
 .../failsafe-nofail/src/test/java/MyIT.java        |  26 -----
 .../resources/failsafe-regular/invoker.properties  |  19 ----
 .../src/test/resources/failsafe-regular/pom.xml    |  83 ----------------
 .../failsafe-regular/src/test/java/MyAT.java       |  26 -----
 .../failsafe-regular/src/test/java/MyIT.java       |  26 -----
 .../test/resources/failure-result-counting/pom.xml |  40 --------
 .../failureresultcounting/BeforeClassError.java    |  43 --------
 .../failureresultcounting/BeforeClassFailure.java  |  24 -----
 .../java/failureresultcounting/BeforeError.java    |  29 ------
 .../java/failureresultcounting/BeforeFailure.java  |  24 -----
 .../test/java/failureresultcounting/NoErrors.java  |  24 -----
 .../java/failureresultcounting/OrdinaryError.java  |  23 -----
 .../test/java/failureresultcounting/RunTests.java  |  33 -------
 .../src/test/resources/failureOutput/pom.xml       |  52 ----------
 .../src/test/java/forkConsoleOutput/Test1.java     |  66 -------------
 .../src/test/java/forkConsoleOutput/Test2.java     |  16 ---
 surefire-its/src/test/resources/failureOutput/test |  15 ---
 .../test/resources/junit44-single-method/pom.xml   |  60 ------------
 .../src/test/java/junit4/BasicTest.java            |  52 ----------
 .../test/resources/junit48-single-method/pom.xml   |  25 -----
 .../test/resources/junit5-multiple-methods/pom.xml |  69 -------------
 .../src/test/java/junit5/BasicTest.java            |  67 -------------
 .../src/test/java/junit5/TestThree.java            |  61 ------------
 .../src/test/java/junit5/TestTwo.java              |  61 ------------
 .../src/test/resources/junit5-runner/pom.xml       |  66 -------------
 .../src/test/java/examples/RootTest.java           |  14 ---
 .../src/test/java/examples/a/ATest.java            |  12 ---
 .../src/test/java/examples/b/BTest.java            |  14 ---
 .../src/test/java/pkg/JUnit5Tests.java             |  15 ---
 .../src/test/resources/large-test-results/pom.xml  |  55 -----------
 .../src/test/java/largeTestResults/BasicTest.java  |  46 ---------
 .../src/test/resources/parallel-runtime/pom.xml    |  42 --------
 .../src/test/java/runorder/parallel/Test1.java     |  50 ----------
 .../src/test/java/runorder/parallel/Test2.java     |  35 -------
 .../src/test/java/runorder/parallel/Test3.java     |  36 -------
 .../test/resources/small-result-counting/pom.xml   |  40 --------
 .../src/test/java/smallresultcounting/Test1.java   |  47 ---------
 .../src/test/java/smallresultcounting/Test2.java   |  88 -----------------
 .../surefire-1209-rerun-and-forkcount/pom.xml      |  28 ------
 .../test/resources/surefire-772-no-reports/pom.xml |  56 -----------
 .../surefire-822-legal-JUnit4-descriptions/pom.xml |  44 ---------
 .../java/surefire/testcase/JunitParamsTest.java    |  32 ------
 .../java/surefire/testcase/NonJunitParamsTest.java |  18 ----
 .../surefire-931-provider-failure/pom.xml          |  41 --------
 .../main/java/com/mycompany/testfailed/App.java    |  32 ------
 .../java/com/mycompany/testfailed/AppTest.java     |  18 ----
 .../resources/surefire-942-testngSuite/pom.xml     |  33 -------
 .../src/test/java/org/BasicTest.java               |  48 ---------
 .../src/test/resources/config.xml                  |   8 --
 surefire-its/src/test/resources/webapp/pom.xml     | 109 ---------------------
 .../webapp/src/main/webapp/WEB-INF/web.xml         |   7 --
 .../resources/webapp/src/main/webapp/index.jsp     |   5 -
 .../resources/webapp/src/test/java/WebAppTest.java |  47 ---------
 74 files changed, 4 insertions(+), 2657 deletions(-)

diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
index 270be3344..1d2d56b88 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
@@ -49,13 +49,4 @@ public void dontFailIfNoTests() {
         TestFile reportsDir = outputValidator.getSurefireReportsFile("");
         assertFalse(reportsDir.exists(), "Unexpected reports directory");
     }
-
-    @Test
-    public void jUnit48CategoriesFailWhenNoTests() {
-        unpack().failIfNoTests(false)
-                .activateProfile("junit47")
-                .setJUnitVersion("4.12")
-                .executeTest()
-                .verifyErrorFreeLog();
-    }
 }
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodsIT.java
index 62c2105b5..2eab2cdf3 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestMultipleMethodsIT.java
@@ -46,9 +46,4 @@ public OutputValidator multipleMethod(String projectName, String... goals) {
     public void testJunit44() {
         multipleMethod("junit44-multiple-methods");
     }
-
-    @Test
-    public void testJunit5() {
-        multipleMethod("junit44-multiple-methods");
-    }
 }
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
index 80b9c025f..2fe28aafc 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
@@ -51,20 +51,9 @@ public OutputValidator singleMethod(
         return launcher.executeTest().verifyErrorFreeLog().assertTestSuiteResults(1, 0, 0, 0);
     }
 
-    @Test
-    public void testJunit44() {
-        singleMethod("junit44-single-method", Collections.emptyMap(), null);
-    }
-
-    @Test
-    public void testJunit48Provider4() {
-        singleMethod("junit48-single-method", Collections.emptyMap(), null, "-P surefire-junit4");
-    }
-
     @Test
     public void testJunit48Provider47() {
-        singleMethod("junit48-single-method", Collections.emptyMap(), null, "-P surefire-junit47")
-                .verifyTextInLog(RUNNING_WITH_PROVIDER47);
+        singleMethod("junit48-single-method", Collections.emptyMap(), null).verifyTextInLog(RUNNING_WITH_PROVIDER47);
     }
 
     @Test
@@ -91,20 +80,7 @@ public void testTestNg5149() {
 
     @Test
     public void fullyQualifiedJunit48Provider4() {
-        singleMethod(
-                "junit48-single-method",
-                Collections.emptyMap(),
-                "junit4.BasicTest#testSuccessOne",
-                "-P surefire-junit4");
-    }
-
-    @Test
-    public void fullyQualifiedJunit48Provider47() {
-        singleMethod(
-                "junit48-single-method",
-                Collections.emptyMap(),
-                "junit4.BasicTest#testSuccessOne",
-                "-P surefire-junit47");
+        singleMethod("junit48-single-method", Collections.emptyMap(), "junit4.BasicTest#testSuccessOne");
     }
 
     @Test
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
index 4399b33fb..f0b9bba86 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1209RerunAndForkCountIT.java
@@ -35,37 +35,20 @@ public class Surefire1209RerunAndForkCountIT extends SurefireJUnit4IntegrationTe
     private static final String SUMMARY_COUNTS = "Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Flakes: 2";
 
     @Test
-    public void reusableForksJUnit47() throws VerificationException {
+    public void reusableForksJUnit() throws VerificationException {
         unpack().executeTest()
                 .assertTestSuiteResults(5, 0, 0, 0, 4)
                 .assertThatLogLine(containsString(SUMMARY_COUNTS), is(1));
     }
 
     @Test
-    public void notReusableForksJUnit47() throws VerificationException {
+    public void notReusableForksJUnit() throws VerificationException {
         unpack().reuseForks(false)
                 .executeTest()
                 .assertTestSuiteResults(5, 0, 0, 0, 4)
                 .assertThatLogLine(containsString(SUMMARY_COUNTS), is(1));
     }
 
-    @Test
-    public void reusableForksJUnit4() throws VerificationException {
-        unpack().activateProfile("junit4")
-                .executeTest()
-                .assertTestSuiteResults(5, 0, 0, 0, 4)
-                .assertThatLogLine(containsString(SUMMARY_COUNTS), is(1));
-    }
-
-    @Test
-    public void notReusableForksJUnit4() throws VerificationException {
-        unpack().activateProfile("junit4")
-                .reuseForks(false)
-                .executeTest()
-                .assertTestSuiteResults(5, 0, 0, 0, 4)
-                .assertThatLogLine(containsString(SUMMARY_COUNTS), is(1));
-    }
-
     private SurefireLauncher unpack() {
         return unpack("surefire-1209-rerun-and-forkcount");
     }
diff --git a/surefire-its/src/test/resources/SurefireToolchains/pom.xml b/surefire-its/src/test/resources/SurefireToolchains/pom.xml
deleted file mode 100644
index 568000142..000000000
--- a/surefire-its/src/test/resources/SurefireToolchains/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-<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>test</groupId>
-    <artifactId>SurefireToolchains</artifactId>
-    <packaging>jar</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>Test :: SurefireToolchains</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-    
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
-                <configuration>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-toolchains-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>toolchain</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <toolchains>
-                        <jdk>
-                            <version>1.5</version>
-                            <vendor>sun</vendor>
-                        </jdk>
-                    </toolchains>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/surefire-its/src/test/resources/SurefireToolchains/src/main/java/test/surefiretoolchains/App.java b/surefire-its/src/test/resources/SurefireToolchains/src/main/java/test/surefiretoolchains/App.java
deleted file mode 100644
index 0a56a54f5..000000000
--- a/surefire-its/src/test/resources/SurefireToolchains/src/main/java/test/surefiretoolchains/App.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package test.surefiretoolchains;
-
-/*
- * 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.
- */
-
-public final class App
-{
-
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}
diff --git a/surefire-its/src/test/resources/SurefireToolchains/src/test/java/test/surefiretoolchains/AppTest.java b/surefire-its/src/test/resources/SurefireToolchains/src/test/java/test/surefiretoolchains/AppTest.java
deleted file mode 100644
index 4b4cc49bd..000000000
--- a/surefire-its/src/test/resources/SurefireToolchains/src/test/java/test/surefiretoolchains/AppTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package test.surefiretoolchains;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class AppTest
-{
-
-    @Test
-    public void testApp()
-    {
-        // 1.5.0_19-b02
-        assertEquals( "1.5.0_19", System.getProperty( "java.version" ) );
-    }
-
-}
diff --git a/surefire-its/src/test/resources/ant-ignore/.gitignore b/surefire-its/src/test/resources/ant-ignore/.gitignore
deleted file mode 100644
index 2d7276b9e..000000000
--- a/surefire-its/src/test/resources/ant-ignore/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.jar
-TEST*
-
diff --git a/surefire-its/src/test/resources/ant-ignore/build.xml b/surefire-its/src/test/resources/ant-ignore/build.xml
deleted file mode 100644
index 69795d002..000000000
--- a/surefire-its/src/test/resources/ant-ignore/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<project name="MyProject" xmlns:ivy="antlib:org.apache.ivy.ant" default="dist" basedir=".">
-    <description>
-        simple example build file
-    </description>
-  <!-- set global properties for this build -->
-  <property name="src" location="src/test"/>
-  <property name="build" location="build"/>
-  <property name="dist"  location="dist"/>
-
-
-    <target name="resolve" description="--> retrieve dependencies with ivy">
-        <ivy:retrieve />
-    </target>
-
-  <target name="init">
-    <!-- Create the time stamp -->
-    <tstamp/>
-    <!-- Create the build directory structure used by compile -->
-    <mkdir dir="${build}"/>
-  </target>
-
-  <target name="compile" depends="init, resolve"
-        description="compile the source " >
-    <javac srcdir="${src}" destdir="${build}" includeantruntime="true" classpath="lib/junit-4.8.1.jar" />
-  </target>
-
-  <target name="dist" depends="compile"
-        description="generate the distribution" >
-    <!-- Create the distribution directory -->
-    <mkdir dir="${dist}/lib"/>
-
-    <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
-    <jar jarfile="${dist}/lib/MyProject-${DSTAMP}.jar" basedir="${build}"/>
-  </target>
-
-  <target name="test" depends="compile">
-    <junit>
-      <classpath path="build:lib/junit-4.8.1.jar"/>
-      <formatter type="brief" usefile="true" />
-      <formatter type="xml" usefile="true" />
-      <test name="antignore.BasicTest" />
-    </junit>
-</target>
-
-  <target name="clean"
-        description="clean up" >
-    <!-- Delete the ${build} and ${dist} directory trees -->
-    <delete dir="${build}"/>
-    <delete dir="${dist}"/>
-  </target>
-
-</project>
diff --git a/surefire-its/src/test/resources/ant-ignore/ivy.xml b/surefire-its/src/test/resources/ant-ignore/ivy.xml
deleted file mode 100644
index 64df19cf1..000000000
--- a/surefire-its/src/test/resources/ant-ignore/ivy.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ivy-module version="2.0">
-    <info organisation="org.apache" module="hello-ivy"/>
-    <dependencies>
-        <dependency org="junit" name="junit" rev="4.8.1"/>
-    </dependencies>
-</ivy-module>
diff --git a/surefire-its/src/test/resources/ant-ignore/pom.xml b/surefire-its/src/test/resources/ant-ignore/pom.xml
deleted file mode 100644
index 2e25979cf..000000000
--- a/surefire-its/src/test/resources/ant-ignore/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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>ant-ignore</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>Test of @Ignore annotation, can be used side-by-side with maven and ant </name>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/surefire-its/src/test/resources/ant-ignore/src/ivy.xml b/surefire-its/src/test/resources/ant-ignore/src/ivy.xml
deleted file mode 100644
index 64df19cf1..000000000
--- a/surefire-its/src/test/resources/ant-ignore/src/ivy.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ivy-module version="2.0">
-    <info organisation="org.apache" module="hello-ivy"/>
-    <dependencies>
-        <dependency org="junit" name="junit" rev="4.8.1"/>
-    </dependencies>
-</ivy-module>
diff --git a/surefire-its/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java b/surefire-its/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
deleted file mode 100644
index 487427a07..000000000
--- a/surefire-its/src/test/resources/ant-ignore/src/test/java/antignore/BasicTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package antignore;
-
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class BasicTest
-{
-
-    @Test
-    @Ignore
-    public void testIgnorable()
-    {
-        Assert.fail( "you should have ignored me!" );
-    }
-
-    @Test
-    public void testSomethingElse()
-    {
-
-    }
-
-}
diff --git a/surefire-its/src/test/resources/consoleOutputEncoding/pom.xml b/surefire-its/src/test/resources/consoleOutputEncoding/pom.xml
deleted file mode 100644
index 343f9321a..000000000
--- a/surefire-its/src/test/resources/consoleOutputEncoding/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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">
-
-  <parent>
-    <groupId>org.apache.maven.surefire</groupId>
-    <artifactId>it-parent</artifactId>
-    <version>1.0</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.plugins.surefire</groupId>
-  <artifactId>consoleOutputEncodingsTest</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>consoleOutputTest</name>
-  <url>http://maven.apache.org</url>
-
-  <dependencies>
-      <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <version>${junit.version}</version>
-      </dependency>
-  </dependencies>
-  <build>
-     <plugins>
-        <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-surefire-plugin</artifactId>
-           <configuration>
-             <forkCount>${forkCount}</forkCount>
-             <reuseForks>${reuseForks}</reuseForks>
-             <printSummary>${printSummary}</printSummary>
-             <reportFormat>${reportFormat}</reportFormat>
-             <includes>
-                <include>**/Test*.java</include>
-             </includes>
-           </configuration>
-        </plugin>
-     </plugins>
-
-  </build>
-
-    <properties>
-      <junit.version>4.12</junit.version>
-      <forkCount>1</forkCount>
-      <reuseForks>true</reuseForks>
-      <printSummary>true</printSummary>
-      <reportFormat>brief</reportFormat>
-    </properties>
-
-</project>
diff --git a/surefire-its/src/test/resources/consoleOutputEncoding/src/test/java/consoleOutput/Test1.java b/surefire-its/src/test/resources/consoleOutputEncoding/src/test/java/consoleOutput/Test1.java
deleted file mode 100644
index ee60a854e..000000000
--- a/surefire-its/src/test/resources/consoleOutputEncoding/src/test/java/consoleOutput/Test1.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package consoleOutput;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.nio.charset.Charset;
-
-public class Test1
-{
-    @Test
-    public void testSystemOut()
-        throws IOException
-    {
-        PrintStream out = System.out;
-        out.print( getS( "print" ));
-        out.write( getS( "utf-8" ).getBytes( Charset.forName( "UTF-8" ) ) );
-        out.write( getS( "8859-1" ).getBytes( Charset.forName( "ISO-8859-1" ) ) );
-        out.write( getS( "utf-16" ).getBytes( Charset.forName( "UTF-16" ) ) );
-    }
-
-    private String getS( String s )
-    {
-        return " Hell\u00d8 " + s + "\n";
-    }
-}
diff --git a/surefire-its/src/test/resources/default-configuration-noTests/pom.xml b/surefire-its/src/test/resources/default-configuration-noTests/pom.xml
index a0a917b4c..7d27c2bf0 100644
--- a/surefire-its/src/test/resources/default-configuration-noTests/pom.xml
+++ b/surefire-its/src/test/resources/default-configuration-noTests/pom.xml
@@ -48,10 +48,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>junit47</id>
-        </profile>
-    </profiles>
-
 </project>
diff --git a/surefire-its/src/test/resources/failingBuilds/pom.xml b/surefire-its/src/test/resources/failingBuilds/pom.xml
deleted file mode 100644
index 631658527..000000000
--- a/surefire-its/src/test/resources/failingBuilds/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<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.surefire</groupId>
-  <artifactId>failingBuilds-test</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>failingBuilds</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-     <plugins>
-        <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-surefire-plugin</artifactId>
-           <version>${surefire.version}</version>
-           <configuration>
-             <includes>
-                <include>**/*Test.java</include>
-               <include>**/MySuiteTest1.java</include>
-               <include>**/MySuiteTest2.java</include>
-               <include>**/MySuiteTest3.java</include>
-             </includes>
-           </configuration>
-        </plugin>
-     </plugins>
-  </build>
-  <properties>
-    <junit.version>4.12</junit.version>
-    <forkCount>1</forkCount>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
-</project>
diff --git a/surefire-its/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java b/surefire-its/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java
deleted file mode 100644
index daa183928..000000000
--- a/surefire-its/src/test/resources/failingBuilds/src/test/java/failingbuilds/ExceptionsTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package failingbuilds;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assume.*;
-
-import junit.framework.TestCase;
-
-public class ExceptionsTest
-    extends TestCase
-{
-    public void testWithMultiLineExceptionBeingThrown()
-    {
-        throw new RuntimeException( "A very very long exception message indeed, which is to demonstrate truncation. It will be truncated somewhere\nA cat\nAnd a dog\nTried to make a\nParrot swim" );
-    }
-}
diff --git a/surefire-its/src/test/resources/failsafe-nofail/invoker.properties b/surefire-its/src/test/resources/failsafe-nofail/invoker.properties
deleted file mode 100644
index ab6608feb..000000000
--- a/surefire-its/src/test/resources/failsafe-nofail/invoker.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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.
-#
-invoker.buildResult=failure
diff --git a/surefire-its/src/test/resources/failsafe-nofail/pom.xml b/surefire-its/src/test/resources/failsafe-nofail/pom.xml
deleted file mode 100644
index 19f8f8fdb..000000000
--- a/surefire-its/src/test/resources/failsafe-nofail/pom.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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>
-  <groupId>localhost</groupId>
-  <artifactId>working-directory-test</artifactId>
-  <version>1.0</version>
-  <name>Run tests multiple times</name>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <executions>
-            <execution>
-                <id>integration-test</id>
-                <goals>
-                    <goal>integration-test</goal>
-                </goals>
-                <configuration>
-                    <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-1.xml</summaryFile>
-                </configuration>
-            </execution>
-            <execution>
-                <id>acceptance-test</id>
-                <goals>
-                    <goal>integration-test</goal>
-                </goals>
-                <configuration>
-                    <includes>
-                        <include>**/AT*.java</include>
-                        <include>**/*AT.java</include>
-                        <include>**/*ATCase.java</include>
-                    </includes>
-                    <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-2.xml</summaryFile>
-                </configuration>
-            </execution>
-            <execution>
-                <id>verify</id>
-                <goals>
-                    <goal>verify</goal>
-                </goals>
-                <configuration>
-                    <summaryFiles>
-                        <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-1.xml</summaryFile>
-                        <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-2.xml</summaryFile>
-                    </summaryFiles>
-                </configuration>
-            </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/surefire-its/src/test/resources/failsafe-nofail/src/test/java/MyAT.java b/surefire-its/src/test/resources/failsafe-nofail/src/test/java/MyAT.java
deleted file mode 100644
index b447e944e..000000000
--- a/surefire-its/src/test/resources/failsafe-nofail/src/test/java/MyAT.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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 junit.framework.TestCase;
-
-public class MyAT extends TestCase {
-    public void testSomething() {
-        assertTrue(true);
-    }
-}
diff --git a/surefire-its/src/test/resources/failsafe-nofail/src/test/java/MyIT.java b/surefire-its/src/test/resources/failsafe-nofail/src/test/java/MyIT.java
deleted file mode 100644
index c74feb1e7..000000000
--- a/surefire-its/src/test/resources/failsafe-nofail/src/test/java/MyIT.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 junit.framework.TestCase;
-
-public class MyIT extends TestCase {
-    public void testSomething() {
-        assertTrue(true);
-    }
-}
diff --git a/surefire-its/src/test/resources/failsafe-regular/invoker.properties b/surefire-its/src/test/resources/failsafe-regular/invoker.properties
deleted file mode 100644
index ab6608feb..000000000
--- a/surefire-its/src/test/resources/failsafe-regular/invoker.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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.
-#
-invoker.buildResult=failure
diff --git a/surefire-its/src/test/resources/failsafe-regular/pom.xml b/surefire-its/src/test/resources/failsafe-regular/pom.xml
deleted file mode 100644
index e8a1a5307..000000000
--- a/surefire-its/src/test/resources/failsafe-regular/pom.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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>
-  <groupId>localhost</groupId>
-  <artifactId>working-directory-test</artifactId>
-  <version>1.0</version>
-  <name>Run tests multiple times</name>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <executions>
-            <execution>
-                <id>integration-test</id>
-                <goals>
-                    <goal>integration-test</goal>
-                </goals>
-                <configuration>
-                    <summaryFile>${project.build.directory}/failsafe-reports/Xfailsafe-summary-1.xml</summaryFile>
-                </configuration>
-            </execution>
-            <execution>
-                <id>acceptance-test</id>
-                <goals>
-                    <goal>integration-test</goal>
-                </goals>
-                <configuration>
-                    <includes>
-                        <include>**/AT*.java</include>
-                        <include>**/*AT.java</include>
-                        <include>**/*ATCase.java</include>
-                    </includes>
-                    <summaryFile>${project.build.directory}/failsafe-reports/Xfailsafe-summary-2.xml</summaryFile>
-                </configuration>
-            </execution>
-            <execution>
-                <id>verify</id>
-                <goals>
-                    <goal>verify</goal>
-                </goals>
-                <configuration>
-                    <summaryFiles>
-                        <summaryFile>${project.build.directory}/failsafe-reports/Xfailsafe-summary-1.xml</summaryFile>
-                        <summaryFile>${project.build.directory}/failsafe-reports/Xfailsafe-summary-2.xml</summaryFile>
-                    </summaryFiles>
-                </configuration>
-            </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/surefire-its/src/test/resources/failsafe-regular/src/test/java/MyAT.java b/surefire-its/src/test/resources/failsafe-regular/src/test/java/MyAT.java
deleted file mode 100644
index 615ee7680..000000000
--- a/surefire-its/src/test/resources/failsafe-regular/src/test/java/MyAT.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 junit.framework.TestCase;
-
-public class MyAT extends TestCase {
-    public void testSomething() {
-        assertTrue(true);
-    }
-}
diff --git a/surefire-its/src/test/resources/failsafe-regular/src/test/java/MyIT.java b/surefire-its/src/test/resources/failsafe-regular/src/test/java/MyIT.java
deleted file mode 100644
index c74feb1e7..000000000
--- a/surefire-its/src/test/resources/failsafe-regular/src/test/java/MyIT.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 junit.framework.TestCase;
-
-public class MyIT extends TestCase {
-    public void testSomething() {
-        assertTrue(true);
-    }
-}
diff --git a/surefire-its/src/test/resources/failure-result-counting/pom.xml b/surefire-its/src/test/resources/failure-result-counting/pom.xml
deleted file mode 100644
index a7681c9d1..000000000
--- a/surefire-its/src/test/resources/failure-result-counting/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<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>maven-surefire</groupId>
-  <artifactId>small-result-counting</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>failure-result-counting</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <configuration>
-          <forkCount>${forkCount}</forkCount>
-          <reuseForks>${reuseForks}</reuseForks>
-          <includes>
-            <include>**/*.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <properties>
-    <junit.version>4.12</junit.version>
-    <forkCount>1</forkCount>
-    <reuseForks>true</reuseForks>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
-</project>
diff --git a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java
deleted file mode 100644
index 0e80332ea..000000000
--- a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassError.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package failureresultcounting;
-/*
- * 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.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class BeforeClassError
-{
-
-    @BeforeClass
-    public static void beforeClassError()
-    {
-        throw new RuntimeException( "Exception in beforeclass" );
-    }
-
-    @Test
-    public void ok()
-    {
-        System.out.println( "beforeClassError run !!" );
-    }
-
-}
\ No newline at end of file
diff --git a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java
deleted file mode 100644
index e24bc1632..000000000
--- a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeClassFailure.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package failureresultcounting;
-import junit.framework.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class BeforeClassFailure
-{
-
-    @BeforeClass
-    public static void failInBeforeClass()
-    {
-        Assert.fail( "Failing in @BeforeClass" );
-    }
-
-    @Test
-    public void ok()
-    {
-        System.out.println( "failInBeforeClass run !!");
-    }
-
-}
diff --git a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java
deleted file mode 100644
index fd6a49fdc..000000000
--- a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeError.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package failureresultcounting;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class BeforeError
-{
-
-    @Before
-    public void exceptionInBefore()
-    {
-        throw new RuntimeException( "Exception in @before" );
-    }
-
-    @Test
-    public void ok()
-    {
-        System.out.println( "exceptionInBefore run!!");
-    }
-
-    /*@Test
-    public void ok2()
-    {
-        System.out.println( "exceptionInBefore2 run!!");
-    } */
-
-}
diff --git a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java
deleted file mode 100644
index eff742fec..000000000
--- a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/BeforeFailure.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package failureresultcounting;
-import junit.framework.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class BeforeFailure
-{
-
-    @Before
-    public void failInBEfore()
-    {
-        Assert.fail( "Failing in @before" );
-    }
-
-    @Test
-    public void ok()
-    {
-        System.out.println( "failInBEfore run !!");
-    }
-
-}
diff --git a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java
deleted file mode 100644
index 2a3bca7e5..000000000
--- a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/NoErrors.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package failureresultcounting;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class NoErrors
-{
-
-    @Test
-    @Ignore
-    public void allOk1()
-    {
-    }
-
-    @Test
-    @Ignore
-    public void allOk2()
-    {
-    }
-
-}
diff --git a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java
deleted file mode 100644
index 359f1f14b..000000000
--- a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/OrdinaryError.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package failureresultcounting;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class OrdinaryError
-{
-
-    @Test
-    public void ordinaryEror()
-    {
-        throw new RuntimeException( "Exception in @before" );
-    }
-
-    @Test
-    public void ordinaryFailure()
-    {
-        Assert.fail();
-    }
-
-}
diff --git a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/RunTests.java b/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/RunTests.java
deleted file mode 100644
index 6dc2f4cdf..000000000
--- a/surefire-its/src/test/resources/failure-result-counting/src/test/java/failureresultcounting/RunTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package failureresultcounting;
-
-/*
- * 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.
- */
-
-public class RunTests
-{
-    public static void main(String args[]) {
-        org.junit.runner.JUnitCore.main(BeforeClassError.class.getName(),
-                                        BeforeClassFailure.class.getName(),
-                                        BeforeError.class.getName(),
-                                        BeforeFailure.class.getName(),
-                                        OrdinaryError.class.getName(),
-                                        NoErrors.class.getName()
-                                        );
-    }
-}
diff --git a/surefire-its/src/test/resources/failureOutput/pom.xml b/surefire-its/src/test/resources/failureOutput/pom.xml
deleted file mode 100644
index 7080de6a5..000000000
--- a/surefire-its/src/test/resources/failureOutput/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<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>
-  <artifactId>failureOutput</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>failureOutput</name>
-  <url>http://maven.apache.org</url>
-
-  <dependencies>
-      <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <version>${junit.version}</version>
-      </dependency>
-  </dependencies>
-  <build>
-     <plugins>
-        <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-surefire-plugin</artifactId>
-           <version>${surefire.version}</version>
-           <configuration>
-             <forkCount>${forkCount}</forkCount>
-             <reuseForks>${reuseForks}</reuseForks>
-             <printSummary>${printSummary}</printSummary>
-             <useFile>${userFile}</useFile>
-             <reportFormat>${reportFormat}</reportFormat>
-              <redirectTestOutputToFile>${redirect.to.file}</redirectTestOutputToFile>
-             <includes>
-                <include>**/Test*.java</include>
-             </includes>
-           </configuration>
-        </plugin>
-     </plugins>
-
-  </build>
-
-    <properties>
-      <junit.version>4.12</junit.version>
-      <redirect.to.file>true</redirect.to.file>
-      <forkCount>1</forkCount>
-      <reuseForks>true</reuseForks>
-      <printSummary>true</printSummary>
-      <useFile>true</useFile>
-      <reportFormat>brief</reportFormat>
-      <maven.compiler.source>1.8</maven.compiler.source>
-      <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
-</project>
diff --git a/surefire-its/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test1.java b/surefire-its/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test1.java
deleted file mode 100644
index 66ba3a77d..000000000
--- a/surefire-its/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test1.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package forkConsoleOutput;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.io.File;
-
-public class Test1
-{
-    @Test
-    public void test6281() {
-        System.out.println( "Test1 on" + Thread.currentThread().getName());
-    }
-
-    @Test
-    public void nullPointerInLibrary() {
-        new File((String)null);
-    }
-
-    @Test
-    public void failInMethod() {
-        innerFailure();
-    }
-
-    @Test
-    public void failInLibInMethod() {
-        new File((String)null);
-    }
-
-
-    @Test
-    public void failInNestedLibInMethod() {
-        nestedLibFailure();
-    }
-
-    @Test
-    public void assertion1() {
-        Assert.assertEquals("Bending maths", "123", "312");
-    }
-
-    @Test
-    public void assertion2() {
-        Assert.assertFalse("True is false", true);
-    }
-
-    private void innerFailure(){
-        throw new NullPointerException("Fail here");
-    }
-
-    private void nestedLibFailure(){
-        new File((String) null);
-    }
-
-    @BeforeClass
-    public static void testWithFailingAssumption2() {
-        System.out.println( "BeforeTest1 on" + Thread.currentThread().getName());
-    }
-    
-    @AfterClass
-    public static void testWithFailingAssumption3() {
-        System.out.println( "AfterTest1 on" + Thread.currentThread().getName());
-    }
-
-}
diff --git a/surefire-its/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test2.java b/surefire-its/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test2.java
deleted file mode 100644
index 532696312..000000000
--- a/surefire-its/src/test/resources/failureOutput/src/test/java/forkConsoleOutput/Test2.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package forkConsoleOutput;
-
-import org.junit.Test;
-
-public class Test2
-{
-    @Test
-    public void test6281()
-    {
-        System.out.println( "sout: I am talking to you" );
-        System.out.println( "sout: Will Fail soon" );
-        System.err.println( "serr: And you too" );
-        System.err.println( "serr: Will Fail now" );
-        throw new RuntimeException( "FailHere" );
-    }
-}
diff --git a/surefire-its/src/test/resources/failureOutput/test b/surefire-its/src/test/resources/failureOutput/test
deleted file mode 100644
index 873a7bfc7..000000000
--- a/surefire-its/src/test/resources/failureOutput/test
+++ /dev/null
@@ -1,15 +0,0 @@
-[INFO] Scanning for projects...
-[WARNING] 
-[WARNING] Some problems were encountered while building the effective model for org.apache.maven.plugins.surefire:failureOutput:jar:1.0-SNAPSHOT
-[WARNING] 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-compiler-plugin is missing. @ line 20, column 17
-[WARNING] 
-[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build.
-[WARNING] 
-[WARNING] For this reason, future Maven versions might no longer support building such malformed projects.
-[WARNING] 
-[INFO]                                                                         
-[INFO] ------------------------------------------------------------------------
-[INFO] Building failureOutput 1.0-SNAPSHOT
-[INFO] ------------------------------------------------------------------------
-[INFO] 
-[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ failureOutput ---
diff --git a/surefire-its/src/test/resources/junit44-single-method/pom.xml b/surefire-its/src/test/resources/junit44-single-method/pom.xml
deleted file mode 100644
index cc236bb5e..000000000
--- a/surefire-its/src/test/resources/junit44-single-method/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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>
-
-  <groupId>org.apache.maven.plugins.surefire</groupId>
-  <artifactId>junit4</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>Test for JUnit 4</name>
-
-
-  <properties>
-    <junitVersion>4.12</junitVersion>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junitVersion}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <configuration>
-          <test>BasicTest#testSuccessOne</test>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/surefire-its/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java b/surefire-its/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java
deleted file mode 100644
index 1f14889ed..000000000
--- a/surefire-its/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package junit4;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class BasicTest
-{
-
-    private boolean setUpCalled = false;
-
-    private static boolean tearDownCalled = false;
-    
-    @Before
-    public void setUp()
-    {
-        setUpCalled = true;
-        tearDownCalled = false;
-        System.out.println( "Called setUp" );
-    }
-
-    @After
-    public void tearDown()
-    {
-        setUpCalled = false;
-        tearDownCalled = true;
-        System.out.println( "Called tearDown" );
-    }
-
-    @Test
-    public void testSetUp()
-    {
-        Assert.assertTrue( "setUp was not called", setUpCalled );
-    }
-    
-    
-    @Test
-    public void testSuccessOne()
-    {
-        Assert.assertTrue( true );
-    }     
-
-    @AfterClass
-    public static void oneTimeTearDown()
-    {
-        
-    }
-
-}
diff --git a/surefire-its/src/test/resources/junit48-single-method/pom.xml b/surefire-its/src/test/resources/junit48-single-method/pom.xml
index ff0ed0ecb..5c405a350 100644
--- a/surefire-its/src/test/resources/junit48-single-method/pom.xml
+++ b/surefire-its/src/test/resources/junit48-single-method/pom.xml
@@ -61,29 +61,4 @@
     </plugins>
   </build>
 
-  <profiles>
-    <profile>
-      <id>surefire-junit47</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>surefire-junit4</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/surefire-its/src/test/resources/junit5-multiple-methods/pom.xml b/surefire-its/src/test/resources/junit5-multiple-methods/pom.xml
deleted file mode 100644
index 6d7c48d48..000000000
--- a/surefire-its/src/test/resources/junit5-multiple-methods/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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>junit4</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>Test for JUnit 5</name>
-
-  <!--
-  This is using junit 4.0 provider.
-  Same test in junit48-multiple-methods is used with different provider junit 4.7.
-  -->
-
-  <properties>
-    <junitVersion>5.14.1</junitVersion>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <version>${junitVersion}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <configuration>
-          <test>junit5/BasicTest#testSuccessOne+testFailOne,junit5/TestThree#testSuccessTwo</test>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/surefire-its/src/test/resources/junit5-multiple-methods/src/test/java/junit5/BasicTest.java b/surefire-its/src/test/resources/junit5-multiple-methods/src/test/java/junit5/BasicTest.java
deleted file mode 100644
index 503f885e4..000000000
--- a/surefire-its/src/test/resources/junit5-multiple-methods/src/test/java/junit5/BasicTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package junit5;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.AfterClass;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-
-public class BasicTest
-{
-
-    private boolean setUpCalled = false;
-
-    private static boolean tearDownCalled = false;
-    
-    @BeforeEach
-    public void setUp()
-    {
-        setUpCalled = true;
-        tearDownCalled = false;
-        System.out.println( "Called setUp" );
-    }
-
-    @AfterEach
-    public void tearDown()
-    {
-        setUpCalled = false;
-        tearDownCalled = true;
-        System.out.println( "Called tearDown" );
-    }
-
-    @Test
-    public void testSetUp()
-    {
-        assertTrue( "setUp was not called", setUpCalled );
-    }
-    
-    
-    @Test
-    public void testSuccessOne()
-    {
-        assertTrue( true );
-    }    
-    
-    @Test
-    public void testSuccessTwo()
-    {
-        assertTrue( true );
-    }   
-    
-    @Test
-    public void testFailOne()
-    {
-        assertFalse( false );
-    } 
-
-    @AfterClass
-    public static void oneTimeTearDown()
-    {
-        
-    }
-
-}
diff --git a/surefire-its/src/test/resources/junit5-multiple-methods/src/test/java/junit5/TestThree.java b/surefire-its/src/test/resources/junit5-multiple-methods/src/test/java/junit5/TestThree.java
deleted file mode 100644
index 392e0ac28..000000000
--- a/surefire-its/src/test/resources/junit5-multiple-methods/src/test/java/junit5/TestThree.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package junit5;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.AfterClass;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-
-public class TestThree
-{
-
-    private boolean setUpCalled = false;
-
-    private static boolean tearDownCalled = false;
-    
-    @BeforeEach
-    public void setUp()
-    {
-        setUpCalled = true;
-        tearDownCalled = false;
-        System.out.println( "Called setUp" );
-    }
-
-    @AfterEach
-    public void tearDown()
-    {
-        setUpCalled = false;
-        tearDownCalled = true;
-        System.out.println( "Called tearDown" );
-    }
-
-    @Test
-    public void testSetUp()
-    {
-        assertTrue( "setUp was not called", setUpCalled );
-    }
-    
-    
-    @Test
-    public void testSuccessOne()
-    {
-        assertTrue( true );
-    } 
-    
-    @Test
-    public void testSuccessTwo()
-    {
-        assertTrue( true );
-    }    
-
-    @AfterClass
-    public static void oneTimeTearDown()
-    {
-        
-    }
-
-}
diff --git a/surefire-its/src/test/resources/junit5-multiple-methods/src/test/java/junit5/TestTwo.java b/surefire-its/src/test/resources/junit5-multiple-methods/src/test/java/junit5/TestTwo.java
deleted file mode 100644
index 1d62a1371..000000000
--- a/surefire-its/src/test/resources/junit5-multiple-methods/src/test/java/junit5/TestTwo.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package junit5;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.AfterClass;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-
-public class TestTwo
-{
-
-    private boolean setUpCalled = false;
-
-    private static boolean tearDownCalled = false;
-    
-    @BeforeEach
-    public void setUp()
-    {
-        setUpCalled = true;
-        tearDownCalled = false;
-        System.out.println( "Called setUp" );
-    }
-
-    @AfterEach
-    public void tearDown()
-    {
-        setUpCalled = false;
-        tearDownCalled = true;
-        System.out.println( "Called tearDown" );
-    }
-
-    @Test
-    public void testSetUp()
-    {
-        assertTrue( "setUp was not called", setUpCalled );
-    }
-    
-    
-    @Test
-    public void testSuccessOne()
-    {
-        assertTrue( true );
-    } 
-    
-    @Test
-    public void testSuccessTwo()
-    {
-        assertTrue( true );
-    }    
-
-    @AfterClass
-    public static void oneTimeTearDown()
-    {
-        
-    }
-
-}
diff --git a/surefire-its/src/test/resources/junit5-runner/pom.xml b/surefire-its/src/test/resources/junit5-runner/pom.xml
deleted file mode 100644
index 8cce07c80..000000000
--- a/surefire-its/src/test/resources/junit5-runner/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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>
-
-    <groupId>org.example</groupId>
-    <artifactId>junit5-runner</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${java.specification.version}</maven.compiler.source>
-        <maven.compiler.target>${java.specification.version}</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.12.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>1.12.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${surefire.version}</version>
-                    <configuration>
-                        <test>JUnit5Tests</test>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-</project>
diff --git a/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/RootTest.java b/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/RootTest.java
deleted file mode 100644
index 7e7e07e28..000000000
--- a/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/RootTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package examples;
-
-import org.junit.Test;
-
-import static org.junit.Assert.fail;
-
-class RootTest
-{
-    @Test
-    public void test()
-    {
-        fail();
-    }
-}
diff --git a/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/a/ATest.java b/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/a/ATest.java
deleted file mode 100644
index 08c822f4f..000000000
--- a/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/a/ATest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package examples.a;
-
-import org.junit.Test;
-
-public class ATest
-{
-    @Test
-    public void test()
-    {
-        // ok
-    }
-}
diff --git a/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/b/BTest.java b/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/b/BTest.java
deleted file mode 100644
index 6395c3f81..000000000
--- a/surefire-its/src/test/resources/junit5-runner/src/test/java/examples/b/BTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package examples.b;
-
-import org.junit.Test;
-
-import static org.junit.Assert.fail;
-
-public class BTest
-{
-    @Test
-    public void test()
-    {
-        fail();
-    }
-}
diff --git a/surefire-its/src/test/resources/junit5-runner/src/test/java/pkg/JUnit5Tests.java b/surefire-its/src/test/resources/junit5-runner/src/test/java/pkg/JUnit5Tests.java
deleted file mode 100644
index 4f2788a0f..000000000
--- a/surefire-its/src/test/resources/junit5-runner/src/test/java/pkg/JUnit5Tests.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package pkg;
-
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.platform.suite.api.ExcludeTags;
-import org.junit.platform.suite.api.IncludePackages;
-import org.junit.platform.suite.api.SelectPackages;
-import org.junit.runner.RunWith;
-
-@RunWith(JUnitPlatform.class)
-@SelectPackages("examples")
-@IncludePackages("examples.a")
-@ExcludeTags("PROD")
-public class JUnit5Tests {
-
-}
diff --git a/surefire-its/src/test/resources/large-test-results/pom.xml b/surefire-its/src/test/resources/large-test-results/pom.xml
deleted file mode 100644
index 43131e717..000000000
--- a/surefire-its/src/test/resources/large-test-results/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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>
-
-  <groupId>org.apache.maven.plugins.surefire</groupId>
-  <artifactId>large-test-results</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>Test for large test results</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <configuration>
-          <systemProperties>
-            <property><name>numTests</name><value>${numTests}</value></property>
-          </systemProperties>
-          <argLine>-Xmx1024m</argLine>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/surefire-its/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java b/surefire-its/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
deleted file mode 100644
index f2af9bbb8..000000000
--- a/surefire-its/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package largeTestResults;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
-    extends TestCase
-{
-
-    private final int number;
-
-    public BasicTest( String name, int number )
-    {
-        super( name );
-        this.number = number;
-    }
-
-    public static Test suite()
-    {
-        int tests = Integer.parseInt( System.getProperty( "numTests", "20" ) );
-        TestSuite suite = new TestSuite();
-        for ( int i = 0; i < tests; i++ )
-        {
-            if ( i % 4 == 0 )
-            {
-                suite.addTest( new BasicTest( "testPass", i ) );
-            }
-            else
-            {
-                suite.addTest( new BasicTest( "testFail", i ) );
-            }
-        }
-        return suite;
-    }
-
-    public void testFail()
-    {
-        fail( "failure " + number );
-    }
-
-    public void testPass()
-    {
-    }
-
-}
diff --git a/surefire-its/src/test/resources/parallel-runtime/pom.xml b/surefire-its/src/test/resources/parallel-runtime/pom.xml
deleted file mode 100644
index 33f2b59d1..000000000
--- a/surefire-its/src/test/resources/parallel-runtime/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<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>
-  <artifactId>parallel-runtime</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>parallel-runtime</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-    </dependency>
-  </dependencies>
-
-    <properties>
-      <parallel>classes</parallel>
-      <threadCount>3</threadCount>
-      <maven.compiler.source>1.8</maven.compiler.source>
-      <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
-  <build>
-     <plugins>
-        <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-surefire-plugin</artifactId>
-           <version>${surefire.version}</version>
-           <configuration>
-             <threadCount>${threadCount}</threadCount>
-             <perCoreThreadCount>false</perCoreThreadCount>
-             <parallel>${parallel}</parallel>
-             <includes>
-                <include>**/Test*.java</include>
-             </includes>
-           </configuration>
-        </plugin>
-     </plugins>
-  </build>
-</project>
diff --git a/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test1.java b/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test1.java
deleted file mode 100755
index 9de2c619a..000000000
--- a/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test1.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package runorder.parallel;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Test1
-{
-
-    public static final int ms = 5000;
-
-    static void sleep( int ms )
-    {
-        long target = System.currentTimeMillis() + ms;
-        try
-        {
-            do
-            {
-                Thread.sleep( ms );
-            } while ( System.currentTimeMillis() < target);
-        }
-        catch ( InterruptedException e )
-        {
-            throw new RuntimeException( e );
-        }
-    }
-
-    @Test
-    public void testSleep1()
-    {
-        Test1.sleep( ms );
-    }
-
-    @Test
-    public void testSleep2()
-    {
-        Test1.sleep( ms );
-    }
-
-    @Test
-    public void testSleep3()
-    {
-        Test1.sleep( ms );
-    }
-
-    @Test
-    public void testSleep4()
-    {
-        Test1.sleep( ms );
-    }
-}
diff --git a/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test2.java b/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test2.java
deleted file mode 100644
index 7d80983c0..000000000
--- a/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test2.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package runorder.parallel;
-
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Test2
-{
-
-    @Test
-    public void testSleep1()
-    {
-        Test1.sleep( Test1.ms );
-    }
-
-    @Test
-    public void testSleep2()
-    {
-        Test1.sleep( Test1.ms );
-    }
-
-    @Test
-    public void testSleep3()
-    {
-        Test1.sleep( Test1.ms );
-    }
-
-    @Test
-    public void testSleep4()
-    {
-        Test1.sleep( Test1.ms );
-    }
-
-}
diff --git a/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test3.java b/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test3.java
deleted file mode 100644
index 489f48223..000000000
--- a/surefire-its/src/test/resources/parallel-runtime/src/test/java/runorder/parallel/Test3.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package runorder.parallel;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Test3
-{
-    @Test
-    public void testSleep1()
-    {
-        Test1.sleep( Test1.ms );
-    }
-
-    @Test
-    public void testSleep2()
-    {
-        Test1.sleep( Test1.ms );
-    }
-
-    @Test
-    public void testSleep3()
-    {
-        Test1.sleep( Test1.ms );
-    }
-
-    @Test
-    public void testSleep4()
-    {
-        Test1.sleep( Test1.ms );
-    }
-
-}
diff --git a/surefire-its/src/test/resources/small-result-counting/pom.xml b/surefire-its/src/test/resources/small-result-counting/pom.xml
deleted file mode 100644
index 069f006ca..000000000
--- a/surefire-its/src/test/resources/small-result-counting/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<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>maven-surefire</groupId>
-  <artifactId>small-result-counting</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>small-result-counting</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <configuration>
-          <forkCount>${forkCount}</forkCount>
-          <reuseForks>${reuseForks}</reuseForks>
-          <includes>
-            <include>**/Test*.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <properties>
-    <junit.version>4.12</junit.version>
-    <forkCount>1</forkCount>
-    <reuseForks>true</reuseForks>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
-</project>
diff --git a/surefire-its/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java b/surefire-its/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java
deleted file mode 100644
index 18447da58..000000000
--- a/surefire-its/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test1.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package smallresultcounting;
-
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assume.assumeThat;
-
-public class Test1
-{
-    @Test
-    public void testWithFailingAssumption1()
-    {
-        assumeThat( 2, is( 3 ) );
-    }
-
-    @Test
-    public void testWithFailingAssumption2()
-    {
-        try
-        {
-            Thread.sleep( 150 );
-        }
-        catch ( InterruptedException ignore )
-        {
-        }
-
-        assumeThat( 2, is( 3 ) );
-    }
-
-    @Test
-    public void testWithFailingAssumption3()
-    {
-        assumeThat( 2, is( 3 ) );
-    }
-
-    @Test
-    public void testWithFailingAssumption4()
-    {
-        assumeThat( 2, is( 3 ) );
-    }
-
-    @Test
-    public void testWithFailingAssumption5()
-    {
-        assumeThat( 2, is( 3 ) );
-    }
-}
diff --git a/surefire-its/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java b/surefire-its/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java
deleted file mode 100644
index 009ac4b68..000000000
--- a/surefire-its/src/test/resources/small-result-counting/src/test/java/smallresultcounting/Test2.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package smallresultcounting;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static junit.framework.Assert.fail;
-
-/**
- * @author Kristian Rosenvold
- */
-public class Test2
-{
-    @Test
-    public void testiWithFail1()
-    {
-        fail( "We excpect this1" );
-    }
-
-    @Test
-    public void testWithException1()
-    {
-        System.out.println( "testWithException1 to stdout" );
-        System.err.println( "testWithException1 to stderr" );
-        throw new RuntimeException( "We expect this1-1" );
-    }
-
-    @Test
-    public void testWithException2()
-    {
-        throw new RuntimeException( "We expect this1-2" );
-    }
-
-
-    @Ignore( "We do this for a reason1" )
-    @Test
-    public void testWithIgnore1()
-    {
-    }
-
-    @Ignore( "We do this for a reason2" )
-    @Test
-    public void testWithIgnore2()
-    {
-    }
-
-    @Ignore
-    @Test
-    public void testWithIgnore3()
-    {
-    }
-
-    @Test
-    public void testAllok1()
-    {
-        System.out.println( "testAllok1 to stdout" );
-        System.err.println( "testAllok1 to stderr" );
-        try
-        {
-            Thread.sleep( 100 );
-        }
-        catch ( InterruptedException ignore )
-        {
-        }
-    }
-
-    @Test
-    public void testAllok2()
-    {
-    }
-
-    @Test
-    public void testAllok3()
-    {
-        try
-        {
-            Thread.sleep( 250 );
-        }
-        catch ( InterruptedException ignore )
-        {
-        }
-    }
-
-    @Test
-    public void testAllok4()
-    {
-    }
-
-}
diff --git a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
index 484ba4e91..de994e404 100644
--- a/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1209-rerun-and-forkcount/pom.xml
@@ -70,32 +70,4 @@
         </pluginManagement>
     </build>
 
-    <profiles>
-        <profile>
-            <id>junit47</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>junit4</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>
diff --git a/surefire-its/src/test/resources/surefire-772-no-reports/pom.xml b/surefire-its/src/test/resources/surefire-772-no-reports/pom.xml
deleted file mode 100644
index d2930eda2..000000000
--- a/surefire-its/src/test/resources/surefire-772-no-reports/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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>
-
-  <groupId>org.apache.maven.plugins.surefire</groupId>
-  <artifactId>junit-twoTestCases</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <name>Test for two test cases</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>3.1</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/surefire-its/src/test/resources/surefire-822-legal-JUnit4-descriptions/pom.xml b/surefire-its/src/test/resources/surefire-822-legal-JUnit4-descriptions/pom.xml
deleted file mode 100644
index 273b7f063..000000000
--- a/surefire-its/src/test/resources/surefire-822-legal-JUnit4-descriptions/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>surefire-testcase</groupId>
-  <artifactId>surefire-testcase</artifactId>
-  <version>1.0</version>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>1.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>pl.pragmatists</groupId>
-      <artifactId>JUnitParams</artifactId>
-      <version>0.4.0</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <configuration>
-          <parallel>both</parallel>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/surefire-its/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/JunitParamsTest.java b/surefire-its/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/JunitParamsTest.java
deleted file mode 100644
index 7c79d9696..000000000
--- a/surefire-its/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/JunitParamsTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package surefire.testcase;
-import java.util.Arrays;
-import java.util.Collection;
-
-import junitparams.JUnitParamsRunner;
-import junitparams.Parameters;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-/**
- * Surefire JunitParams test.
- */
-@RunWith( JUnitParamsRunner.class )
-public class JunitParamsTest
-{
-
-    @Parameters( method = "parameters" )
-    @Test
-    public void testSum( int a, int b, int expected )
-    {
-        assertThat( a + b, equalTo( expected ) );
-    }
-
-    public Collection<Integer[]> parameters()
-    {
-        Integer[][] parameters = { { 1, 2, 3 }, { 2, 3, 5 }, { 3, 4, 7 }, };
-        return Arrays.asList( parameters );
-    }
-}
diff --git a/surefire-its/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/NonJunitParamsTest.java b/surefire-its/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/NonJunitParamsTest.java
deleted file mode 100644
index a3ac5220c..000000000
--- a/surefire-its/src/test/resources/surefire-822-legal-JUnit4-descriptions/src/test/java/surefire/testcase/NonJunitParamsTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package surefire.testcase;
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-/**
- * Surefire non-JunitParams test.
- */
-public class NonJunitParamsTest
-{
-
-    @Test
-    public void testSum()
-    {
-        assertThat( 1 + 2, equalTo( 3 ) );
-    }
-}
diff --git a/surefire-its/src/test/resources/surefire-931-provider-failure/pom.xml b/surefire-its/src/test/resources/surefire-931-provider-failure/pom.xml
deleted file mode 100644
index ee4c05565..000000000
--- a/surefire-its/src/test/resources/surefire-931-provider-failure/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<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>com.mycompany</groupId>
-    <artifactId>TestFailed</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>TestFailed</name>
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
-            </plugin>        
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>6.14.3</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/surefire-its/src/test/resources/surefire-931-provider-failure/src/main/java/com/mycompany/testfailed/App.java b/surefire-its/src/test/resources/surefire-931-provider-failure/src/main/java/com/mycompany/testfailed/App.java
deleted file mode 100644
index 9a1c7104b..000000000
--- a/surefire-its/src/test/resources/surefire-931-provider-failure/src/main/java/com/mycompany/testfailed/App.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mycompany.testfailed;
-
-/*
- * 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.
- */
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}
diff --git a/surefire-its/src/test/resources/surefire-931-provider-failure/src/test/java/com/mycompany/testfailed/AppTest.java b/surefire-its/src/test/resources/surefire-931-provider-failure/src/test/java/com/mycompany/testfailed/AppTest.java
deleted file mode 100644
index 57c0d927a..000000000
--- a/surefire-its/src/test/resources/surefire-931-provider-failure/src/test/java/com/mycompany/testfailed/AppTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mycompany.testfailed;
-
-import junit.framework.TestCase;
-import org.testng.annotations.Test;
-
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    @Test(groups = "deleteLocation", dependsOnGroups =
-    {
-        "postLocation", "getLocation"
-    })
-    public void removeNonExistentLocation() {}
-}
diff --git a/surefire-its/src/test/resources/surefire-942-testngSuite/pom.xml b/surefire-its/src/test/resources/surefire-942-testngSuite/pom.xml
deleted file mode 100644
index 33a7ea226..000000000
--- a/surefire-its/src/test/resources/surefire-942-testngSuite/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>surefire-testng</groupId>
-  <artifactId>surefire-testng</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <version>6.14.3</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <configuration>
-          <suiteXmlFiles>
-            <suiteXmlFile>src/test/resources/config.xml</suiteXmlFile>
-          </suiteXmlFiles>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/surefire-its/src/test/resources/surefire-942-testngSuite/src/test/java/org/BasicTest.java b/surefire-its/src/test/resources/surefire-942-testngSuite/src/test/java/org/BasicTest.java
deleted file mode 100644
index a663ac5a3..000000000
--- a/surefire-its/src/test/resources/surefire-942-testngSuite/src/test/java/org/BasicTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org;
-
-import org.testng.annotations.*;
-import org.testng.Assert;
-
-public class BasicTest
-{
-
-    private boolean setUpCalled = false;
-
-
-    @BeforeTest
-    public void setUp()
-    {
-        setUpCalled = true;
-    }
-
-    @AfterTest
-    public void tearDown()
-    {
-        setUpCalled = false;
-    }
-
-    @Test
-    public void testSetUp()
-    {
-        Assert.assertTrue( setUpCalled );
-    }
-
-    @Test
-    public void testSuccessOne()
-    {
-        Assert.assertTrue( true );
-    }
-
-    @Test
-    public void testSuccessTwo()
-    {
-        Assert.assertTrue( true );
-    }
-
-    @AfterClass
-    public static void oneTimeTearDown()
-    {
-
-    }
-
-}
diff --git a/surefire-its/src/test/resources/surefire-942-testngSuite/src/test/resources/config.xml b/surefire-its/src/test/resources/surefire-942-testngSuite/src/test/resources/config.xml
deleted file mode 100644
index a92872ba0..000000000
--- a/surefire-its/src/test/resources/surefire-942-testngSuite/src/test/resources/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<suite name="tests" verbose="0">
-  <test name="tests">
-    <packages>
-      <package name="org.*"/>
-    </packages>
-  </test>
-</suite>
diff --git a/surefire-its/src/test/resources/webapp/pom.xml b/surefire-its/src/test/resources/webapp/pom.xml
deleted file mode 100644
index a107d314e..000000000
--- a/surefire-its/src/test/resources/webapp/pom.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<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.surefire.its</groupId>
-  <artifactId>webapp</artifactId>
-  <packaging>war</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>sample webapp with Jetty test</name>
-  <build>
-    <finalName>webapp</finalName>
-    <plugins>
-        <plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>${surefire.version}</version>
-           </plugin>
-  
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-war-plugin</artifactId>
-            <version>2.0</version>
-            <executions>
-                <execution>
-                    <phase>generate-test-resources</phase>
-                    <goals>
-                        <goal>exploded</goal>
-                    </goals>
-                    <configuration>
-                        <webappDirectory>${project.build.directory}/webapp</webappDirectory>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>jetty</groupId>
-      <artifactId>org.mortbay.jetty</artifactId>
-      <version>5.1.10</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-		<groupId>jetty</groupId>
-		<artifactId>jasper-compiler</artifactId>
-		<version>5.1.10</version>
-		<scope>test</scope>
-	</dependency>
-	<dependency>
-        <groupId>jetty</groupId>
-        <artifactId>jasper-runtime</artifactId>
-        <version>5.1.10</version>
-    </dependency>
-    <dependency>
-        <groupId>commons-beanutils</groupId>
-        <artifactId>commons-beanutils</artifactId>
-        <version>1.11.0</version>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>jsp-api</artifactId>
-        <version>2.0</version>
-    </dependency>
-    <dependency>
-        <groupId>ant</groupId>
-        <artifactId>ant</artifactId>
-        <version>1.6.5</version>
-    </dependency>
-    <dependency>
-        <groupId>commons-el</groupId>
-        <artifactId>commons-el</artifactId>
-        <version>1.0</version>
-    </dependency>
-  </dependencies>
-  
-  <profiles>
-    <profile>
-      <id>default-tools.jar</id>
-      <activation>
-        <property>
-          <name>java.vendor</name>
-          <value>Sun Microsystems Inc.</value>
-       </property>
-     </activation>
-      <dependencies>
-        <dependency>
-          <groupId>com.sun</groupId>
-          <artifactId>tools</artifactId>
-          <version>system</version>
-          <scope>system</scope>
-          <systemPath>${java.home}/../lib/tools.jar</systemPath>
-       </dependency>
-     </dependencies>
-   </profile>
-  </profiles>
-</project>
diff --git a/surefire-its/src/test/resources/webapp/src/main/webapp/WEB-INF/web.xml b/surefire-its/src/test/resources/webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 9f88c1f96..000000000
--- a/surefire-its/src/test/resources/webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
-
-<web-app>
-  <display-name>Archetype Created Web Application</display-name>
-</web-app>
diff --git a/surefire-its/src/test/resources/webapp/src/main/webapp/index.jsp b/surefire-its/src/test/resources/webapp/src/main/webapp/index.jsp
deleted file mode 100644
index c38169bb9..000000000
--- a/surefire-its/src/test/resources/webapp/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-<h2>Hello World!</h2>
-</body>
-</html>
diff --git a/surefire-its/src/test/resources/webapp/src/test/java/WebAppTest.java b/surefire-its/src/test/resources/webapp/src/test/java/WebAppTest.java
deleted file mode 100644
index a71edeb90..000000000
--- a/surefire-its/src/test/resources/webapp/src/test/java/WebAppTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-import java.io.InputStream;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.mortbay.jetty.Server;
-
-
-public class WebAppTest
-    extends TestCase
-{
-    private Server server = null;
-
-    public void setUp()
-        throws Exception
-    {
-        System.setProperty( "org.mortbay.xml.XmlParser.NotValidating", "true" );
-
-        server = new Server();
-        String testPort = ":18080";
-        server.addListener( testPort );
-        server.addWebApplication( "127.0.0.1", "/webapp", "target/webapp" );
-
-        server.start();
-    }
-
-    public void testBlah()
-        throws Exception
-    {
-        URL url = new URL( "http://127.0.0.1:18080/webapp/index.jsp" );
-        InputStream stream = url.openStream();
-        StringBuffer sb = new StringBuffer();
-        for ( int i = stream.read(); i != -1; i = stream.read() )
-        {
-            sb.append( (char) i );
-        }
-        String value = sb.toString();
-        assertTrue( value, value.contains( "Hello" ) );
-    }
-
-    public void tearDown()
-        throws Exception
-    {
-        if ( server != null )
-            server.stop();
-    }
-}