You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/02/18 22:43:35 UTC

[maven-integration-testing] branch MNG-7699 created (now 621355de4)

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

michaelo pushed a change to branch MNG-7699
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git


      at 621355de4 [MNG-7699] Remove all Maven 3.9.0+ ITs from maven-3.8.x branch

This branch includes the following new commits:

     new 621355de4 [MNG-7699] Remove all Maven 3.9.0+ ITs from maven-3.8.x branch

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-integration-testing] 01/01: [MNG-7699] Remove all Maven 3.9.0+ ITs from maven-3.8.x branch

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

michaelo pushed a commit to branch MNG-7699
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git

commit 621355de4cde27cf84f0c9ecb53fe01d44aa2619
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Feb 18 23:27:05 2023 +0100

    [MNG-7699] Remove all Maven 3.9.0+ ITs from maven-3.8.x branch
    
    This closes #243
---
 .../org/apache/maven/it/IntegrationTestSuite.java  |  28 --
 .../it/MavenITmng3991ValidDependencyScopeTest.java |  70 -----
 ...nITmng4262MakeLikeReactorDottedPath370Test.java |  95 -------
 ...avenITmng4262MakeLikeReactorDottedPathTest.java |  95 -------
 ...463DependencyManagementImportVersionRanges.java | 110 --------
 .../it/MavenITmng4660OutdatedPackagedArtifact.java | 176 ------------
 .../maven/it/MavenITmng4660ResumeFromTest.java     | 116 --------
 .../maven/it/MavenITmng5222MojoDeprecatedTest.java | 264 ------------------
 .../maven/it/MavenITmng5669ReadPomsOnce.java       | 156 -----------
 .../maven/it/MavenITmng5760ResumeFeatureTest.java  | 306 ---------------------
 .../maven/it/MavenITmng6065FailOnSeverityTest.java |  82 ------
 .../it/MavenITmng6118SubmoduleInvocation.java      | 118 --------
 ...MavenITmng6511OptionalProjectSelectionTest.java | 109 --------
 .../it/MavenITmng6562WarnDefaultBindings.java      | 140 ----------
 ...ecuteAnnotationShouldNotReExecuteGoalsTest.java | 104 -------
 .../maven/it/MavenITmng6656BuildConsumer.java      |  98 -------
 .../maven/it/MavenITmng6957BuildConsumer.java      | 104 -------
 ...ng6981ProjectListShouldIncludeChildrenTest.java |  69 -----
 ...avenITmng7051OptionalProfileActivationTest.java | 137 ---------
 ...MavenITmng7112ProjectsWithNonRecursiveTest.java |  78 ------
 ...MavenITmng7244IgnorePomPrefixInExpressions.java |  57 ----
 .../MavenITmng7390SelectModuleOutsideCwdTest.java  | 131 ---------
 ...enITmng7404IgnorePrefixlessExpressionsTest.java |  57 ----
 ...nsistencyOfOptionalProjectsAndProfilesTest.java |  74 -----
 ...ITmng7464ReadOnlyMojoParametersWarningTest.java | 138 ----------
 ...nITmng7468UnsupportedPluginsParametersTest.java | 183 ------------
 .../it/MavenITmng7470ResolverTransportTest.java    | 112 --------
 .../maven/it/MavenITmng7474SessionScopeTest.java   |  54 ----
 ...mng7504NotWarnUnsupportedReportPluginsTest.java |  61 ----
 core-it-suite/src/test/resources/mng-3991/pom.xml  |  43 ---
 .../src/test/resources/mng-4262/parent/pom.xml     |  61 ----
 .../src/test/resources/mng-4262/sub-a/pom.xml      |  38 ---
 .../mng-4463/exclusive-upper-bound/pom.xml         |  76 -----
 .../mng-4463/inclusive-upper-bound/pom.xml         |  76 -----
 .../test/resources/mng-4463/no-upper-bound/pom.xml |  54 ----
 .../module-a/pom.xml                               |  46 ----
 .../src/main/java/org/apache/maven/it/Example.java |  24 --
 .../module-b/pom.xml                               |  54 ----
 .../java/org/apache/maven/it/AnotherExample.java   |  28 --
 .../test/java/org/apache/maven/it/TestCase.java    |  31 ---
 .../mng-4660-outdated-packaged-artifact/pom.xml    |  59 ----
 .../mng-4660-resume-from/module-a/pom.xml          |  46 ----
 .../src/main/java/org/apache/maven/it/Example.java |  24 --
 .../mng-4660-resume-from/module-b/pom.xml          |  54 ----
 .../java/org/apache/maven/it/AnotherExample.java   |  28 --
 .../test/java/org/apache/maven/it/TestCase.java    |  34 ---
 .../test/resources/mng-4660-resume-from/pom.xml    |  59 ----
 .../mng-5222-mojo-deprecated-params/pom.xml        | 105 -------
 .../mng-5669-read-poms-once/.mvn/jvm.config        |   1 -
 .../mng-5669-read-poms-once/module1/pom.xml        |  32 ---
 .../mng-5669-read-poms-once/module2/pom.xml        |  39 ---
 .../mng-5669-read-poms-once/module3/pom.xml        |  40 ---
 .../test/resources/mng-5669-read-poms-once/pom.xml |  63 -----
 .../four-modules/module-a/pom.xml                  |  46 ----
 .../test/java/org/apache/maven/it/TestCase.java    |  37 ---
 .../four-modules/module-b/pom.xml                  |  46 ----
 .../test/java/org/apache/maven/it/TestCase.java    |  37 ---
 .../four-modules/module-c/pom.xml                  |  54 ----
 .../test/java/org/apache/maven/it/TestCase.java    |  37 ---
 .../four-modules/module-d/pom.xml                  |  54 ----
 .../test/java/org/apache/maven/it/TestCase.java    |  37 ---
 .../mng-5760-resume-feature/four-modules/pom.xml   |  60 ----
 .../mng-5760-resume-feature/no-project/.gitkeep    |   0
 .../parent-dependent/module-a/pom.xml              |  46 ----
 .../test/java/org/apache/maven/it/TestCase.java    |  36 ---
 .../parent-dependent/module-b/pom.xml              |  46 ----
 .../test/java/org/apache/maven/it/TestCase.java    |  36 ---
 .../parent-dependent/module-c/pom.xml              |  54 ----
 .../test/java/org/apache/maven/it/TestCase.java    |  36 ---
 .../parent-dependent/pom.xml                       |  59 ----
 .../parent-independent/module-a/pom.xml            |  51 ----
 .../test/java/org/apache/maven/it/TestCase.java    |  36 ---
 .../parent-independent/module-b/pom.xml            |  51 ----
 .../test/java/org/apache/maven/it/TestCase.java    |  36 ---
 .../parent-independent/pom.xml                     |  49 ----
 .../resources/mng-6065-fail-on-severity/pom.xml    |  35 ---
 .../.mvn/.gitkeep                                  |   0
 .../app/pom.xml                                    |  45 ---
 .../src/main/java/org/apache/its/mng6118/App.java  |  29 --
 .../test/java/org/apache/its/mng6118/AppTest.java  |  33 ---
 .../lib/pom.xml                                    |  41 ---
 .../main/java/org/apache/its/mng6118/Helper.java   |  28 --
 .../java/org/apache/its/mng6118/HelperTest.java    |  37 ---
 .../pom.xml                                        |  82 ------
 .../.mvn/.gitkeep                                  |   0
 .../existing-module/pom.xml                        |  56 ----
 .../src/main/java/org/apache/its/mng6511/App.java  |  28 --
 .../mng-6511-optional-project-selection/pom.xml    |  65 -----
 .../consumer/pom.xml                               |  54 ----
 .../plugin/pom.xml                                 |  52 ----
 .../java/testmojo/RequiresCompilePhaseMojo.java    |  37 ---
 .../mng-6656-buildconsumer/expected/parent.pom     |  32 ---
 .../expected/simple-parent.pom                     |  46 ----
 .../expected/simple-weather.pom                    |  34 ---
 .../expected/simple-webapp.pom                     |  51 ----
 .../test/resources/mng-6656-buildconsumer/pom.xml  |  36 ---
 .../mng-6656-buildconsumer/simple-parent/pom.xml   |  50 ----
 .../simple-parent/simple-weather/pom.xml           |  35 ---
 .../simple-parent/simple-webapp/pom.xml            |  51 ----
 .../mng-6957-buildconsumer/expected/parent.pom     |  32 ---
 .../expected/simple-parent.pom                     |  47 ----
 .../expected/simple-testutils.pom                  |  30 --
 .../expected/simple-weather.pom                    |  43 ---
 .../expected/simple-webapp.pom                     |  51 ----
 .../expected/utils-parent.pom                      |  31 ---
 .../test/resources/mng-6957-buildconsumer/pom.xml  |  36 ---
 .../mng-6957-buildconsumer/simple-parent/pom.xml   |  56 ----
 .../simple-parent/simple-testutils/pom.xml         |  32 ---
 .../simple-parent/simple-weather/pom.xml           |  43 ---
 .../simple-parent/simple-webapp/pom.xml            |  51 ----
 .../simple-parent/utils-parent/pom.xml             |  32 ---
 .../module-a/module-a-1/pom.xml                    |  36 ---
 .../module-a/pom.xml                               |  42 ---
 .../mng-6981-pl-should-include-children/pom.xml    |  48 ----
 .../mng-7051-optional-profile-activation/pom.xml   |  37 ---
 .../aggregator-a/module-a/pom.xml                  |  44 ---
 .../aggregator-a/pom.xml                           |  50 ----
 .../aggregator-b/module-b/pom.xml                  |  44 ---
 .../aggregator-b/pom.xml                           |  50 ----
 .../mng-7112-projects-with-non-recursive/pom.xml   |  73 -----
 .../pom.xml                                        |  12 -
 .../module-a/pom.xml                               |  34 ---
 .../module-b/pom.xml                               |  34 ---
 .../mng-7390-pl-outside-cwd-no-dotmvn/pom.xml      |  70 -----
 .../mng-7390-pl-outside-cwd/.mvn/.gitkeep          |   0
 .../mng-7390-pl-outside-cwd/module-a/pom.xml       |  34 ---
 .../mng-7390-pl-outside-cwd/module-b/pom.xml       |  34 ---
 .../test/resources/mng-7390-pl-outside-cwd/pom.xml |  70 -----
 .../mng-7404-ignore-prefixless-expressions/pom.xml |  12 -
 .../pom.xml                                        |  36 ---
 .../mng-7464-mojo-read-only-params/pom.xml         |  79 ------
 .../config-build-execution/pom.xml                 |  57 ----
 .../config-build-mixed/pom.xml                     |  59 ----
 .../config-build-plugin/pom.xml                    |  57 ----
 .../config-plugin-management-parent/module/pom.xml |  55 ----
 .../config-plugin-management-parent/pom.xml        |  54 ----
 .../config-plugin-management/pom.xml               |  69 -----
 .../config-with-fork-goal/pom.xml                  |  59 ----
 .../mng-7468-unsupported-params/no-config/pom.xml  |  51 ----
 .../valid-parameter-alias/pom.xml                  |  54 ----
 .../valid-parameter-other-goal/pom.xml             |  54 ----
 .../valid-parameter/pom.xml                        |  54 ----
 .../mng-7470-resolver-transport/project/pom.xml    |  61 ----
 .../project/settings-template.xml                  |  52 ----
 .../repo/.gitattributes                            |   3 -
 .../dependency/1.0/dependency-1.0.jar              | Bin 2045 -> 0 bytes
 .../dependency/1.0/dependency-1.0.jar.sha1         |   1 -
 .../dependency/1.0/dependency-1.0.pom              |  34 ---
 .../dependency/1.0/dependency-1.0.pom.sha1         |   1 -
 .../1.7.3/resolver-demo-maven-plugin-1.7.3.jar     | Bin 11819 -> 0 bytes
 .../resolver-demo-maven-plugin-1.7.3.jar.sha1      |   1 -
 .../1.7.3/resolver-demo-maven-plugin-1.7.3.pom     | 102 -------
 .../resolver-demo-maven-plugin-1.7.3.pom.sha1      |   1 -
 .../mng-7474-session-scope/plugin/pom.xml          |  59 ----
 .../apache/maven/its/mng7474/TestComponent.java    |  40 ---
 .../org/apache/maven/its/mng7474/TestMojo.java     |  44 ---
 .../mng-7474-session-scope/project/pom.xml         |  15 -
 .../project/project-a/pom.xml                      |  34 ---
 .../project/project-b/pom.xml                      |  34 ---
 .../pom.xml                                        |  28 --
 core-it-support/core-it-javaagent/pom.xml          |  79 ------
 .../maven/coreits/javaagent/mng5669/Premain.java   | 109 --------
 core-it-support/pom.xml                            |   1 -
 163 files changed, 8983 deletions(-)

diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index ff2353bce..9bbabdef0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -107,42 +107,23 @@ public class IntegrationTestSuite
         // -------------------------------------------------------------------------------------------------------------
         // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
         suite.addTestSuite( MavenITmng7568SettingsProfileDeactivationTest.class );
-        suite.addTestSuite( MavenITmng7474SessionScopeTest.class );
         suite.addTestSuite( MavenITmng7529VersionRangeRepositorySelection.class );
-        suite.addTestSuite( MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.class );
         suite.addTestSuite( MavenITmng7353CliGoalInvocationTest.class );
-        suite.addTestSuite( MavenITmng7504NotWarnUnsupportedReportPluginsTest.class );
         suite.addTestSuite( MavenITmng7160ExtensionClassloader.class );
-        suite.addTestSuite( MavenITmng7468UnsupportedPluginsParametersTest.class );
         suite.addTestSuite( MavenITmng7487DeadlockTest.class );
-        suite.addTestSuite( MavenITmng7470ResolverTransportTest.class );
-        suite.addTestSuite( MavenITmng7464ReadOnlyMojoParametersWarningTest.class );
-        suite.addTestSuite( MavenITmng7404IgnorePrefixlessExpressionsTest.class );
-        suite.addTestSuite( MavenITmng5222MojoDeprecatedTest.class );
-        suite.addTestSuite( MavenITmng7390SelectModuleOutsideCwdTest.class );
-        suite.addTestSuite( MavenITmng7244IgnorePomPrefixInExpressions.class );
         suite.addTestSuite( MavenITmng7349RelocationWarningTest.class );
         suite.addTestSuite( MavenITmng6326CoreExtensionsNotFoundTest.class );
         suite.addTestSuite( MavenITmng5561PluginRelocationLosesConfigurationTest.class );
         suite.addTestSuite( MavenITmng7335MissingJarInParallelBuild.class );
-        suite.addTestSuite( MavenITmng4463DependencyManagementImportVersionRanges.class );
-        suite.addTestSuite( MavenITmng7112ProjectsWithNonRecursiveTest.class );
         suite.addTestSuite( MavenITmng7128BlockExternalHttpReactorTest.class );
-        suite.addTestSuite( MavenITmng6511OptionalProjectSelectionTest.class );
         suite.addTestSuite( MavenITmng7110ExtensionClassloader.class );
-        suite.addTestSuite( MavenITmng7051OptionalProfileActivationTest.class );
-        suite.addTestSuite( MavenITmng6957BuildConsumer.class );
         suite.addTestSuite( MavenITmng7045DropUselessAndOutdatedCdiApiTest.class );
-        suite.addTestSuite( MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.class );
         suite.addTestSuite( MavenITmng6754TimestampInMultimoduleProject.class );
-        suite.addTestSuite( MavenITmng6981ProjectListShouldIncludeChildrenTest.class );
         suite.addTestSuite( MavenITmng6972AllowAccessToGraphPackageTest.class );
         // This IT has been disabled until it is decided how the solution shall look like
         // suite.addTestSuite( MavenITmng6772NestedImportScopeRepositoryOverride.class );
         suite.addTestSuite( MavenITmng6759TransitiveDependencyRepositoriesTest.class );
         suite.addTestSuite( MavenITmng6720FailFastTest.class );
-        suite.addTestSuite( MavenITmng6656BuildConsumer.class );
-        suite.addTestSuite( MavenITmng6562WarnDefaultBindings.class );
         suite.addTestSuite( MavenITmng6558ToolchainsBuildingEventTest.class );
         suite.addTestSuite( MavenITmng6506PackageAnnotationTest.class );
         suite.addTestSuite( MavenITmng6391PrintVersionTest.class );
@@ -158,11 +139,9 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng6173GetProjectsAndDependencyGraphTest.class );
         suite.addTestSuite( MavenITmng6173GetAllProjectsInReactorTest.class );
         suite.addTestSuite( MavenITmng6127PluginExecutionConfigurationInterferenceTest.class );
-        suite.addTestSuite( MavenITmng6118SubmoduleInvocation.class );
         suite.addTestSuite( MavenITmng6090CIFriendlyTest.class );
         suite.addTestSuite( MavenITmng6084Jsr250PluginTest.class );
         suite.addTestSuite( MavenITmng6071GetResourceWithCustomPom.class );
-        suite.addTestSuite( MavenITmng6065FailOnSeverityTest.class );
         suite.addTestSuite( MavenITmng6057CheckReactorOrderTest.class );
         suite.addTestSuite( MavenITmng5965ParallelBuildMultipliesWorkTest.class );
         suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );
@@ -179,11 +158,9 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng5774ConfigurationProcessorsTest.class );
         suite.addTestSuite( MavenITmng5771CoreExtensionsTest.class );
         suite.addTestSuite( MavenITmng5768CliExecutionIdTest.class );
-        suite.addTestSuite( MavenITmng5760ResumeFeatureTest.class );
         suite.addTestSuite( MavenITmng5753CustomMojoExecutionConfiguratorTest.class );
         suite.addTestSuite( MavenITmng5742BuildExtensionClassloaderTest.class );
         suite.addTestSuite( MavenITmng5716ToolchainsTypeTest.class );
-        suite.addTestSuite( MavenITmng5669ReadPomsOnce.class );
         suite.addTestSuite( MavenITmng5663NestedImportScopePomResolutionTest.class );
         suite.addTestSuite( MavenITmng5640LifecycleParticipantAfterSessionEnd.class );
         suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class );
@@ -271,8 +248,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng4679SnapshotUpdateInPluginTest.class );
         suite.addTestSuite( MavenITmng4677DisabledPluginConfigInheritanceTest.class );
         suite.addTestSuite( MavenITmng4666CoreRealmImportTest.class );
-        suite.addTestSuite( MavenITmng4660ResumeFromTest.class );
-        suite.addTestSuite( MavenITmng4660OutdatedPackagedArtifact.class );
         suite.addTestSuite( MavenITmng4654ArtifactHandlerForMainArtifactTest.class );
         suite.addTestSuite( MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.class );
         // suite.addTestSuite( MavenITmng4633DualCompilerExecutionsWeaveModeTest.class );
@@ -387,8 +362,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng4273RestrictedCoreRealmAccessForPluginTest.class );
         suite.addTestSuite( MavenITmng4270ArtifactHandlersFromPluginDepsTest.class );
         suite.addTestSuite( MavenITmng4269BadReactorResolutionFromOutDirTest.class );
-        suite.addTestSuite( MavenITmng4262MakeLikeReactorDottedPathTest.class );
-        suite.addTestSuite( MavenITmng4262MakeLikeReactorDottedPath370Test.class );
         suite.addTestSuite( MavenITmng4254SelectableWagonProvidersTest.class );
         suite.addTestSuite( MavenITmng4238ArtifactHandlerExtensionUsageTest.class );
         suite.addTestSuite( MavenITmng4235HttpAuthDeploymentChecksumsTest.class );
@@ -438,7 +411,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng4005UniqueDependencyKeyTest.class );
         suite.addTestSuite( MavenITmng4000MultiPluginExecutionsTest.class );
         suite.addTestSuite( MavenITmng3998PluginExecutionConfigTest.class );
-        suite.addTestSuite( MavenITmng3991ValidDependencyScopeTest.class );
         suite.addTestSuite( MavenITmng3983PluginResolutionFromProfileReposTest.class );
         suite.addTestSuite( MavenITmng3979ElementJoinTest.class );
         suite.addTestSuite( MavenITmng3974MirrorOrderingTest.class );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java
deleted file mode 100644
index 24c6b90b5..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3991">MNG-3991</a>.
- *
- * @author Benjamin Bentmann
- */
-public class MavenITmng3991ValidDependencyScopeTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng3991ValidDependencyScopeTest()
-    {
-        // TODO: One day, we should be able to error out but this requires to consider extensions and their use cases
-        super( "[4.0,)" );
-    }
-
-    /**
-     * Test that invalid dependency scopes cause a validation error during building.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testit()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3991" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        try
-        {
-            verifier.executeGoal( "validate" );
-            verifier.verifyErrorFreeLog();
-            fail( "Invalid dependency scope did not cause validation error" );
-        }
-        catch ( VerificationException e )
-        {
-            // expected
-        }
-        finally
-        {
-            verifier.resetStreams();
-        }
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java
deleted file mode 100644
index f5bfee982..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4262">MNG-4262</a>.
- *
- * @author Benjamin Bentmann
- */
-public class MavenITmng4262MakeLikeReactorDottedPath370Test
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng4262MakeLikeReactorDottedPath370Test()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    private void clean( Verifier verifier )
-        throws Exception
-    {
-        verifier.deleteDirectory( "target" );
-        verifier.deleteDirectory( "../sub-a/target" );
-    }
-
-    /**
-     * Verify that the project list can select the root project by its relative path ".".
-     *
-     * @throws Exception in case of failure
-     */
-    public void testitMakeRoot()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4262" );
-
-        Verifier verifier = newVerifier( new File( testDir, "parent" ).getAbsolutePath() );
-        verifier.setAutoclean( false );
-        clean( verifier );
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( "." );
-        verifier.setLogFileName( "log-root.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.verifyFilePresent( "target/touch.txt" );
-        verifier.verifyFilePresent( "../sub-a/target/touch.txt" );
-    }
-
-    /**
-     * Verify that the project list can select a submodule by a relative path like {@code "../<something>"}.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testitMakeModule()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4262" );
-
-        Verifier verifier = newVerifier( new File( testDir, "parent" ).getAbsolutePath() );
-        verifier.setAutoclean( false );
-        clean( verifier );
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( "../sub-a" );
-        verifier.setLogFileName( "log-module.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.verifyFileNotPresent( "target/touch.txt" );
-        verifier.verifyFilePresent( "../sub-a/target/touch.txt" );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java
deleted file mode 100644
index 5bd96b036..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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 java.io.File;
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4262">MNG-4262</a>.
- *
- * @author Benjamin Bentmann
- */
-public class MavenITmng4262MakeLikeReactorDottedPathTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng4262MakeLikeReactorDottedPathTest()
-    {
-        super( "[3.0-alpha-3,4.0.0-alpha-1)" );
-    }
-
-    private void clean( Verifier verifier )
-        throws Exception
-    {
-        verifier.deleteDirectory( "target" );
-        verifier.deleteDirectory( "../sub-a/target" );
-    }
-
-    /**
-     * Verify that the project list can select the root project by its relative path ".".
-     *
-     * @throws Exception in case of failure
-     */
-    public void testitMakeRoot()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4262" );
-
-        Verifier verifier = newVerifier( new File( testDir, "parent" ).getAbsolutePath() );
-        verifier.setAutoclean( false );
-        clean( verifier );
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( "." );
-        verifier.setLogFileName( "log-root.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.verifyFilePresent( "target/touch.txt" );
-        verifier.verifyFileNotPresent( "../sub-a/target/touch.txt" );
-    }
-
-    /**
-     * Verify that the project list can select a submodule by a relative path like {@code "../<something>"}.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testitMakeModule()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4262" );
-
-        Verifier verifier = newVerifier( new File( testDir, "parent" ).getAbsolutePath() );
-        verifier.setAutoclean( false );
-        clean( verifier );
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( "../sub-a" );
-        verifier.setLogFileName( "log-module.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.verifyFileNotPresent( "target/touch.txt" );
-        verifier.verifyFilePresent( "../sub-a/target/touch.txt" );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
deleted file mode 100644
index 1493d4350..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java
+++ /dev/null
@@ -1,110 +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.
- */
-package org.apache.maven.it;
-
-import java.io.File;
-import java.util.List;
-import java.util.regex.Pattern;
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * Integration tests for <a href="https://issues.apache.org/jira/browse/MNG-4463">MNG-4463</a>.
- *
- * @author Christian Schulte
- */
-public class MavenITmng4463DependencyManagementImportVersionRanges
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng4463DependencyManagementImportVersionRanges()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    public void testInclusiveUpperBoundResolvesToHighestVersion()
-        throws Exception
-    {
-        final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4463/inclusive-upper-bound" );
-        final Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        final List<String> artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
-        assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven:maven-plugin-api:jar:3.0" ) );
-    }
-
-    public void testExclusiveUpperBoundResolvesToHighestVersion()
-        throws Exception
-    {
-        final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4463/exclusive-upper-bound" );
-        final Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        List<String> artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
-        assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven:maven-plugin-api:jar:3.0" ) );
-    }
-
-    public void testFailureWithoutUpperBound()
-        throws Exception
-    {
-        final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4463/no-upper-bound" );
-        final Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
-
-        try
-        {
-            verifier.setAutoclean( false );
-            verifier.deleteDirectory( "target" );
-            verifier.executeGoal( "validate" );
-            fail( "Expected 'VerificationException' not thrown." );
-        }
-        catch ( final VerificationException e )
-        {
-            final List<String> lines = verifier.loadFile( new File( testDir, "log.txt" ), false );
-            assertTrue( "Expected error message not found.",
-                        indexOf( lines, ".*dependency version range.*does not specify an upper bound.*" ) >= 0 );
-        }
-        finally
-        {
-            verifier.resetStreams();
-        }
-    }
-
-    private static int indexOf( final List<String> logLines, final String regex )
-    {
-        final Pattern pattern = Pattern.compile( regex );
-
-        for ( int i = 0, l0 = logLines.size(); i < l0; i++ )
-        {
-            if ( pattern.matcher( logLines.get( i ) ).matches() )
-            {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
deleted file mode 100644
index 7f76bf38d..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.shared.utils.io.FileUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.FileVisitResult;
-import java.nio.file.FileVisitor;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.attribute.BasicFileAttributes;
-
-import static org.junit.Assert.assertThat;
-import static org.hamcrest.Matchers.greaterThan;
-
-import static java.nio.file.FileVisitResult.CONTINUE;
-
-/**
- * This is a test case for a new check introduced with <a href="https://issues.apache.org/jira/browse/MNG-4660">MNG-4660</a>.
- * That check verifies if a packaged artifact within the Reactor is up-to-date with the outputDirectory of the same project.
- *
- * @author Maarten Mulders
- * @author Martin Kanters
- */
-public class MavenITmng4660OutdatedPackagedArtifact extends AbstractMavenIntegrationTestCase {
-    public MavenITmng4660OutdatedPackagedArtifact()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    /**
-     * Test that Maven logs a warning when a packaged artifact is found that is older than the outputDirectory of the
-     * same artifact.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testShouldWarnWhenPackagedArtifactIsOutdated() throws Exception
-    {
-        final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4660-outdated-packaged-artifact" );
-
-        // 1. Package the whole project
-        final Verifier verifier1 = newVerifier( testDir.getAbsolutePath() );
-        verifier1.deleteDirectory( "target" );
-        verifier1.deleteArtifacts( "org.apache.maven.its.mng4660" );
-
-        verifier1.executeGoal( "package" );
-
-        Path module1Jar = testDir.toPath().resolve( "module-a/target/module-a-1.0.jar" ).toAbsolutePath();
-        verifier1.verifyErrorFreeLog();
-        verifier1.verifyFilePresent( module1Jar.toString() );
-        verifier1.resetStreams();
-
-        if ( System.getProperty( "java.version", "" ).startsWith( "1." ) )
-        {
-            // Simulating the delay between two invocations. It also makes sure we're not hit by tests that run so fast,
-            // that the difference in file modification time (see below) is too small to observe. Java 8 on Linux and
-            // macOS returns that value with "just" second precision, which is not detailed enough.
-            Thread.sleep( 1_000 );
-        }
-
-        // 2. Create a properties file with some content and compile only that module (module A).
-        final Verifier verifier2 = newVerifier( testDir.getAbsolutePath() );
-        final Path resourcesDirectory = Files.createDirectories( Paths.get( testDir.toString(), "module-a", "src", "main", "resources" ) );
-        final Path fileToWrite = resourcesDirectory.resolve( "example.properties" );
-        FileUtils.fileWrite( fileToWrite.toString(), "x=42" );
-
-        verifier2.setAutoclean( false );
-        verifier2.addCliOption( "--projects" );
-        verifier2.addCliOption( ":module-a" );
-        verifier2.executeGoal( "compile" );
-
-        Path module1PropertiesFile = testDir.toPath().resolve( "module-a/target/classes/example.properties" )
-                .toAbsolutePath();
-
-        verifier2.verifyFilePresent( module1PropertiesFile.toString() );
-        assertThat( Files.getLastModifiedTime( module1PropertiesFile ),
-                greaterThan ( Files.getLastModifiedTime( module1Jar ) ) );
-
-        Path module1Class = testDir.toPath().resolve( "module-a/target/classes/org/apache/maven/it/Example.class" )
-                        .toAbsolutePath();
-        verifier2.verifyErrorFreeLog();
-        verifier2.verifyFilePresent( module1Class.toString() );
-        verifier2.resetStreams();
-
-        // 3. Resume project build from module B, that depends on module A we just touched. Its packaged artifact
-        // is no longer in sync with its compiled artifacts.
-        final Verifier verifier3 = newVerifier( testDir.getAbsolutePath() );
-        verifier3.setAutoclean( false );
-        verifier3.addCliOption( "--resume-from" );
-        verifier3.addCliOption( ":module-b" );
-        verifier3.executeGoal( "compile" );
-
-        verifier3.verifyErrorFreeLog();
-        try
-        {
-            verifier3.verifyTextInLog( "File '"
-                    + Paths.get( "module-a", "target", "classes", "example.properties" )
-                    + "' is more recent than the packaged artifact for 'module-a'; "
-                    + "using '"
-                    + Paths.get( "module-a", "target","classes" )
-                    + "' instead"
-            );
-        }
-        catch ( VerificationException e )
-        {
-            final StringBuilder message = new StringBuilder( e.getMessage() );
-            message.append( System.lineSeparator() );
-
-            message.append( "  " )
-                    .append( module1Jar.toAbsolutePath() )
-                    .append( " -> " )
-                    .append( Files.getLastModifiedTime( module1Jar ) )
-                    .append( System.lineSeparator() );
-
-            message.append( System.lineSeparator() );
-
-            Path outputDirectory = Paths.get( testDir.toString(), "module-a", "target",  "classes" );
-
-            Files.walkFileTree( outputDirectory, new FileVisitor<Path>()
-            {
-                @Override
-                public FileVisitResult preVisitDirectory( Path dir, BasicFileAttributes attrs )
-                {
-                    return CONTINUE;
-                }
-
-                @Override
-                public FileVisitResult visitFile( Path file, BasicFileAttributes attrs )
-                {
-                    message.append( "  " )
-                            .append( file.toAbsolutePath() )
-                            .append( " -> " )
-                            .append( attrs.lastModifiedTime() )
-                            .append( System.lineSeparator() );
-                    return CONTINUE;
-                }
-
-                @Override
-                public FileVisitResult visitFileFailed( Path file, IOException exc )
-                {
-                    return CONTINUE;
-                }
-
-                @Override
-                public FileVisitResult postVisitDirectory( Path dir, IOException exc )
-                {
-                    return CONTINUE;
-                }
-            } );
-
-            throw new VerificationException( message.toString(), e.getCause() );
-        }
-        verifier3.resetStreams();
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
deleted file mode 100644
index 8ba0920b8..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * This is a test case for <a href="https://issues.apache.org/jira/browse/MNG-4660">MNG-4660</a>.
- *
- * @author Maarten Mulders
- * @author Martin Kanters
- */
-public class MavenITmng4660ResumeFromTest extends AbstractMavenIntegrationTestCase {
-    public MavenITmng4660ResumeFromTest()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    /**
-     * Test that the --resume-from flag resolves dependencies inside the same Maven project
-     * without having them installed first.
-     * This test case uses the target/classes directory of module-a, for the situation where
-     * module-a has not been packaged.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testShouldResolveOutputDirectoryFromEarlierBuild() throws Exception
-    {
-        final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4660-resume-from" );
-
-        final Verifier verifier1 = newVerifier( testDir.getAbsolutePath() );
-        verifier1.deleteDirectory( "target" );
-        verifier1.deleteArtifacts( "org.apache.maven.its.mng4660" );
-
-        try
-        {
-            verifier1.executeGoal( "test" ); // The test goal will not create a packaged artifact
-            fail( "Expected this invocation to fail" ); // See TestCase.java
-        }
-        catch ( final VerificationException ve )
-        {
-            verifier1.verifyTextInLog( "Deliberately fail test case" );
-        }
-        finally
-        {
-            verifier1.resetStreams();
-        }
-
-        final Verifier verifier2 = newVerifier( testDir.getAbsolutePath() );
-        verifier2.setAutoclean( false );
-        verifier2.addCliOption( "--resume-from" );
-        verifier2.addCliOption( ":module-b" );
-        verifier2.executeGoal( "compile" ); // to prevent the unit test from failing (again)
-
-        verifier2.verifyErrorFreeLog();
-        verifier2.resetStreams();
-    }
-
-    /**
-     * Test that the --resume-from flag resolves dependencies inside the same Maven project
-     * without having them installed first.
-     * This test case uses the packaged artifact of module-a.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testShouldResolvePackagedArtifactFromEarlierBuild() throws Exception
-    {
-        final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4660-resume-from" );
-
-        final Verifier verifier1 = newVerifier( testDir.getAbsolutePath() );
-        verifier1.deleteDirectory( "target" );
-        verifier1.deleteArtifacts( "org.apache.maven.its.mng4660" );
-
-        try
-        {
-            verifier1.executeGoal( "verify" ); // The verify goal will create a packaged artifact
-            fail( "Expected this invocation to fail" ); // See TestCase.java
-        }
-        catch ( final VerificationException ve )
-        {
-            verifier1.verifyTextInLog( "Deliberately fail test case" );
-        }
-        finally
-        {
-            verifier1.resetStreams();
-        }
-
-        final Verifier verifier2 = newVerifier( testDir.getAbsolutePath() );
-        verifier2.setAutoclean( false );
-        verifier2.addCliOption( "--resume-from" );
-        verifier2.addCliOption( ":module-b" );
-        verifier2.executeGoal( "compile" ); // to prevent the unit test from failing (again)
-
-        verifier2.verifyErrorFreeLog();
-        verifier2.resetStreams();
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java
deleted file mode 100644
index 5f6ff86a7..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java
+++ /dev/null
@@ -1,264 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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 java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.regex.Pattern;
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * Test for
- * <a href="https://issues.apache.org/jira/browse/MNG-5222">MNG-5222</a>
- * <a href="https://issues.apache.org/jira/browse/MNG-7457">MNG-7457</a>
- */
-public class MavenITmng5222MojoDeprecatedTest
-    extends AbstractMavenIntegrationTestCase
-{
-    public MavenITmng5222MojoDeprecatedTest()
-    {
-        super( "[3.9.0,)" );
-    }
-
-    /**
-     * Test that ensures that deprecation is not printed for empty and default value
-     *
-     * @throws Exception in case of failure
-     */
-    public void testEmptyConfiguration()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5222-mojo-deprecated-params" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.setLogFileName( "log-empty-configuration.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
-        List<String> warnLines = findDeprecationWarning( logLines );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Goal 'deprecated-config' is deprecated: This goal is deprecated" ) );
-
-        assertTrue( "Not verified line: " + warnLines, warnLines.isEmpty() );
-
-        Properties configProps = verifier.loadProperties( "target/config.properties" );
-
-        assertEquals( "0", configProps.remove( "deprecatedArray" ) );
-
-        assertEquals( "3", configProps.remove( "deprecatedArrayWithDefaults" ) );
-        assertEquals( "a1 ", configProps.remove( "deprecatedArrayWithDefaults.0" ) );
-        assertEquals( "a2", configProps.remove( "deprecatedArrayWithDefaults.1" ) );
-        assertEquals( " a3", configProps.remove( "deprecatedArrayWithDefaults.2" ) );
-
-        assertEquals( "0", configProps.remove( "deprecatedList" ) );
-
-        assertEquals( "3", configProps.remove( "deprecatedListWithDefaults" ) );
-        assertEquals( "l1", configProps.remove( "deprecatedListWithDefaults.0" ) );
-        assertEquals( "l2", configProps.remove( "deprecatedListWithDefaults.1" ) );
-        assertEquals( "l3", configProps.remove( "deprecatedListWithDefaults.2" ) );
-
-        assertEquals( "testValue", configProps.remove( "deprecatedParamWithDefaultConstant" ) );
-        assertEquals( "https://www.test.org", configProps.remove( "deprecatedParamWithDefaultEvaluate" ) );
-
-        assertTrue( "not checked config properties: " + configProps, configProps.isEmpty() );
-    }
-
-    /**
-     * Test that ensures that deprecation is printed for deprecated parameter set by property
-     *
-     * @throws Exception in case of failure
-     */
-    public void testDeprecatedProperty()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5222-mojo-deprecated-params" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.addCliOption( "-Dconfig.deprecatedParam2=deprecatedValueInProps" );
-        verifier.addCliOption( "-Dconfig.deprecatedArray=3,2,4,deprecated" );
-        verifier.addCliOption( "-Dconfig.deprecatedList=4,5,deprecated" );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.setLogFileName( "log-deprecated-property.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
-        List<String> warnLines = findDeprecationWarning( logLines );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Goal 'deprecated-config' is deprecated: This goal is deprecated" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'deprecatedParam2' (user property 'config.deprecatedParam2') is deprecated: No reason given" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'deprecatedArray' (user property 'config.deprecatedArray') is deprecated: deprecated array" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'deprecatedList' (user property 'config.deprecatedList') is deprecated: deprecated list" ) );
-
-        assertTrue( "Not verified line: " + warnLines, warnLines.isEmpty() );
-
-        Properties configProps = verifier.loadProperties( "target/config.properties" );
-
-        assertEquals( "deprecatedValueInProps", configProps.remove( "deprecatedParam2" ) );
-
-        assertEquals( "4", configProps.remove( "deprecatedArray" ) );
-        assertEquals( "3", configProps.remove( "deprecatedArray.0" ) );
-        assertEquals( "2", configProps.remove( "deprecatedArray.1" ) );
-        assertEquals( "4", configProps.remove( "deprecatedArray.2" ) );
-        assertEquals( "deprecated", configProps.remove( "deprecatedArray.3" ) );
-
-        assertEquals( "3", configProps.remove( "deprecatedArrayWithDefaults" ) );
-        assertEquals( "a1 ", configProps.remove( "deprecatedArrayWithDefaults.0" ) );
-        assertEquals( "a2", configProps.remove( "deprecatedArrayWithDefaults.1" ) );
-        assertEquals( " a3", configProps.remove( "deprecatedArrayWithDefaults.2" ) );
-
-        assertEquals( "3", configProps.remove( "deprecatedList" ) );
-        assertEquals( "4", configProps.remove( "deprecatedList.0" ) );
-        assertEquals( "5", configProps.remove( "deprecatedList.1" ) );
-        assertEquals( "deprecated", configProps.remove( "deprecatedList.2" ) );
-
-        assertEquals( "3", configProps.remove( "deprecatedListWithDefaults" ) );
-        assertEquals( "l1", configProps.remove( "deprecatedListWithDefaults.0" ) );
-        assertEquals( "l2", configProps.remove( "deprecatedListWithDefaults.1" ) );
-        assertEquals( "l3", configProps.remove( "deprecatedListWithDefaults.2" ) );
-
-        assertEquals( "testValue", configProps.remove( "deprecatedParamWithDefaultConstant" ) );
-        assertEquals( "https://www.test.org", configProps.remove( "deprecatedParamWithDefaultEvaluate" ) );
-
-        assertTrue( "not checked config properties: " + configProps, configProps.isEmpty() );
-    }
-
-    /**
-     * Test that ensures that deprecation is printed for deprecated parameter set by plugin configuration.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testDeprecatedConfig()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5222-mojo-deprecated-params" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.addCliOption( "-Pconfig-values" );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.setLogFileName( "log-deprecated-config.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
-        List<String> warnLines = findDeprecationWarning( logLines );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Goal 'deprecated-config' is deprecated: This goal is deprecated" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'deprecatedParam' is deprecated: I'm deprecated param" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'deprecatedParam2' (user property 'config.deprecatedParam2') is deprecated: No reason given" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'deprecatedParamWithDefaultConstant' is deprecated: deprecated with constant value" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'deprecatedParamWithDefaultEvaluate' is deprecated: deprecated with evaluate value" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'deprecatedArray' (user property 'config.deprecatedArray') is deprecated: deprecated array" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'deprecatedArrayWithDefaults' is deprecated: deprecated array" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'deprecatedList' (user property 'config.deprecatedList') is deprecated: deprecated list" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'deprecatedListWithDefaults' is deprecated: deprecated list" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'deprecatedProperties' is deprecated: deprecated properties" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'deprecatedMap' is deprecated: deprecated map" ));
-
-        assertTrue( "Not verified line: " + warnLines, warnLines.isEmpty() );
-
-        Properties configProps = verifier.loadProperties( "target/config.properties" );
-
-        assertEquals( "value1", configProps.remove( "deprecatedParam" ) );
-        assertEquals( "value2", configProps.remove( "deprecatedParam2" ) );
-        assertEquals( "value3", configProps.remove( "deprecatedParamWithDefaultConstant" ) );
-        assertEquals( "value4", configProps.remove( "deprecatedParamWithDefaultEvaluate" ) );
-
-        assertEquals( "2", configProps.remove( "deprecatedArray" ) );
-        assertEquals( "a1", configProps.remove( "deprecatedArray.0" ) );
-        assertEquals( "a2", configProps.remove( "deprecatedArray.1" ) );
-
-        assertEquals( "2", configProps.remove( "deprecatedArrayWithDefaults" ) );
-        assertEquals( "b1", configProps.remove( "deprecatedArrayWithDefaults.0" ) );
-        assertEquals( "b2", configProps.remove( "deprecatedArrayWithDefaults.1" ) );
-
-        assertEquals( "2", configProps.remove( "deprecatedList" ) );
-        assertEquals( "c1", configProps.remove( "deprecatedList.0" ) );
-        assertEquals( "c2", configProps.remove( "deprecatedList.1" ) );
-
-        assertEquals( "2", configProps.remove( "deprecatedListWithDefaults" ) );
-        assertEquals( "d1", configProps.remove( "deprecatedListWithDefaults.0" ) );
-        assertEquals( "d2", configProps.remove( "deprecatedListWithDefaults.1" ) );
-
-        assertEquals( "2", configProps.remove( "deprecatedProperties" ) );
-        assertEquals( "propertyValue1", configProps.remove( "deprecatedProperties.propertyName1" ) );
-        assertEquals( "propertyValue2", configProps.remove( "deprecatedProperties.propertyName2" ) );
-
-        assertEquals( "2", configProps.remove( "deprecatedMap" ) );
-        assertEquals( "value1", configProps.remove( "deprecatedMap.key1" ) );
-        assertEquals( "value2", configProps.remove( "deprecatedMap.key2" ) );
-
-        assertTrue( "not checked config properties: " + configProps, configProps.isEmpty() );
-    }
-
-    private List<String> findDeprecationWarning( List<String> logLines )
-    {
-        Pattern pattern = Pattern.compile( "\\[WARNING] (Parameter|Goal) .* is deprecated:.*" );
-        List<String> result = new ArrayList<>();
-        for ( String line : logLines )
-        {
-            if ( pattern.matcher( line ).matches() )
-            {
-                result.add( line );
-            }
-        }
-        return result;
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
deleted file mode 100644
index cbcd46c03..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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 java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * An integration test to ensure any pomfile is only read once.
- * This is confirmed by adding a Java Agent to the DefaultModelReader and output the options, including the source location
- *
- * <a href="https://issues.apache.org/jira/browse/MNG-5669">MNG-5669</a>.
- *
- */
-public class MavenITmng5669ReadPomsOnce
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng5669ReadPomsOnce()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    public void testWithoutBuildConsumer()
-        throws Exception
-    {
-        // prepare JavaAgent
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5669-read-poms-once" );
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        Map<String, String> filterProperties =
-            Collections.singletonMap( "${javaAgentJar}",
-                                      verifier.getArtifactPath( "mng-coreit", "javaagent", "1.0-SNAPSHOT", "jar" ) );
-        verifier.filterFile( ".mvn/jvm.config", ".mvn/jvm.config", null, filterProperties );
-
-        verifier.setForkJvm( true ); // pick up agent
-        verifier.setMavenDebug( false );
-        verifier.setAutoclean( false );
-        verifier.addCliOption( "-q" );
-        verifier.addCliOption( "-U" );
-        verifier.addCliOption( "-Dmaven.experimental.buildconsumer=false" );
-        verifier.executeGoals( Arrays.asList( "verify" ) );
-        verifier.resetStreams();
-
-        List<String> logTxt = verifier.loadLines( "log.txt", "utf-8" );
-        for ( String line : logTxt )
-        {
-            if ( line.startsWith( "Picked up JAVA_TOOL_OPTIONS:" ) )
-            {
-                logTxt.remove( line );
-                break;
-            }
-        }
-        assertEquals( logTxt.toString(), 202, logTxt.size() );
-
-        // analyze lines. It is a Hashmap, so we can't rely on the order
-        Set<String> uniqueBuildingSources = new HashSet<>( 202 );
-        final String buildSourceKey = "org.apache.maven.model.building.source=";
-        final int keyLength = buildSourceKey.length();
-        for ( String line : logTxt )
-        {
-            int start = line.indexOf( buildSourceKey );
-            if ( start < 0 )
-            {
-                continue;
-            }
-
-            int end = line.indexOf( ", ", start );
-            if ( end < 0 )
-            {
-                end = line.length() - 1; // is the }
-            }
-            uniqueBuildingSources.add( line.substring( start + keyLength, end ) );
-        }
-        assertEquals( uniqueBuildingSources.size(), 201 /* is 202 minus superpom */ );
-    }
-
-    public void testWithBuildConsumer()
-        throws Exception
-    {
-        // prepare JavaAgent
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5669-read-poms-once" );
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        Map<String, String> filterProperties =
-            Collections.singletonMap( "${javaAgentJar}",
-                                      verifier.getArtifactPath( "mng-coreit", "javaagent", "1.0-SNAPSHOT", "jar" ) );
-        verifier.filterFile( ".mvn/jvm.config", ".mvn/jvm.config", null, filterProperties );
-
-        verifier.setLogFileName( "log-bc.txt" );
-        verifier.setForkJvm( true ); // pick up agent
-        verifier.setMavenDebug( false );
-        verifier.setAutoclean( false );
-        verifier.addCliOption( "-q" );
-        verifier.addCliOption( "-U" );
-        verifier.addCliOption( "-Dmaven.experimental.buildconsumer=true" );
-        verifier.executeGoals( Arrays.asList( "verify" ) );
-        verifier.resetStreams();
-
-        List<String> logTxt = verifier.loadLines( "log-bc.txt", "utf-8" );
-        for ( String line : logTxt )
-        {
-            if ( line.startsWith( "Picked up JAVA_TOOL_OPTIONS:" ) )
-            {
-                logTxt.remove( line );
-                break;
-            }
-        }
-        assertEquals( logTxt.toString(), 202 + 4 /* reactor poms are read twice: file + raw (=XMLFilters) */,
-                      logTxt.size() );
-
-        // analyze lines. It is a Hashmap, so we can't rely on the order
-        Set<String> uniqueBuildingSources = new HashSet<>( 202 );
-        final String buildSourceKey = "org.apache.maven.model.building.source=";
-        final int keyLength = buildSourceKey.length();
-        for ( String line : logTxt )
-        {
-            int start = line.indexOf( buildSourceKey );
-            if ( start < 0 )
-            {
-                continue;
-            }
-
-            int end = line.indexOf( ", ", start );
-            if ( end < 0 )
-            {
-                end = line.length() - 1; // is the }
-            }
-            uniqueBuildingSources.add( line.substring( start + keyLength, end ) );
-        }
-        assertEquals( uniqueBuildingSources.size(), 201 /* is 202 minus superpom */ );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java
deleted file mode 100644
index 35596c8e1..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java
+++ /dev/null
@@ -1,306 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * This is a collection of test cases for <a href="https://issues.apache.org/jira/browse/MNG-5760">MNG-5760</a>,
- * <code>--resume</code> / <code>-r</code> in case of build failures.
- *
- * The test uses a multi-module project with three modules:
- * <ul>
- *     <li>module-a</li>
- *     <li>module-b</li>
- *     <li>module-c (depends on module-b)</li>
- * </ul>
- *
- * @author Maarten Mulders
- * @author Martin Kanters
- */
-public class MavenITmng5760ResumeFeatureTest extends AbstractMavenIntegrationTestCase {
-    private final File parentDependentTestDir;
-    private final File parentIndependentTestDir;
-    private final File noProjectTestDir;
-    private final File fourModulesTestDir;
-
-    public MavenITmng5760ResumeFeatureTest() throws IOException {
-        super( "[4.0.0-alpha-1,)" );
-        this.parentDependentTestDir = ResourceExtractor.simpleExtractResources( getClass(),
-                "/mng-5760-resume-feature/parent-dependent" );
-        this.parentIndependentTestDir = ResourceExtractor.simpleExtractResources( getClass(),
-                "/mng-5760-resume-feature/parent-independent" );
-        this.noProjectTestDir = ResourceExtractor.simpleExtractResources( getClass(),
-                "/mng-5760-resume-feature/no-project" );
-        this.fourModulesTestDir = ResourceExtractor.simpleExtractResources( getClass(),
-                "/mng-5760-resume-feature/four-modules" );
-    }
-
-    /**
-     * Tests that the hint at the end of a failed build mentions <code>--resume</code> instead of <code>--resume-from</code>.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testShouldSuggestToResumeWithoutArgs() throws Exception
-    {
-        Verifier verifier = newVerifier( parentDependentTestDir.getAbsolutePath() );
-        verifier.addCliOption( "-Dmodule-b.fail=true" );
-
-        try
-        {
-            verifier.executeGoal( "test" );
-            fail( "Expected this invocation to fail" );
-        }
-        catch ( final VerificationException ve )
-        {
-            verifier.verifyTextInLog( "mvn [args] -r" );
-            verifyTextNotInLog( verifier, "mvn [args] -rf :module-b" );
-        }
-        finally
-        {
-            verifier.resetStreams();
-        }
-
-        // New build with -r should resume the build from module-b, skipping module-a since it has succeeded already.
-        verifier = newVerifier( parentDependentTestDir.getAbsolutePath() );
-        verifier.addCliOption( "-r" );
-        verifier.executeGoal( "test" );
-        verifyTextNotInLog( verifier, "Building module-a 1.0" );
-        verifier.verifyTextInLog( "Building module-b 1.0" );
-        verifier.verifyTextInLog( "Building module-c 1.0" );
-        verifier.resetStreams();
-    }
-
-    public void testShouldSkipSuccessfulProjects() throws Exception
-    {
-        Verifier verifier = newVerifier( parentDependentTestDir.getAbsolutePath() );
-        verifier.addCliOption( "-Dmodule-a.fail=true" );
-        verifier.addCliOption( "--fail-at-end");
-
-        try
-        {
-            verifier.executeGoal( "test" );
-            fail( "Expected this invocation to fail" );
-        }
-        catch ( final VerificationException ve )
-        {
-            // Expected to fail.
-        }
-        finally
-        {
-            verifier.resetStreams();
-        }
-
-        // Let module-b and module-c fail, if they would have been built...
-        verifier = newVerifier( parentDependentTestDir.getAbsolutePath() );
-        verifier.addCliOption( "-Dmodule-b.fail=true" );
-        verifier.addCliOption( "-Dmodule-c.fail=true" );
-        // ... but adding -r should exclude those two from the build because the previous Maven invocation
-        // marked them as successfully built.
-        verifier.addCliOption( "-r" );
-        try
-        {
-            verifier.executeGoal( "test" );
-        }
-        finally
-        {
-            verifier.resetStreams();
-        }
-    }
-
-    public void testShouldSkipSuccessfulModulesWhenTheFirstModuleFailed() throws Exception
-    {
-        // In this multi-module project, the submodules are not dependent on the parent.
-        // This results in the parent to be built last, and module-a to be built first.
-        // This enables us to let the first module in the reactor (module-a) fail.
-        Verifier verifier = newVerifier( parentIndependentTestDir.getAbsolutePath() );
-        verifier.addCliOption( "-Dmodule-a.fail=true" );
-        verifier.addCliOption( "--fail-at-end");
-
-        try
-        {
-            verifier.executeGoal( "test" );
-            fail( "Expected this invocation to fail" );
-        }
-        catch ( final VerificationException ve )
-        {
-            verifier.verifyTextInLog( "mvn [args] -r" );
-        }
-        finally
-        {
-            verifier.resetStreams();
-        }
-
-        verifier = newVerifier( parentIndependentTestDir.getAbsolutePath() );
-        verifier.addCliOption( "-r" );
-        verifier.executeGoal( "test" );
-        verifier.verifyTextInLog( "Building module-a 1.0" );
-        verifyTextNotInLog( verifier, "Building module-b 1.0" );
-        verifier.resetStreams();
-    }
-
-    public void testShouldNotCrashWithoutProject() throws Exception
-    {
-        // There is no Maven project available in the test directory.
-        // As reported in JIRA this would previously break with a NullPointerException.
-        // (see https://issues.apache.org/jira/browse/MNG-5760?focusedCommentId=17143795&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-17143795)
-        final Verifier verifier = newVerifier( noProjectTestDir.getAbsolutePath() );
-        try
-        {
-            verifier.executeGoal( "resources:resources" );
-        }
-        catch ( final VerificationException ve )
-        {
-            verifier.verifyTextInLog( "Goal requires a project to execute but there is no POM in this directory" );
-        }
-        finally
-        {
-            verifier.resetStreams();
-        }
-    }
-
-    public void testFailureWithParallelBuild() throws Exception
-    {
-        // four modules: a, b, c, d
-        // c depends on b, d depends on a
-
-        // Let's do a first pass with a and c failing.  The build is parallel,
-        // so we have a first thread with a and d, and the second one with b and c
-        // The result should be:
-        //   a : failure (slow, so b and c will be built in the meantime)
-        //   b : success
-        //   c : failure
-        //   d : skipped
-        Verifier verifier = newVerifier( fourModulesTestDir.getAbsolutePath() );
-        verifier.addCliOption( "-T2" );
-        verifier.addCliOption( "-Dmodule-a.delay=1000" );
-        verifier.addCliOption( "-Dmodule-a.fail=true" );
-        verifier.addCliOption( "-Dmodule-c.fail=true" );
-        try
-        {
-            verifier.executeGoal( "verify" );
-            fail( "Expected this invocation to fail" );
-        }
-        catch ( final VerificationException ve )
-        {
-            // Expected to fail.
-        }
-        finally
-        {
-            verifier.resetStreams();
-        }
-
-        // Let module-b fail, if it would have been built...
-        verifier = newVerifier( fourModulesTestDir.getAbsolutePath() );
-        verifier.addCliOption( "-T2" );
-        verifier.addCliOption( "-Dmodule-b.fail=true" );
-        // ... but adding -r should exclude it from the build because the previous Maven invocation
-        // marked it as successfully built.
-        verifier.addCliOption( "-r" );
-        // The result should be:
-        //   a : success
-        //   c : success
-        //   d : success
-        try
-        {
-            verifier.executeGoal( "verify" );
-        }
-        finally
-        {
-            verifier.resetStreams();
-        }
-    }
-
-    public void testFailureAfterSkipWithParallelBuild() throws Exception
-    {
-        // four modules: a, b, c, d
-        // c depends on b, d depends on a
-
-        // Let's do a first pass with a and c failing.  The build is parallel,
-        // so we have a first thread with a and d, and the second one with b and c
-        // The result should be:
-        //   a : success
-        //   b : success, slow
-        //   c : skipped
-        //   d : failure
-        Verifier verifier = newVerifier( fourModulesTestDir.getAbsolutePath() );
-        verifier.addCliOption( "-T2" );
-        verifier.addCliOption( "-Dmodule-b.delay=2000" );
-        verifier.addCliOption( "-Dmodule-d.fail=true" );
-        try
-        {
-            verifier.executeGoal( "verify" );
-            fail( "Expected this invocation to fail" );
-        }
-        catch ( final VerificationException ve )
-        {
-            // Expected to fail.
-        }
-        finally
-        {
-            verifier.resetStreams();
-        }
-
-        // Let module-a and module-b fail, if they would have been built...
-        verifier = newVerifier( fourModulesTestDir.getAbsolutePath() );
-        verifier.addCliOption( "-T2" );
-        verifier.addCliOption( "-Dmodule-a.fail=true" );
-        verifier.addCliOption( "-Dmodule-b.fail=true" );
-        // ... but adding -r should exclude those two from the build because the previous Maven invocation
-        // marked them as successfully built.
-        verifier.addCliOption( "-r" );
-        try
-        {
-            // The result should be:
-            //   c : success
-            //   d : success
-            verifier.executeGoal( "verify" );
-        }
-        finally
-        {
-            verifier.resetStreams();
-        }
-    }
-
-    /**
-     * Throws an exception if the text <strong>is</strong> present in the log.
-     *
-     * @param verifier the verifier to use
-     * @param text the text to assert present
-     * @throws VerificationException if text is not found in log
-     */
-    private void verifyTextNotInLog( Verifier verifier, String text )
-            throws VerificationException
-    {
-        List<String> lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
-
-        for ( String line : lines )
-        {
-            if ( Verifier.stripAnsi( line ).contains( text ) )
-            {
-                throw new VerificationException( "Text found in log: " + text );
-            }
-        }
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java
deleted file mode 100644
index bf861a2c7..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * An integration test to verify that builds fail when logs occur
- * above or equal to the --fail-on-severity cli property.
- *
- * <a href="https://issues.apache.org/jira/browse/MNG-6065">MNG-6065</a>.
- *
- */
-public class MavenITmng6065FailOnSeverityTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng6065FailOnSeverityTest()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    public void testItShouldFailOnWarnLogMessages()
-            throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6065-fail-on-severity" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        verifier.setForkJvm( true );
-        verifier.addCliOption( "--fail-on-severity" );
-        verifier.addCliOption( "WARN" );
-
-        boolean failed = false;
-
-        try
-        {
-            verifier.executeGoal( "compile" );
-        }
-        catch ( VerificationException e )
-        {
-            failed = true;
-            verifier.verifyTextInLog( "Enabled to break the build on log level WARN." );
-            verifier.verifyTextInLog( "Build failed due to log statements with a higher severity than allowed." );
-        }
-
-        assertTrue( "Build should have failed", failed );
-    }
-
-    public void testItShouldSucceedOnWarnLogMessagesWhenFailLevelIsError()
-            throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6065-fail-on-severity" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        verifier.setForkJvm( true );
-        verifier.addCliOption( "--fail-on-severity" );
-        verifier.addCliOption( "ERROR" );
-
-        verifier.executeGoal( "compile" );
-
-        verifier.verifyTextInLog( "Enabled to break the build on log level ERROR." );
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java
deleted file mode 100644
index 4e4b6bf9e..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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 java.io.File;
-import java.io.IOException;
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * This is a collection of test cases for <a href="https://issues.apache.org/jira/browse/MNG-6118">MNG-6118</a>,
- * invoking Maven in a submodule of a multi-module project.
- *
- * The test uses a multi-module project with two modules:
- * <ul>
- *     <li>app (depends on lib)</li>
- *     <li>lib</li>
- * </ul>
- *
- * @author Maarten Mulders
- * @author Martin Kanters
- */
-public class MavenITmng6118SubmoduleInvocation extends AbstractMavenIntegrationTestCase
-{
-    private static final String RESOURCE_PATH = "/mng-6118-submodule-invocation-full-reactor";
-    private final File testDir;
-
-    public MavenITmng6118SubmoduleInvocation() throws IOException
-    {
-        super( "[4.0.0-alpha-1,)" );
-        testDir = ResourceExtractor.simpleExtractResources( getClass(), RESOURCE_PATH );
-    }
-
-    /**
-     * Performs a {@code cd app && mvn compile} invocation. Verifies that inter-module dependencies are resolved.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testInSubModule() throws Exception
-    {
-        // Compile the whole project first.
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "compile" );
-
-        final File submoduleDirectory = new File( testDir, "app" );
-        verifier = newVerifier( submoduleDirectory.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.setLogFileName( "log-insubmodule.txt" );
-        verifier.executeGoal( "compile" );
-    }
-
-    /**
-     * Performs a {@code mvn -f app/pom.xml compile} invocation. Verifies that inter-module dependencies are resolved.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testWithFile() throws Exception
-    {
-        // Compile the whole project first.
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "compile" );
-
-        verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.setLogFileName( "log-withfile.txt" );
-        verifier.addCliOption( "-f" );
-        verifier.addCliOption( "app/pom.xml" );
-        verifier.executeGoal( "compile" );
-    }
-
-    /**
-     * Performs a {@code mvn -f app/pom.xml -am compile} invocation. Verifies that dependent modules are also built.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testWithFileAndAlsoMake() throws Exception
-    {
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.addCliOption( "-am" );
-        verifier.addCliOption( "-f" );
-        verifier.addCliOption( "app/pom.xml" );
-        verifier.setLogFileName( "log-withfilealsomake.txt" );
-        verifier.executeGoal( "compile" );
-        verifier.verifyTextInLog( "Building Maven Integration Test :: MNG-6118 :: Library 1.0" );
-    }
-
-    /**
-     * Performs a {@code cd app && mvn compile -am} invocation. Verifies that dependent modules are also built.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testInSubModuleWithAlsoMake() throws Exception
-    {
-        File submoduleDirectory = new File( testDir, "app" );
-        Verifier verifier = newVerifier( submoduleDirectory.getAbsolutePath() );
-        verifier.addCliOption( "-am" );
-        verifier.setLogFileName( "log-insubmodulealsomake.txt" );
-        verifier.executeGoal( "compile" );
-        verifier.verifyTextInLog( "Building Maven Integration Test :: MNG-6118 :: Library 1.0" );
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java
deleted file mode 100644
index c0a141460..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * This is a collection of test cases for <a href="https://issues.apache.org/jira/browse/MNG-6511">MNG-6511</a>,
- * selecting and deselecting optional projects.
- *
- * @author Maarten Mulders
- * @author Martin Kanters
- */
-public class MavenITmng6511OptionalProjectSelectionTest extends AbstractMavenIntegrationTestCase
-{
-    private static final String RESOURCE_PATH = "/mng-6511-optional-project-selection";
-    private final File testDir;
-
-    public MavenITmng6511OptionalProjectSelectionTest() throws IOException
-    {
-        super( "[4.0.0-alpha-1,)" );
-        testDir = ResourceExtractor.simpleExtractResources( getClass(), RESOURCE_PATH );
-    }
-
-    public void testSelectExistingOptionalProfile() throws VerificationException
-    {
-        newVerifier( testDir.getAbsolutePath() ).executeGoal( "clean" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setLogFileName( "log-select-existing.txt" );
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( "?existing-module" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
-    }
-
-    public void testSelectExistingOptionalProfileByArtifactId() throws VerificationException
-    {
-        newVerifier( testDir.getAbsolutePath() ).executeGoal( "clean" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setLogFileName( "log-select-existing-artifact-id.txt" );
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( "?:existing-module" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
-    }
-
-    public void testSelectNonExistingOptionalProfile() throws VerificationException
-    {
-        newVerifier( testDir.getAbsolutePath() ).executeGoal( "clean" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setLogFileName( "log-select-non-existing.txt" );
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( "?non-existing-module" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
-    }
-
-    public void testDeselectExistingOptionalProfile() throws VerificationException
-    {
-        newVerifier( testDir.getAbsolutePath() ).executeGoal( "clean" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setLogFileName( "log-deselect-existing.txt" );
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( "!?existing-module" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.verifyFileNotPresent( "existing-module/target/touch.txt" ); // existing-module should not have been built.
-    }
-
-    public void testDeselectNonExistingOptionalProfile() throws VerificationException
-    {
-        newVerifier( testDir.getAbsolutePath() ).executeGoal( "clean" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setLogFileName( "log-deselect-non-existing.txt" );
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( "!?non-existing-module" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.verifyFilePresent( "existing-module/target/touch.txt" ); // existing-module should have been built.
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java
deleted file mode 100644
index 5f1d6d33b..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.util.Arrays;
-
-public class MavenITmng6562WarnDefaultBindings
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng6562WarnDefaultBindings()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    public void testItShouldNotWarn()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6562-default-bindings" );
-
-        String phase = "validate";
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        verifier.setAutoclean( false );
-        verifier.setLogFileName( phase + ".txt" );
-        verifier.setForkJvm( true ); // required due to --fail-on-severity
-        verifier.addCliOption( "-fos" );
-        verifier.addCliOption( "WARN" ); // ALSO NO WARNINGS
-        verifier.executeGoals( Arrays.asList( phase ) );
-        verifier.resetStreams();
-
-        verifier.verifyErrorFreeLog();
-    }
-
-
-    public void testItShouldNotWarn2()
-                    throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6562-default-bindings" );
-
-        String phase = "process-resources";
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        verifier.setAutoclean( false );
-        verifier.setLogFileName( phase + ".txt" );
-        verifier.setForkJvm( true ); // required due to --fail-on-severity
-        verifier.addCliOption( "-fos" );
-        verifier.addCliOption( "WARN" ); // ALSO NO WARNINGS
-        verifier.executeGoals( Arrays.asList( phase ) );
-        verifier.resetStreams();
-
-        verifier.verifyErrorFreeLog();
-    }
-
-    public void testItShouldWarnForCompilerPlugin()
-                    throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6562-default-bindings" );
-
-        String phase = "compile";
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        verifier.setAutoclean( false );
-        verifier.setLogFileName( phase +".txt" );
-        verifier.executeGoals( Arrays.asList( phase ) );
-        verifier.resetStreams();
-
-        verifier.verifyTextInLog( "Version not locked for default bindings plugins [maven-compiler-plugin]"
-                + ", you should define versions in pluginManagement section of your pom.xml or parent" );
-    }
-
-    public void testItShouldWarnForCompilerPlugin2()
-                    throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6562-default-bindings" );
-
-        String phase = "process-test-resources";
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        verifier.setAutoclean( false );
-        verifier.setLogFileName( phase +".txt" );
-        verifier.executeGoals( Arrays.asList( phase ) );
-        verifier.resetStreams();
-        verifier.verifyErrorFreeLog();
-
-        verifier.verifyTextInLog( "Version not locked for default bindings plugins [maven-compiler-plugin]"
-                + ", you should define versions in pluginManagement section of your pom.xml or parent" );
-    }
-
-    public void testItShouldWarnForCompilerPlugin3()
-                    throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6562-default-bindings" );
-
-        String phase = "test-compile";
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        verifier.setAutoclean( false );
-        verifier.setLogFileName( phase +".txt" );
-        verifier.executeGoals( Arrays.asList( phase ) );
-        verifier.resetStreams();
-        verifier.verifyErrorFreeLog();
-
-        verifier.verifyTextInLog( "Version not locked for default bindings plugins [maven-compiler-plugin]"
-                + ", you should define versions in pluginManagement section of your pom.xml or parent" );
-    }
-
-    public void testItShouldWarnForCompilerPluginAndSurefirePlugin()
-                    throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6562-default-bindings" );
-
-        String phase = "test";
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        verifier.setAutoclean( false );
-        verifier.setLogFileName( phase +".txt" );
-        verifier.executeGoals( Arrays.asList( phase ) );
-        verifier.resetStreams();
-        verifier.verifyErrorFreeLog();
-
-        verifier.verifyTextInLog( "Version not locked for default bindings plugins [maven-compiler-plugin, maven-surefire-plugin]"
-                + ", you should define versions in pluginManagement section of your pom.xml or parent" );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java
deleted file mode 100644
index 801bd785a..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.util.List;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-
-public class MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest
-    extends AbstractMavenIntegrationTestCase
-{
-    private static final String RESOURCE_PATH = "/mng-6566-execute-annotation-should-not-re-execute-goals";
-    private static final String PLUGIN_KEY = "org.apache.maven.its.mng6566:plugin:1.0-SNAPSHOT";
-
-    private File testDir;
-
-    public MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    public void setUp()
-            throws Exception
-    {
-        testDir = ResourceExtractor.simpleExtractResources( getClass(), RESOURCE_PATH );
-
-        File pluginDir = new File( testDir, "plugin" );
-        Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
-        verifier.executeGoal( "install" );
-        verifier.resetStreams();
-        verifier.verifyErrorFreeLog();
-    }
-
-    public void testRunsCompileGoalOnceWithDirectPluginInvocation()
-            throws Exception
-    {
-        File consumerDir = new File( testDir, "consumer" );
-
-        Verifier verifier = newVerifier( consumerDir.getAbsolutePath() );
-        verifier.setLogFileName( "log-direct-plugin-invocation.txt" );
-        verifier.executeGoal( PLUGIN_KEY + ":require-compile-phase" );
-        verifier.resetStreams();
-        verifier.verifyErrorFreeLog();
-
-        assertCompiledOnce( verifier );
-        verifier.verifyTextInLog( "MNG-6566 plugin require-compile-phase goal executed" );
-    }
-
-    /**
-     * This test uses the <pre>require-compile-phase</pre> goal of the test plugin.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testRunsCompileGoalOnceWithPhaseExecution()
-            throws Exception
-    {
-        File consumerDir = new File( testDir, "consumer" );
-
-        Verifier verifier = newVerifier( consumerDir.getAbsolutePath() );
-        verifier.setLogFileName( "log-phase-execution.txt" );
-        verifier.executeGoal( "compile" );
-        verifier.resetStreams();
-        verifier.verifyErrorFreeLog();
-
-        assertCompiledOnce( verifier );
-        verifier.verifyTextInLog( "MNG-6566 plugin require-compile-phase goal executed" );
-    }
-
-    private void assertCompiledOnce( Verifier verifier )
-            throws VerificationException
-    {
-        List<String> lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
-        int counter = 0;
-        for ( String line : lines )
-        {
-            if ( line.contains( "maven-compiler-plugin:0.1-stub-SNAPSHOT:compile") )
-            {
-                counter++;
-            }
-        }
-        assertThat( "Compile goal was expected to run once", counter, is( 1 ) );
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
deleted file mode 100644
index ce2c18f2e..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.shared.utils.io.FileUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-
-/**
- * With the build-consumer the pom.xml will be adjusted during the process.
- * <ul>
- *   <li>CLI-friendly versions will be resolved</li>
- *   <li>parents can omit the version if the relative path points to the correct parent</li>
- *   <li>dependencies can omit the version if it is part of the reactor</li>
- * </ul>
- *
- * During install the pom will be cleaned up
- * <ul>
- *   <li>the modules will be removed</li>
- *   <li>the relativePath will be removed</li>
- * </ul>
- *
- * <a href="https://issues.apache.org/jira/browse/MNG-6656">MNG-6656</a>.
- *
- */
-public class MavenITmng6656BuildConsumer
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng6656BuildConsumer()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    /**
-     * Verifies:
-     * <ul>
-     *   <li>preserve license</li>
-     *   <li>consistent line separators</li>
-     *   <li>resolved project versions (at least 2 levels deep) in parent and dependencies</li>
-     *   <li>removal of modules in aggregators</li>
-     * </ul>
-     *
-     * @throws Exception in case of failure
-     */
-    public void testPublishedPoms()
-                    throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6656-buildconsumer" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        verifier.setMavenDebug( false );
-        verifier.setAutoclean( false );
-        verifier.addCliOption( "-Dchangelist=MNG6656" );
-
-        verifier.executeGoals( Collections.singletonList( "install" ) );
-        verifier.verifyErrorFreeLog();
-
-        assertTextEquals( new File( testDir, "expected/parent.pom"),
-                new File( verifier.getArtifactPath( "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom" ) ) );
-
-        assertTextEquals( new File( testDir, "expected/simple-parent.pom"),
-                new File( verifier.getArtifactPath( "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6656-SNAPSHOT", "pom" ) ) );
-
-        assertTextEquals( new File( testDir, "expected/simple-weather.pom"),
-                new File( verifier.getArtifactPath( "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6656-SNAPSHOT", "pom" ) ) );
-
-        assertTextEquals( new File( testDir, "expected/simple-webapp.pom"),
-                new File( verifier.getArtifactPath( "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6656-SNAPSHOT", "pom" ) ) );
-    }
-
-    static void assertTextEquals( File file1, File file2 )
-        throws IOException
-    {
-        assertEquals( FileUtils.loadFile( file1 ), FileUtils.loadFile( file2 ) );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
deleted file mode 100644
index 2fd38127a..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.shared.utils.io.FileUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-
-/**
- * With the build-consumer the POM will be adjusted during the process.
- * <ul>
- *   <li>CI-friendly versions will be resolved</li>
- *   <li>parents can omit the version if the relative path points to the correct parent</li>
- *   <li>dependencies can omit the version if it is part of the reactor</li>
- * </ul>
- *
- * During install the POM will be cleaned up
- * <ul>
- *   <li>the modules will be removed</li>
- *   <li>the relativePath will be removed</li>
- * </ul>
- *
- * <a href="https://issues.apache.org/jira/browse/MNG-6656">MNG-6656</a>.
- *
- */
-public class MavenITmng6957BuildConsumer
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng6957BuildConsumer()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    /**
-     * Verifies:
-     * <ul>
-     *   <li>preserve license</li>
-     *   <li>consistent line separators</li>
-     *   <li>resolved project versions (at least 2 levels deep) in parent and dependencies</li>
-     *   <li>removal of modules in aggregators</li>
-     * </ul>
-     *
-     * @throws Exception in case of failure
-     */
-    public void testPublishedPoms()
-                    throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6957-buildconsumer" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        verifier.setMavenDebug( false );
-        verifier.setAutoclean( false );
-        verifier.addCliOption( "-Dchangelist=MNG6957" );
-
-        verifier.executeGoals( Collections.singletonList( "install" ) );
-        verifier.verifyErrorFreeLog();
-
-        assertTextEquals( new File( testDir, "expected/parent.pom"),
-                new File( verifier.getArtifactPath( "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6957-SNAPSHOT", "pom" ) ) );
-
-        assertTextEquals( new File( testDir, "expected/simple-parent.pom"),
-                new File( verifier.getArtifactPath( "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6957-SNAPSHOT", "pom" ) ) );
-
-        assertTextEquals( new File( testDir, "expected/simple-weather.pom"),
-                new File( verifier.getArtifactPath( "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6957-SNAPSHOT", "pom" ) ) );
-
-        assertTextEquals( new File( testDir, "expected/simple-webapp.pom"),
-                new File( verifier.getArtifactPath( "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6957-SNAPSHOT", "pom" ) ) );
-
-        assertTextEquals( new File( testDir, "expected/simple-testutils.pom"),
-                new File( verifier.getArtifactPath( "org.sonatype.mavenbook.multi", "simple-testutils", "0.9-MNG6957-SNAPSHOT", "pom" ) ) );
-
-        assertTextEquals( new File( testDir, "expected/utils-parent.pom"),
-                new File( verifier.getArtifactPath( "org.sonatype.mavenbook.multi", "utils-parent", "0.9-MNG6957-SNAPSHOT", "pom" ) ) );
-    }
-
-    static void assertTextEquals( File file1, File file2 )
-            throws IOException
-    {
-        assertEquals( FileUtils.loadFile( file1 ), FileUtils.loadFile( file2 ) );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java
deleted file mode 100644
index 831106286..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-import static org.apache.maven.it.ItUtils.verifyTextNotInLog;
-
-import java.io.File;
-import java.util.List;
-
-public class MavenITmng6981ProjectListShouldIncludeChildrenTest
-        extends AbstractMavenIntegrationTestCase
-{
-
-    private static final String RESOURCE_PATH = "/mng-6981-pl-should-include-children";
-
-    public MavenITmng6981ProjectListShouldIncludeChildrenTest()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    public void testProjectListShouldIncludeChildrenByDefault()
-            throws Exception
-    {
-        final File testDir = ResourceExtractor.simpleExtractResources( getClass(), RESOURCE_PATH );
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( ":module-a" );
-        verifier.executeGoal( "compile" );
-        verifier.verifyTextInLog( "Building module-a-1 1.0" );
-    }
-
-    /**
-     * Since --pl's behavior is changed, make sure the alternative for building a pom without its children still works.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testFileSwitchAllowsExcludeOfChildren()
-            throws Exception
-    {
-        final File testDir = ResourceExtractor.simpleExtractResources( getClass(), RESOURCE_PATH );
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-
-        verifier.addCliOption( "-f" );
-        verifier.addCliOption( "module-a" );
-        verifier.addCliOption( "--non-recursive" );
-        verifier.setLogFileName( "log-non-recursive.txt" );
-        verifier.executeGoal( "compile" );
-        verifyTextNotInLog( verifier, "Building module-a-1 1.0" );
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java
deleted file mode 100644
index 6d1cbb8cc..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-public class MavenITmng7051OptionalProfileActivationTest
-        extends AbstractMavenIntegrationTestCase
-{
-    private static final String PROJECT_PATH = "/mng-7051-optional-profile-activation";
-
-    public MavenITmng7051OptionalProfileActivationTest()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    /**
-     * This test verifies that activating a non-existing profile breaks the build.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testActivatingNonExistingProfileBreaks() throws Exception
-    {
-        final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
-        final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
-
-        verifier.addCliOption( "-P" );
-        verifier.addCliOption( "non-existing-profile" );
-        verifier.setLogFileName( "test-breaking.txt" );
-
-        try
-        {
-            verifier.executeGoal( "validate" );
-            fail( "Activated a non-existing profile without ? prefix should break the build, but it didn't." );
-        }
-        catch ( VerificationException ve )
-        {
-            // Inspect the reason why the build broke.
-            verifier.verifyTextInLog( "[ERROR] The requested profiles [non-existing-profile] could not be activated or deactivated because they do not exist." );
-        }
-    }
-
-    /**
-     * This test verifies that activating a non-existing profile does not break the build when it is prefixed with <strong>?</strong>.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testActivatingNonExistingProfileWithQuestionMarkDoesNotBreak() throws Exception
-    {
-        final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
-        final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
-
-        verifier.addCliOption( "-P" );
-        verifier.addCliOption( "?non-existing-profile" );
-        verifier.setLogFileName( "test-non-breaking.txt" );
-
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.verifyTextInLog( "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." );
-    }
-
-    /**
-     * This test verifies that activating both an existing and a non-existing profile does not break the build when the latter is prefixed with <strong>?</strong>.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testActivatingExistingAndNonExistingProfiles() throws Exception
-    {
-        final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
-        final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
-
-        verifier.addCliOption( "-P" );
-        verifier.addCliOption( "?non-existing-profile,existing" );
-        verifier.setLogFileName( "test-non-breaking-mixed.txt" );
-
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.verifyTextInLog( "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." );
-    }
-
-    /**
-     * This test verifies that deactivating a non-existing profile does not break the build when it is prefixed with <strong>?</strong>.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testDeactivatingNonExistingProfileWithQuestionMarkDoesNotBreak() throws Exception
-    {
-        final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
-        final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
-
-        verifier.addCliOption( "-P" );
-        verifier.addCliOption( "!?non-existing-profile" );
-        verifier.setLogFileName( "test-deactivating-non-breaking.txt" );
-
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.verifyTextInLog( "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." );
-    }
-
-    /**
-     * This test verifies that deactivating both an existing and a non-existing profile does not break the build when the latter is prefixed with <strong>?</strong>.
-     *
-     * @throws Exception in case of failure
-     */
-    public void testDeactivatingExistingAndNonExistingProfiles() throws Exception
-    {
-        final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
-        final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
-
-        verifier.addCliOption( "-P" );
-        verifier.addCliOption( "!?non-existing-profile,!existing" );
-        verifier.setLogFileName( "test-deactivating-non-breaking-mixed.txt" );
-
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.verifyTextInLog( "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." );
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
deleted file mode 100644
index 87519c865..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.io.IOException;
-
-public class MavenITmng7112ProjectsWithNonRecursiveTest
-        extends AbstractMavenIntegrationTestCase
-{
-    private static final String PROJECT_PATH = "/mng-7112-projects-with-non-recursive";
-
-    public MavenITmng7112ProjectsWithNonRecursiveTest()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    public void testAggregatesCanBeBuiltNonRecursively()
-            throws IOException, VerificationException
-    {
-        final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
-        newVerifier( projectDir.getAbsolutePath() ).executeGoal( "clean" );
-
-        final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
-
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( ":aggregator-a,:aggregator-b" );
-        verifier.addCliOption( "-N" );
-        verifier.setLogFileName( "selected-non-recursive.txt" );
-        verifier.executeGoal( "validate" );
-
-        verifier.verifyFileNotPresent( "target/touch.txt" );
-        verifier.verifyFilePresent( "aggregator-a/target/touch.txt" );
-        verifier.verifyFileNotPresent( "aggregator-a/module-a/target/touch.txt" );
-        verifier.verifyFilePresent( "aggregator-b/target/touch.txt" );
-        verifier.verifyFileNotPresent( "aggregator-b/module-b/target/touch.txt" );
-    }
-
-    public void testAggregatesCanBeDeselectedNonRecursively()
-            throws IOException, VerificationException
-    {
-        final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
-        newVerifier( projectDir.getAbsolutePath() ).executeGoal( "clean" );
-
-        final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
-
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( "!:aggregator-a,!:aggregator-b" );
-        verifier.addCliOption( "-N" );
-        verifier.setLogFileName( "excluded-non-recursive.txt" );
-        verifier.executeGoal( "validate" );
-
-        verifier.verifyFilePresent( "target/touch.txt" );
-        verifier.verifyFileNotPresent( "aggregator-a/target/touch.txt" );
-        verifier.verifyFilePresent( "aggregator-a/module-a/target/touch.txt" );
-        verifier.verifyFileNotPresent( "aggregator-b/target/touch.txt" );
-        verifier.verifyFilePresent( "aggregator-b/module-b/target/touch.txt" );
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java
deleted file mode 100644
index a523eb47b..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java
+++ /dev/null
@@ -1,57 +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.
- */
-package org.apache.maven.it;
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-public class MavenITmng7244IgnorePomPrefixInExpressions extends AbstractMavenIntegrationTestCase
-{
-    private static final String PROJECT_PATH = "/mng-7244-ignore-pom-prefix-in-expressions";
-
-    public MavenITmng7244IgnorePomPrefixInExpressions()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    public void testIgnorePomPrefixInExpressions() throws IOException, VerificationException
-    {
-        final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
-        final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
-
-        verifier.executeGoal( "validate" );
-
-        verifyLogDoesNotContainUnexpectedWarning( verifier );
-    }
-
-    private void verifyLogDoesNotContainUnexpectedWarning( Verifier verifier ) throws IOException
-    {
-        List<String> loadedLines = verifier.loadLines( "log.txt", "UTF-8" );
-        for ( String line : loadedLines )
-        {
-            if ( line.startsWith( "[WARNING]" ) && line.contains( "The expression ${pom.version} is deprecated." ) )
-            {
-                fail( "Log contained unexpected deprecation warning" );
-            }
-        }
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java
deleted file mode 100644
index 6dc9769f8..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * This test suite tests whether other modules in the same multi-module project can be selected when invoking Maven from a submodule.
- * Related JIRA issue: <a href="https://issues.apache.org/jira/browse/MNG-7390">MNG-7390</a>.
- *
- * @author Martin Kanters
- */
-public class MavenITmng7390SelectModuleOutsideCwdTest extends AbstractMavenIntegrationTestCase
-{
-
-    private File moduleADir;
-
-    public MavenITmng7390SelectModuleOutsideCwdTest()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        moduleADir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7390-pl-outside-cwd/module-a" );
-
-        // Clean up target files from earlier runs (verifier.setAutoClean does not work, as we are reducing the reactor)
-        final Verifier verifier = newVerifier( moduleADir.getAbsolutePath() );
-        verifier.addCliOption( "-f" );
-        verifier.addCliOption( ".." );
-        verifier.executeGoal( "clean" );
-    }
-
-    public void testSelectModuleByCoordinate() throws Exception
-    {
-        final Verifier verifier = newVerifier( moduleADir.getAbsolutePath() );
-
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( ":module-b" );
-        verifier.setLogFileName( "log-module-by-coordinate.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyFileNotPresent( "target/touch.txt" );
-        verifier.verifyFileNotPresent( "../target/touch.txt" );
-        verifier.verifyFilePresent( "../module-b/target/touch.txt" );
-    }
-
-    public void testSelectMultipleModulesByCoordinate() throws Exception
-    {
-        final Verifier verifier = newVerifier( moduleADir.getAbsolutePath() );
-
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( ":module-b,:module-a" );
-        verifier.setLogFileName( "log-modules-by-coordinate.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyFilePresent( "target/touch.txt" );
-        verifier.verifyFileNotPresent( "../target/touch.txt" );
-        verifier.verifyFilePresent( "../module-b/target/touch.txt" );
-    }
-
-    public void testSelectModuleByRelativePath() throws Exception
-    {
-        final Verifier verifier = newVerifier( moduleADir.getAbsolutePath() );
-
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( "../module-b" );
-        verifier.setLogFileName( "log-module-by-relative-path.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyFileNotPresent( "target/touch.txt" );
-        verifier.verifyFileNotPresent( "../target/touch.txt" );
-        verifier.verifyFilePresent( "../module-b/target/touch.txt" );
-    }
-
-    public void testSelectModulesByRelativePath() throws Exception
-    {
-        final Verifier verifier = newVerifier( moduleADir.getAbsolutePath() );
-
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( "../module-b,." );
-        verifier.setLogFileName( "log-modules-by-relative-path.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyFilePresent( "target/touch.txt" );
-        verifier.verifyFileNotPresent( "../target/touch.txt" );
-        verifier.verifyFilePresent( "../module-b/target/touch.txt" );
-    }
-
-    /**
-     Maven determines whether the target module is in a multi-module project based on the presence of a .mvn directory in root.
-     This test verifies that when that directory is missing, the module cannot be found.
-     */
-    public void testSelectModulesOutsideCwdDoesNotWorkWhenDotMvnIsNotPresent() throws Exception
-    {
-        final String noDotMvnPath = "/mng-7390-pl-outside-cwd-no-dotmvn/module-a";
-        final File noDotMvnDir = ResourceExtractor.simpleExtractResources( getClass(), noDotMvnPath );
-        final Verifier verifier = newVerifier( noDotMvnDir.getAbsolutePath() );
-
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( "../module-b" );
-        verifier.setLogFileName( "log-modules-by-relative-path-no-dotmvn.txt" );
-        try
-        {
-            verifier.executeGoal( "validate" );
-            fail( "Expected goal to fail" );
-        }
-        catch ( VerificationException e )
-        {
-            verifier.verifyFileNotPresent( "target/touch.txt" );
-            verifier.verifyFileNotPresent( "../target/touch.txt" );
-            verifier.verifyFileNotPresent( "../module-b/target/touch.txt" );
-        }
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java
deleted file mode 100644
index d9f3e49f0..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java
+++ /dev/null
@@ -1,57 +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.
- */
-package org.apache.maven.it;
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-public class MavenITmng7404IgnorePrefixlessExpressionsTest extends AbstractMavenIntegrationTestCase
-{
-    private static final String PROJECT_PATH = "/mng-7404-ignore-prefixless-expressions";
-
-    public MavenITmng7404IgnorePrefixlessExpressionsTest()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    public void testIgnorePrefixlessExpressions() throws IOException, VerificationException
-    {
-        final File projectDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
-        final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
-
-        verifier.executeGoal( "validate" );
-
-        verifyLogDoesNotContainUnexpectedWarning( verifier );
-    }
-
-    private void verifyLogDoesNotContainUnexpectedWarning( Verifier verifier ) throws IOException
-    {
-        List<String> loadedLines = verifier.loadLines( "log.txt", "UTF-8" );
-        for ( String line : loadedLines )
-        {
-            if ( line.startsWith( "[WARNING]" ) && line.contains( "The expression ${version} is deprecated." ) )
-            {
-                fail( "Log contained unexpected deprecation warning" );
-            }
-        }
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java
deleted file mode 100644
index 68679cf51..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.it.util.ResourceExtractor;
-import org.junit.Assert;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-public class MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest extends AbstractMavenIntegrationTestCase
-{
-    public MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest()
-    {
-        super( "[4.0.0-alpha-1,)" );
-    }
-
-    public void testConsistentLoggingOfOptionalProfilesAndProjects() throws IOException, VerificationException
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(),
-                "/mng-7443-consistency-of-optional-profiles-and-projects" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.addCliOption( "-pl" );
-        verifier.addCliOption( "?:does-not-exist" );
-        verifier.addCliOption( "-P" );
-        verifier.addCliOption( "?does-not-exist-either" );
-
-        verifier.executeGoals( Arrays.asList( "clean", "verify" ) );
-
-        final List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
-
-        int projectSelectorMissingCounter = 0;
-        int profileSelectorMissingCounter = 0;
-
-        for ( String logLine : logLines )
-        {
-            if ( logLine.contains( "The requested optional projects" )
-                    && logLine.contains( ":does-not-exist" )
-                    && logLine.contains( "do not exist" ) )
-            {
-                projectSelectorMissingCounter++;
-            }
-            if ( logLine.contains( "The requested optional profiles" )
-                    && logLine.contains( "does-not-exist-either" )
-                    && logLine.contains( "do not exist" ) )
-            {
-                profileSelectorMissingCounter++;
-            }
-        }
-
-        Assert.assertEquals( 2, profileSelectorMissingCounter );
-        Assert.assertEquals( 2, projectSelectorMissingCounter );
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java
deleted file mode 100644
index 179d388df..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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 java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * Test for
- * <a href="https://issues.apache.org/jira/browse/MNG-7464">MNG-7464</a>
- *
- * @author Slawomir Jaranowski
- */
-public class MavenITmng7464ReadOnlyMojoParametersWarningTest extends AbstractMavenIntegrationTestCase
-{
-    public MavenITmng7464ReadOnlyMojoParametersWarningTest()
-    {
-        super( "[3.9.0,)" );
-    }
-
-    /**
-     * Test that ensures that warning is not printed for empty and default value
-     */
-    public void testEmptyConfiguration() throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7464-mojo-read-only-params" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.setLogFileName( "log-empty-configuration.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
-        List<String> warnLines = findReadOnlyWarning( logLines );
-
-        assertTrue( "Unwanted warnings: " + warnLines, warnLines.isEmpty() );
-    }
-
-    /**
-     * Test that ensures that warning is printed for read-only parameter set by property
-     */
-    public void testReadOnlyProperty()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7464-mojo-read-only-params" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.addCliOption( "-Duser.property=value" );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.setLogFileName( "log-read-only-property.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
-        List<String> warnLines = findReadOnlyWarning( logLines );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'readOnlyWithUserProperty' (user property 'user.property') is read-only, must not be used in configuration" ) );
-
-        assertTrue( "Not verified line: " + warnLines, warnLines.isEmpty() );
-    }
-
-    /**
-     * Test that ensures that warning is printed for read-only parameter set by plugin configuration.
-     */
-    public void testReadOnlyConfig() throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7464-mojo-read-only-params" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.setLogFileName( "log-read-only-configuration.txt" );
-        verifier.addCliOption( "-Pconfig-values" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
-        List<String> warnLines = findReadOnlyWarning( logLines );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'readOnlyWithDefault' is read-only, must not be used in configuration" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'readOnlyWithOutDefaults' is read-only, must not be used in configuration" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'readOnlyWithProperty' (user property 'project.version') is read-only, must not be used in configuration" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'readOnlyWithUserProperty' (user property 'user.property') is read-only, must not be used in configuration" ) );
-
-        assertTrue( "Not verified line: " + warnLines, warnLines.isEmpty() );
-
-    }
-
-    private List<String> findReadOnlyWarning( List<String> logLines )
-    {
-        Pattern pattern = Pattern.compile( "\\[WARNING] Parameter .* is read-only.*" );
-        List<String> result = new ArrayList<>();
-        for ( String line : logLines )
-        {
-            if ( pattern.matcher( line ).matches() )
-            {
-                result.add( line );
-            }
-        }
-        return result;
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java
deleted file mode 100644
index 57e63b38d..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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 java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * Test for
- * <a href="https://issues.apache.org/jira/browse/MNG-7468">MNG-7468</a>
- *
- * @author Slawomir Jaranowski
- */
-public class MavenITmng7468UnsupportedPluginsParametersTest extends AbstractMavenIntegrationTestCase
-{
-    public MavenITmng7468UnsupportedPluginsParametersTest()
-    {
-        super( "[3.9.0,)" );
-    }
-
-    /**
-     * Test that ensures that warning is not printed for empty configuration
-     */
-    public void testNoConfiguration() throws Exception
-    {
-        List<String> warnLines = performTest( "no-config" );
-        assertTrue( "Unwanted warnings: " + warnLines, warnLines.isEmpty() );
-    }
-
-    /**
-     * Test that ensures that warning is not printed for valid parameters
-     */
-    public void testValidParameter() throws Exception
-    {
-        List<String> warnLines = performTest( "valid-parameter" );
-        assertTrue( "Unwanted warnings: " + warnLines, warnLines.isEmpty() );
-    }
-
-    /**
-     * Test that ensures that warning is not printed for valid parameters
-     */
-    public void testValidParameterAlias() throws Exception
-    {
-        List<String> warnLines = performTest( "valid-parameter-alias" );
-        assertTrue( "Unwanted warnings: " + warnLines, warnLines.isEmpty() );
-    }
-
-    /**
-     * Test that ensures that warning is not printed for valid parameters
-     */
-    public void testValidParameterForOtherGoal() throws Exception
-    {
-        List<String> warnLines = performTest( "valid-parameter-other-goal" );
-        assertTrue( "Unwanted warnings: " + warnLines, warnLines.isEmpty() );
-    }
-
-    /**
-     * Test that ensures that warning is printed for configuration
-     */
-    public void testInBuildPlugin() throws Exception
-    {
-        List<String> warnLines = performTest( "config-build-plugin" );
-        assertWarningContains( warnLines );
-    }
-
-    /**
-     * Test that ensures that warning is printed for configuration
-     */
-    public void testInBuildExecution() throws Exception
-    {
-        List<String> warnLines = performTest( "config-build-execution" );
-        assertWarningContains( warnLines );
-    }
-
-    /**
-     * Test that ensures that warning is printed for configuration
-     */
-    public void testInBuildMixed() throws Exception
-    {
-        List<String> warnLines = performTest( "config-build-mixed" );
-        assertWarningContains( warnLines );
-    }
-
-    /**
-     * Test that ensures that warning is printed for configuration
-     */
-    public void testInPluginManagement() throws Exception
-    {
-        List<String> warnLines = performTest( "config-plugin-management" );
-        assertWarningContains( warnLines );
-    }
-
-    /**
-     * Test that ensures that warning is printed for configuration
-     */
-    public void testInPluginManagementParent() throws Exception
-    {
-        List<String> warnLines = performTest( "config-plugin-management-parent" );
-        assertWarningContains( warnLines );
-    }
-
-    /**
-     * Test that ensures that warning is printed for configuration
-     */
-    public void testWithForkedGoalExecution() throws Exception
-    {
-        List<String> warnLines = performTest( "config-with-fork-goal" );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'invalidXml' is unknown for plugin 'maven-it-plugin-fork:2.1-SNAPSHOT:fork-goal (fork)'" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'invalidParam' is unknown for plugin 'maven-it-plugin-fork:2.1-SNAPSHOT:fork-goal (fork)'" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'invalidXml' is unknown for plugin 'maven-it-plugin-fork:2.1-SNAPSHOT:touch (touch)'" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'invalidParam' is unknown for plugin 'maven-it-plugin-fork:2.1-SNAPSHOT:touch (touch)'" ) );
-
-        assertTrue( "Not verified line: " + warnLines, warnLines.isEmpty() );
-    }
-
-    private List<String> performTest( String project ) throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7468-unsupported-params" );
-
-        Verifier verifier = newVerifier( new File( testDir, project ).getAbsolutePath() );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
-        return findUnknownWarning( logLines );
-    }
-
-    private void assertWarningContains( List<String> warnLines )
-    {
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'invalidParam' is unknown for plugin 'maven-it-plugin-configuration:2.1-SNAPSHOT:touch (default)'" ) );
-
-        assertTrue( warnLines.remove(
-            "[WARNING] Parameter 'invalidXml' is unknown for plugin 'maven-it-plugin-configuration:2.1-SNAPSHOT:touch (default)'" ) );
-
-        assertTrue( "Not verified line: " + warnLines, warnLines.isEmpty() );
-    }
-
-    private List<String> findUnknownWarning( List<String> logLines )
-    {
-        Pattern pattern = Pattern.compile( "\\[WARNING] Parameter .* is unknown.*" );
-        List<String> result = new ArrayList<>();
-        for ( String line : logLines )
-        {
-            if ( pattern.matcher( line ).matches() )
-            {
-                result.add( line );
-            }
-        }
-
-        return result;
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java
deleted file mode 100644
index 1e7a7e014..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.apache.maven.it;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-7470">MNG-7470</a>:
- * check that Maven two bundled transports works as expected.
- */
-public class MavenITmng7470ResolverTransportTest
-        extends AbstractMavenIntegrationTestCase
-{
-    private File projectDir;
-
-    private HttpServer server;
-
-    private int port;
-
-    public MavenITmng7470ResolverTransportTest()
-    {
-        super( "[3.9.0,)" );
-    }
-
-    @Override
-    protected void setUp()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7470-resolver-transport" );
-        projectDir = new File( testDir, "project" );
-
-        server = HttpServer.builder()
-                .port( 0 )
-                .source( new File( testDir, "repo" ) )
-                .build();
-        server.start();
-        if ( server.isFailed() )
-        {
-            fail( "Couldn't bind the server socket to a free port!" );
-        }
-        port = server.port();
-        System.out.println( "Bound server socket to the port " + port );
-    }
-
-    @Override
-    protected void tearDown()
-        throws Exception
-    {
-        if ( server != null )
-        {
-            server.stop();
-            server.join();
-        }
-    }
-
-    private void performTest( /* nullable */ final String transport, final String logSnippet ) throws Exception
-    {
-        Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
-        verifier.setForkJvm( true );
-
-        Map<String, String> properties = new HashMap<>();
-        properties.put( "@port@", Integer.toString( port ) );
-        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", properties );
-        if ( transport == null )
-        {
-            verifier.setLogFileName( "default-transport.log" );
-        }
-        else
-        {
-            verifier.setLogFileName( transport + "-transport.log" );
-        }
-        verifier.deleteDirectory( "target" );
-        verifier.deleteArtifacts( "org.apache.maven.resolver.resolver-demo-maven-plugin" );
-        verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport" );
-        verifier.addCliOption( "-X" );
-        verifier.addCliOption( "-s" );
-        verifier.addCliOption( new File( projectDir, "settings.xml" ).getAbsolutePath() );
-        verifier.addCliOption( "-Pmaven-core-it-repo" );
-        if ( transport != null )
-        {
-            verifier.addCliOption( "-Dmaven.resolver.transport=" + transport );
-        }
-        // Maven will fail if project dependencies cannot be resolved.
-        // As dependency exists ONLY in HTTP repo, it MUST be reached using selected transport and
-        // successfully resolved from it.
-        verifier.executeGoal( "verify" );
-        verifier.verifyErrorFreeLog();
-        // verify maven console output contains "[DEBUG] Using transporter XXXTransporter"
-        verifier.verifyTextInLog( logSnippet );
-        verifier.resetStreams();
-    }
-
-    public void testResolverTransportDefault()
-            throws Exception
-    {
-        performTest( null, "[DEBUG] Using transporter WagonTransporter" );
-    }
-
-    public void testResolverTransportWagon()
-            throws Exception
-    {
-        performTest( "wagon", "[DEBUG] Using transporter WagonTransporter" );
-    }
-
-    public void testResolverTransportNative()
-            throws Exception
-    {
-        performTest( "native", "[DEBUG] Using transporter HttpTransporter" );
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java
deleted file mode 100644
index 7619a3028..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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 java.io.File;
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-7474">MNG-7474</a>:
- * check that Session scope beans are actually singletons for the session.
- */
-public class MavenITmng7474SessionScopeTest
-        extends AbstractMavenIntegrationTestCase
-{
-    public MavenITmng7474SessionScopeTest()
-    {
-        super( "[3.9.0,)" );
-    }
-
-    public void testSessionScope()
-            throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7474-session-scope" );
-
-        Verifier verifier = newVerifier( new File( testDir, "plugin" ).getAbsolutePath() );
-        verifier.executeGoal( "install" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier = newVerifier( new File( testDir, "project" ).getAbsolutePath() );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java
deleted file mode 100644
index 878d92477..000000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java
+++ /dev/null
@@ -1,61 +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.
- */
-package org.apache.maven.it;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * Test for
- * <a href="https://issues.apache.org/jira/browse/MNG-7504">MNG-7504</a>
- *
- * Warning about unsupported reportPlugins should not be printed for m-site-p.
- *
- * @author Slawomir Jaranowski
- */
-public class MavenITmng7504NotWarnUnsupportedReportPluginsTest extends AbstractMavenIntegrationTestCase
-{
-    private static final String PROJECT_PATH = "/mng-7504-warn-unsupported-report-plugins";
-
-    public MavenITmng7504NotWarnUnsupportedReportPluginsTest()
-    {
-        super( "[3.9.0]" );
-    }
-
-    public void testWarnNotPresent() throws IOException, VerificationException
-    {
-        File rootDir = ResourceExtractor.simpleExtractResources( getClass(), PROJECT_PATH );
-
-        Verifier verifier = newVerifier( rootDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.executeGoal( "site" );
-        verifier.resetStreams();
-
-        List<String> logLines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
-
-        for ( String line : logLines )
-        {
-            assertFalse( line.contains( "[WARNING] Parameter 'reportPlugins' is unknown for plugin 'maven-site-plugin:0.1-stub-SNAPSHOT:site (default-site)'" ) );
-        }
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-3991/pom.xml b/core-it-suite/src/test/resources/mng-3991/pom.xml
deleted file mode 100644
index 7421052b1..000000000
--- a/core-it-suite/src/test/resources/mng-3991/pom.xml
+++ /dev/null
@@ -1,43 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3991</groupId>
-  <artifactId>test</artifactId>
-  <version>0.1</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: MNG-3991</name>
-  <description>
-    Test that invalid dependency scopes cause a validation error during building.
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its.mng3991</groupId>
-      <artifactId>a</artifactId>
-      <version>0.1</version>
-      <scope>invalid</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-4262/parent/pom.xml b/core-it-suite/src/test/resources/mng-4262/parent/pom.xml
deleted file mode 100644
index 02a2d4143..000000000
--- a/core-it-suite/src/test/resources/mng-4262/parent/pom.xml
+++ /dev/null
@@ -1,61 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng4262</groupId>
-  <artifactId>parent</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <name>Maven Integration Test :: MNG-4262</name>
-  <description>
-    Test that the make-like reactor mode properly finds projects selected by relative paths with leading
-    dots like "." for the parent itself and "../sub-a" for a child in a sibling directory.
-  </description>
-
-  <modules>
-    <module>../sub-a</module>
-  </modules>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-log-file</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <configuration>
-          <logFile>target/touch.txt</logFile>
-        </configuration>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>reset</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-4262/sub-a/pom.xml b/core-it-suite/src/test/resources/mng-4262/sub-a/pom.xml
deleted file mode 100644
index d24359a23..000000000
--- a/core-it-suite/src/test/resources/mng-4262/sub-a/pom.xml
+++ /dev/null
@@ -1,38 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven.its.mng4262</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
-  </parent>
-
-  <groupId>org.apache.maven.its.mng4262</groupId>
-  <artifactId>sub-a</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: MNG-4262 :: Project A</name>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-4463/exclusive-upper-bound/pom.xml b/core-it-suite/src/test/resources/mng-4463/exclusive-upper-bound/pom.xml
deleted file mode 100644
index 54404ac24..000000000
--- a/core-it-suite/src/test/resources/mng-4463/exclusive-upper-bound/pom.xml
+++ /dev/null
@@ -1,76 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng4463</groupId>
-  <artifactId>test</artifactId>
-  <version>1.0</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: MNG-4463</name>
-  <description>
-    Tests that importing dependency management using version ranges
-    with exclusive upper bound resolves to the highest version.
-  </description>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven</artifactId>
-        <version>(,3.0.1)</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-dependency-resolution</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <configuration>
-          <compileArtifacts>target/compile.txt</compileArtifacts>
-        </configuration>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-4463/inclusive-upper-bound/pom.xml b/core-it-suite/src/test/resources/mng-4463/inclusive-upper-bound/pom.xml
deleted file mode 100644
index 0e91b01e7..000000000
--- a/core-it-suite/src/test/resources/mng-4463/inclusive-upper-bound/pom.xml
+++ /dev/null
@@ -1,76 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng4463</groupId>
-  <artifactId>test</artifactId>
-  <version>1.0</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: MNG-4463</name>
-  <description>
-    Tests that importing dependency management using version ranges
-    with inclusive upper bound resolves to the highest version.
-  </description>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven</artifactId>
-        <version>(,3.0]</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-dependency-resolution</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <configuration>
-          <compileArtifacts>target/compile.txt</compileArtifacts>
-        </configuration>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-4463/no-upper-bound/pom.xml b/core-it-suite/src/test/resources/mng-4463/no-upper-bound/pom.xml
deleted file mode 100644
index 53ec4e313..000000000
--- a/core-it-suite/src/test/resources/mng-4463/no-upper-bound/pom.xml
+++ /dev/null
@@ -1,54 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng4463</groupId>
-  <artifactId>test</artifactId>
-  <version>1.0</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: MNG-4463</name>
-  <description>
-    Tests that importing dependency management using version ranges
-    without upper bound fails.
-  </description>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven</artifactId>
-        <version>(3.0,)</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/pom.xml b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/pom.xml
deleted file mode 100644
index fc9eae410..000000000
--- a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/pom.xml
+++ /dev/null
@@ -1,46 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>module-a</artifactId>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng4660</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0</version>
-    </parent>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.0</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/src/main/java/org/apache/maven/it/Example.java b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/src/main/java/org/apache/maven/it/Example.java
deleted file mode 100644
index 1608aba21..000000000
--- a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-a/src/main/java/org/apache/maven/it/Example.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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 Example
-{
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/pom.xml b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/pom.xml
deleted file mode 100644
index 829c384b0..000000000
--- a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/pom.xml
+++ /dev/null
@@ -1,54 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>module-b</artifactId>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng4660</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <dependencies>
-      <dependency>
-          <groupId>org.apache.maven.its.mng4660</groupId>
-          <artifactId>module-a</artifactId>
-          <version>1.0</version>
-      </dependency>
-    </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.0</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/main/java/org/apache/maven/it/AnotherExample.java b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/main/java/org/apache/maven/it/AnotherExample.java
deleted file mode 100644
index 20ab1874a..000000000
--- a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/main/java/org/apache/maven/it/AnotherExample.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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 AnotherExample
-{
-    public AnotherExample()
-    {
-        new Example();
-    }
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/test/java/org/apache/maven/it/TestCase.java b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/test/java/org/apache/maven/it/TestCase.java
deleted file mode 100644
index 74a4579e5..000000000
--- a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/module-b/src/test/java/org/apache/maven/it/TestCase.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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.Test;
-
-public class TestCase
-{
-    @Test
-    public void testCase()
-    {
-        final Example example = new Example();
-    }
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/pom.xml b/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/pom.xml
deleted file mode 100644
index 2a2ba6333..000000000
--- a/core-it-suite/src/test/resources/mng-4660-outdated-packaged-artifact/pom.xml
+++ /dev/null
@@ -1,59 +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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.apache.maven.its.mng4660</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0</version>
-
-    <packaging>pom</packaging>
-
-    <name>Maven Integration Test :: MNG-4660</name>
-    <description>
-        This is a test case for a new check which verifies if a packaged artifact
-        within the Reactor is up-to-date with the outputDirectory of the same project.
-    </description>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-
-    <modules>
-        <module>module-b</module>
-        <module>module-a</module>
-    </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/pom.xml b/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/pom.xml
deleted file mode 100644
index fc9eae410..000000000
--- a/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/pom.xml
+++ /dev/null
@@ -1,46 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>module-a</artifactId>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng4660</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0</version>
-    </parent>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.0</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/src/main/java/org/apache/maven/it/Example.java b/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/src/main/java/org/apache/maven/it/Example.java
deleted file mode 100644
index 1608aba21..000000000
--- a/core-it-suite/src/test/resources/mng-4660-resume-from/module-a/src/main/java/org/apache/maven/it/Example.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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 Example
-{
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/pom.xml b/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/pom.xml
deleted file mode 100644
index 829c384b0..000000000
--- a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/pom.xml
+++ /dev/null
@@ -1,54 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>module-b</artifactId>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng4660</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <dependencies>
-      <dependency>
-          <groupId>org.apache.maven.its.mng4660</groupId>
-          <artifactId>module-a</artifactId>
-          <version>1.0</version>
-      </dependency>
-    </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.0</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/main/java/org/apache/maven/it/AnotherExample.java b/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/main/java/org/apache/maven/it/AnotherExample.java
deleted file mode 100644
index 20ab1874a..000000000
--- a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/main/java/org/apache/maven/it/AnotherExample.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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 AnotherExample
-{
-    public AnotherExample()
-    {
-        new Example();
-    }
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java b/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java
deleted file mode 100644
index 932ff5167..000000000
--- a/core-it-suite/src/test/resources/mng-4660-resume-from/module-b/src/test/java/org/apache/maven/it/TestCase.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.fail;
-
-public class TestCase
-{
-    @Test
-    public void testCase()
-    {
-        final Example example = new Example();
-        fail( "Deliberately fail test case" );
-    }
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml b/core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml
deleted file mode 100644
index f98cc761b..000000000
--- a/core-it-suite/src/test/resources/mng-4660-resume-from/pom.xml
+++ /dev/null
@@ -1,59 +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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.apache.maven.its.mng4660</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0</version>
-
-    <packaging>pom</packaging>
-
-    <name>Maven Integration Test :: MNG-4660</name>
-    <description>
-        Test that the --resume-from flag resolves dependencies inside the same Maven project
-        without having them installed first.
-    </description>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-
-    <modules>
-        <module>module-b</module>
-        <module>module-a</module>
-    </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-5222-mojo-deprecated-params/pom.xml b/core-it-suite/src/test/resources/mng-5222-mojo-deprecated-params/pom.xml
deleted file mode 100644
index 4fe36fd1f..000000000
--- a/core-it-suite/src/test/resources/mng-5222-mojo-deprecated-params/pom.xml
+++ /dev/null
@@ -1,105 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng5222</groupId>
-  <artifactId>maven-it-mng5222</artifactId>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: mng5222</name>
-  <description>
-    Test that ensures that warning about deprecated mojo params are generated.
-  </description>
-
-  <url>https://www.test.org</url>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-configuration</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>deprecated-config</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>config-values</id>
-      <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.its.plugins</groupId>
-              <artifactId>maven-it-plugin-configuration</artifactId>
-              <configuration>
-                <deprecatedParam>value1</deprecatedParam>
-                <deprecatedParam2>value2</deprecatedParam2>
-                <deprecatedParamWithDefaultConstant>value3</deprecatedParamWithDefaultConstant>
-                <deprecatedParamWithDefaultEvaluate>value4</deprecatedParamWithDefaultEvaluate>
-                <deprecatedArray>
-                  <item>a1</item>
-                  <item>a2</item>
-                </deprecatedArray>
-                <deprecatedArrayWithDefaults>
-                  <item>b1</item>
-                  <item>b2</item>
-                </deprecatedArrayWithDefaults>
-                <deprecatedList>
-                  <item>c1</item>
-                  <item>c2</item>
-                </deprecatedList>
-                <deprecatedListWithDefaults>
-                  <item>d1</item>
-                  <item>d2</item>
-                </deprecatedListWithDefaults>
-                <deprecatedProperties>
-                  <property>
-                    <name>propertyName1</name>
-                    <value>propertyValue1</value>
-                  </property>
-                  <property>
-                    <name>propertyName2</name>
-                    <value>propertyValue2</value>
-                  </property>
-                </deprecatedProperties>
-                <deprecatedMap>
-                  <key1>value1</key1>
-                  <key2>value2</key2>
-                </deprecatedMap>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
-  </profiles>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-5669-read-poms-once/.mvn/jvm.config b/core-it-suite/src/test/resources/mng-5669-read-poms-once/.mvn/jvm.config
deleted file mode 100644
index faba2c1ac..000000000
--- a/core-it-suite/src/test/resources/mng-5669-read-poms-once/.mvn/jvm.config
+++ /dev/null
@@ -1 +0,0 @@
--javaagent:${javaAgentJar}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-5669-read-poms-once/module1/pom.xml b/core-it-suite/src/test/resources/mng-5669-read-poms-once/module1/pom.xml
deleted file mode 100644
index 6010dbcf2..000000000
--- a/core-it-suite/src/test/resources/mng-5669-read-poms-once/module1/pom.xml
+++ /dev/null
@@ -1,32 +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>mng5669</groupId>
-    <artifactId>project</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>module1</artifactId>
-
-</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-5669-read-poms-once/module2/pom.xml b/core-it-suite/src/test/resources/mng-5669-read-poms-once/module2/pom.xml
deleted file mode 100644
index 7983fbdd3..000000000
--- a/core-it-suite/src/test/resources/mng-5669-read-poms-once/module2/pom.xml
+++ /dev/null
@@ -1,39 +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>mng5669</groupId>
-    <artifactId>project</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>module2</artifactId>
-
-  <dependencies>
-    <dependency>
-      <groupId>mng5669</groupId>
-      <artifactId>module1</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-5669-read-poms-once/module3/pom.xml b/core-it-suite/src/test/resources/mng-5669-read-poms-once/module3/pom.xml
deleted file mode 100644
index 155046c5a..000000000
--- a/core-it-suite/src/test/resources/mng-5669-read-poms-once/module3/pom.xml
+++ /dev/null
@@ -1,40 +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>mng5669</groupId>
-    <artifactId>project</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>module3</artifactId>
-
-  <dependencies>
-    <dependency>
-      <groupId>mng5669</groupId>
-      <artifactId>module2</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-5669-read-poms-once/pom.xml b/core-it-suite/src/test/resources/mng-5669-read-poms-once/pom.xml
deleted file mode 100644
index 8b41e0b6a..000000000
--- a/core-it-suite/src/test/resources/mng-5669-read-poms-once/pom.xml
+++ /dev/null
@@ -1,63 +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>mng5669</groupId>
-  <artifactId>project</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>module1</module>
-    <module>module2</module>
-    <module>module3</module>
-  </modules>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>3.2.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.10.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M5</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>3.2.0</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-a/pom.xml b/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-a/pom.xml
deleted file mode 100644
index 8104eb18f..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-a/pom.xml
+++ /dev/null
@@ -1,46 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>module-a</artifactId>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng5760</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0</version>
-    </parent>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.0</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-a/src/test/java/org/apache/maven/it/TestCase.java b/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-a/src/test/java/org/apache/maven/it/TestCase.java
deleted file mode 100644
index fcc1662ef..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-a/src/test/java/org/apache/maven/it/TestCase.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.fail;
-
-public class TestCase
-{
-    @Test
-    public void testCase() throws Exception
-    {
-        Thread.sleep( Integer.getInteger( "module-a.delay", 0 ) );
-        if ( Boolean.getBoolean("module-a.fail") )
-        {
-            fail("Deliberately fail test case in module A");
-        }
-    }
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-b/pom.xml b/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-b/pom.xml
deleted file mode 100644
index b64336a95..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-b/pom.xml
+++ /dev/null
@@ -1,46 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>module-b</artifactId>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng5760</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0</version>
-    </parent>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.0</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-b/src/test/java/org/apache/maven/it/TestCase.java b/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-b/src/test/java/org/apache/maven/it/TestCase.java
deleted file mode 100644
index 454578a63..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-b/src/test/java/org/apache/maven/it/TestCase.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.fail;
-
-public class TestCase
-{
-    @Test
-    public void testCase() throws Exception
-    {
-        Thread.sleep( Integer.getInteger( "module-b.delay", 0 ) );
-        if ( Boolean.getBoolean("module-b.fail") )
-        {
-            fail("Deliberately fail test case in module B");
-        }
-    }
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-c/pom.xml b/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-c/pom.xml
deleted file mode 100644
index 84845954f..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-c/pom.xml
+++ /dev/null
@@ -1,54 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>module-c</artifactId>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng5760</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven.its.mng5760</groupId>
-            <artifactId>module-b</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.0</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-c/src/test/java/org/apache/maven/it/TestCase.java b/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-c/src/test/java/org/apache/maven/it/TestCase.java
deleted file mode 100644
index 6931a0207..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-c/src/test/java/org/apache/maven/it/TestCase.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.fail;
-
-public class TestCase
-{
-    @Test
-    public void testCase() throws Exception
-    {
-        Thread.sleep( Integer.getInteger( "module-c.delay", 0 ) );
-        if ( Boolean.getBoolean("module-c.fail") )
-        {
-            fail("Deliberately fail test case in module C");
-        }
-    }
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-d/pom.xml b/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-d/pom.xml
deleted file mode 100644
index 3a501b6ef..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-d/pom.xml
+++ /dev/null
@@ -1,54 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>module-d</artifactId>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng5760</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven.its.mng5760</groupId>
-            <artifactId>module-a</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.0</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-d/src/test/java/org/apache/maven/it/TestCase.java b/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-d/src/test/java/org/apache/maven/it/TestCase.java
deleted file mode 100644
index 34f7752a9..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/module-d/src/test/java/org/apache/maven/it/TestCase.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.fail;
-
-public class TestCase
-{
-    @Test
-    public void testCase() throws Exception
-    {
-        Thread.sleep( Integer.getInteger( "module-d.delay", 0 ) );
-        if ( Boolean.getBoolean("module-d.fail") )
-        {
-            fail("Deliberately fail test case in module D");
-        }
-    }
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/pom.xml b/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/pom.xml
deleted file mode 100644
index 2d15253a8..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/four-modules/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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.apache.maven.its.mng5760</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0</version>
-
-    <packaging>pom</packaging>
-
-    <name>Maven Integration Test :: MNG-5760</name>
-    <description>
-        Tests for the --resume flag.
-    </description>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-
-    <modules>
-        <module>module-a</module>
-        <module>module-b</module>
-        <module>module-c</module>
-        <module>module-d</module>
-    </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/no-project/.gitkeep b/core-it-suite/src/test/resources/mng-5760-resume-feature/no-project/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-a/pom.xml b/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-a/pom.xml
deleted file mode 100644
index 8104eb18f..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-a/pom.xml
+++ /dev/null
@@ -1,46 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>module-a</artifactId>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng5760</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0</version>
-    </parent>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.0</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-a/src/test/java/org/apache/maven/it/TestCase.java b/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-a/src/test/java/org/apache/maven/it/TestCase.java
deleted file mode 100644
index 503ccc600..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-a/src/test/java/org/apache/maven/it/TestCase.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.fail;
-
-public class TestCase
-{
-    @Test
-    public void testCase()
-    {
-        if ( Boolean.getBoolean("module-a.fail") )
-        {
-            fail("Deliberately fail test case in module A");
-        }
-    }
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-b/pom.xml b/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-b/pom.xml
deleted file mode 100644
index b64336a95..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-b/pom.xml
+++ /dev/null
@@ -1,46 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>module-b</artifactId>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng5760</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0</version>
-    </parent>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.0</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-b/src/test/java/org/apache/maven/it/TestCase.java b/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-b/src/test/java/org/apache/maven/it/TestCase.java
deleted file mode 100644
index a624bcf61..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-b/src/test/java/org/apache/maven/it/TestCase.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.fail;
-
-public class TestCase
-{
-    @Test
-    public void testCase()
-    {
-        if ( Boolean.getBoolean("module-b.fail") )
-        {
-            fail("Deliberately fail test case in module B");
-        }
-    }
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/pom.xml b/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/pom.xml
deleted file mode 100644
index 84845954f..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/pom.xml
+++ /dev/null
@@ -1,54 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>module-c</artifactId>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng5760</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven.its.mng5760</groupId>
-            <artifactId>module-b</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.0</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/src/test/java/org/apache/maven/it/TestCase.java b/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/src/test/java/org/apache/maven/it/TestCase.java
deleted file mode 100644
index 1cb0415f5..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/src/test/java/org/apache/maven/it/TestCase.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.fail;
-
-public class TestCase
-{
-    @Test
-    public void testCase()
-    {
-        if ( Boolean.getBoolean("module-c.fail") )
-        {
-            fail("Deliberately fail test case in module C");
-        }
-    }
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/pom.xml b/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/pom.xml
deleted file mode 100644
index 8df0d4ca5..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/pom.xml
+++ /dev/null
@@ -1,59 +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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.apache.maven.its.mng5760</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0</version>
-
-    <packaging>pom</packaging>
-
-    <name>Maven Integration Test :: MNG-5760</name>
-    <description>
-        Tests for the --resume flag.
-    </description>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-
-    <modules>
-        <module>module-a</module>
-        <module>module-b</module>
-        <module>module-c</module>
-    </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/pom.xml b/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/pom.xml
deleted file mode 100644
index 8f0f72118..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/pom.xml
+++ /dev/null
@@ -1,51 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.apache.maven.its.mng5760.parentindependent</groupId>
-    <artifactId>module-a</artifactId>
-    <version>1.0</version>
-
-    <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-plugin</artifactId>
-        <version>2.22.0</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/src/test/java/org/apache/maven/it/TestCase.java b/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/src/test/java/org/apache/maven/it/TestCase.java
deleted file mode 100644
index 503ccc600..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-a/src/test/java/org/apache/maven/it/TestCase.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.fail;
-
-public class TestCase
-{
-    @Test
-    public void testCase()
-    {
-        if ( Boolean.getBoolean("module-a.fail") )
-        {
-            fail("Deliberately fail test case in module A");
-        }
-    }
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/pom.xml b/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/pom.xml
deleted file mode 100644
index 195303d8c..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/pom.xml
+++ /dev/null
@@ -1,51 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.apache.maven.its.mng5760.parentindependent</groupId>
-    <artifactId>module-b</artifactId>
-    <version>1.0</version>
-
-    <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-plugin</artifactId>
-        <version>2.22.0</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/src/test/java/org/apache/maven/it/TestCase.java b/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/src/test/java/org/apache/maven/it/TestCase.java
deleted file mode 100644
index a624bcf61..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/module-b/src/test/java/org/apache/maven/it/TestCase.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.apache.maven.it;
-
-/*
- * 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.Test;
-
-import static org.junit.Assert.fail;
-
-public class TestCase
-{
-    @Test
-    public void testCase()
-    {
-        if ( Boolean.getBoolean("module-b.fail") )
-        {
-            fail("Deliberately fail test case in module B");
-        }
-    }
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/pom.xml b/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/pom.xml
deleted file mode 100644
index d7ffdaa4c..000000000
--- a/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-independent/pom.xml
+++ /dev/null
@@ -1,49 +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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.apache.maven.its.mng5760.parentindependent</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0</version>
-
-    <packaging>pom</packaging>
-
-    <name>Maven Integration Test :: MNG-5760</name>
-    <description>
-        Tests for the --resume flag.
-    </description>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-
-    <modules>
-        <module>module-a</module>
-        <module>module-b</module>
-    </modules>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6065-fail-on-severity/pom.xml b/core-it-suite/src/test/resources/mng-6065-fail-on-severity/pom.xml
deleted file mode 100644
index d08153d1a..000000000
--- a/core-it-suite/src/test/resources/mng-6065-fail-on-severity/pom.xml
+++ /dev/null
@@ -1,35 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng6065</groupId>
-  <artifactId>test</artifactId>
-  <version>0.1</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: MNG-6065</name>
-  <description>
-    An integration test to verify that builds fail when logs occur above or equal to the --fail-on-severity cli property.
-    An empty project like this will already log warnings about the platform encoding and the empty jar.
-  </description>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/.mvn/.gitkeep b/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/.mvn/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/app/pom.xml b/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/app/pom.xml
deleted file mode 100644
index 88a66356f..000000000
--- a/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/app/pom.xml
+++ /dev/null
@@ -1,45 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>parent</artifactId>
-    <groupId>org.apache.its.mng6118</groupId>
-    <version>1.0</version>
-  </parent>
-
-  <artifactId>app</artifactId>
-  <name>Maven Integration Test :: MNG-6118 :: Application</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.its.mng6118</groupId>
-      <artifactId>lib</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/app/src/main/java/org/apache/its/mng6118/App.java b/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/app/src/main/java/org/apache/its/mng6118/App.java
deleted file mode 100644
index 77213e783..000000000
--- a/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/app/src/main/java/org/apache/its/mng6118/App.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.apache.its.mng6118;
-
-/*
- * 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 App
-{
-    public static void main( String[] args )
-    {
-        new Helper().generateObject();
-        System.out.println( "Hello World!" );
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/app/src/test/java/org/apache/its/mng6118/AppTest.java b/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/app/src/test/java/org/apache/its/mng6118/AppTest.java
deleted file mode 100644
index cea86afdf..000000000
--- a/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/app/src/test/java/org/apache/its/mng6118/AppTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.apache.its.mng6118;
-
-/*
- * 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 static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class AppTest
-{
-    @Test
-    public void shouldAnswerWithTrue()
-    {
-        assertTrue( true );
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/lib/pom.xml b/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/lib/pom.xml
deleted file mode 100644
index 5f1a103ea..000000000
--- a/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/lib/pom.xml
+++ /dev/null
@@ -1,41 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>parent</artifactId>
-    <groupId>org.apache.its.mng6118</groupId>
-    <version>1.0</version>
-  </parent>
-
-  <artifactId>lib</artifactId>
-  <name>Maven Integration Test :: MNG-6118 :: Library</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/lib/src/main/java/org/apache/its/mng6118/Helper.java b/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/lib/src/main/java/org/apache/its/mng6118/Helper.java
deleted file mode 100644
index bb8ad0c38..000000000
--- a/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/lib/src/main/java/org/apache/its/mng6118/Helper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.apache.its.mng6118;
-
-/*
- * 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 Helper
-{
-    public Object generateObject()
-    {
-        return new Object();
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/lib/src/test/java/org/apache/its/mng6118/HelperTest.java b/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/lib/src/test/java/org/apache/its/mng6118/HelperTest.java
deleted file mode 100644
index 8ed813326..000000000
--- a/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/lib/src/test/java/org/apache/its/mng6118/HelperTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.its.mng6118;
-
-/*
- * 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 static org.junit.Assert.assertThat;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-
-import org.junit.Test;
-
-public class HelperTest
-{
-    private final Helper helper = new Helper();
-
-    @Test
-    public void shouldAnswerWithTrue()
-    {
-        assertThat( helper.generateObject(), is( notNullValue() ) );
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/pom.xml b/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/pom.xml
deleted file mode 100644
index 9db0e9958..000000000
--- a/core-it-suite/src/test/resources/mng-6118-submodule-invocation-full-reactor/pom.xml
+++ /dev/null
@@ -1,82 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.its.mng6118</groupId>
-  <artifactId>parent</artifactId>
-  <version>1.0</version>
-
-  <packaging>pom</packaging>
-
-  <name>Maven Integration Test :: MNG-6118</name>
-  <description>
-    Tests for invoking Maven in a submodule while having access to the full reactor.
-  </description>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
-  </properties>
-
-  <modules>
-    <module>lib</module>
-    <module>app</module>
-  </modules>
-
-  <build>
-    <pluginManagement>
-      <!-- maven-resources-plugin, maven-compiler-plugin -->
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.7</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.0.2</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.its.mng6118</groupId>
-        <artifactId>lib</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.12</version>
-        <scope>test</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6511-optional-project-selection/.mvn/.gitkeep b/core-it-suite/src/test/resources/mng-6511-optional-project-selection/.mvn/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/core-it-suite/src/test/resources/mng-6511-optional-project-selection/existing-module/pom.xml b/core-it-suite/src/test/resources/mng-6511-optional-project-selection/existing-module/pom.xml
deleted file mode 100644
index 15902f9cd..000000000
--- a/core-it-suite/src/test/resources/mng-6511-optional-project-selection/existing-module/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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>parent</artifactId>
-    <groupId>org.apache.its.mng6511</groupId>
-    <version>1.0</version>
-  </parent>
-
-  <artifactId>existing-module</artifactId>
-  <name>Maven Integration Test :: MNG-6511 :: Existing Module</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-log-file</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <configuration>
-          <logFile>target/touch.txt</logFile>
-        </configuration>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>reset</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6511-optional-project-selection/existing-module/src/main/java/org/apache/its/mng6511/App.java b/core-it-suite/src/test/resources/mng-6511-optional-project-selection/existing-module/src/main/java/org/apache/its/mng6511/App.java
deleted file mode 100644
index bf9958024..000000000
--- a/core-it-suite/src/test/resources/mng-6511-optional-project-selection/existing-module/src/main/java/org/apache/its/mng6511/App.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.apache.its.mng6511;
-
-/*
- * 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 App
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-6511-optional-project-selection/pom.xml b/core-it-suite/src/test/resources/mng-6511-optional-project-selection/pom.xml
deleted file mode 100644
index 98c2253de..000000000
--- a/core-it-suite/src/test/resources/mng-6511-optional-project-selection/pom.xml
+++ /dev/null
@@ -1,65 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.its.mng6511</groupId>
-  <artifactId>parent</artifactId>
-  <version>1.0</version>
-
-  <packaging>pom</packaging>
-
-  <name>Maven Integration Test :: MNG-6511</name>
-  <description>
-    Tests for selecting and deselecting optional projects using the question mark classifier.
-  </description>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
-  </properties>
-
-  <modules>
-    <module>existing-module</module>
-  </modules>
-
-  <build>
-    <pluginManagement>
-      <!-- maven-resources-plugin, maven-compiler-plugin -->
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.7</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.0.2</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/consumer/pom.xml b/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/consumer/pom.xml
deleted file mode 100644
index 07579f561..000000000
--- a/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/consumer/pom.xml
+++ /dev/null
@@ -1,54 +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.its.mng6566</groupId>
-  <artifactId>consumer</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.mng6566</groupId>
-        <artifactId>plugin</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>require-compile-phase</goal>
-            </goals>
-            <phase>compile</phase>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>0.1-stub-SNAPSHOT</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/plugin/pom.xml b/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/plugin/pom.xml
deleted file mode 100644
index bdb977a55..000000000
--- a/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/plugin/pom.xml
+++ /dev/null
@@ -1,52 +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.its.mng6566</groupId>
-  <artifactId>plugin</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>maven-plugin</packaging>
-
-  <properties>
-    <maven-version>3.6.0</maven-version>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <version>${maven-version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>${maven-version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/plugin/src/main/java/testmojo/RequiresCompilePhaseMojo.java b/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/plugin/src/main/java/testmojo/RequiresCompilePhaseMojo.java
deleted file mode 100644
index d469e93bc..000000000
--- a/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/plugin/src/main/java/testmojo/RequiresCompilePhaseMojo.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package testmojo;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Execute;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-
-@Mojo( name = "require-compile-phase" )
-@Execute( phase = LifecyclePhase.COMPILE )
-public class RequiresCompilePhaseMojo extends AbstractMojo
-{
-    public void execute() throws MojoExecutionException, MojoFailureException
-    {
-        getLog().info( "MNG-6566 plugin require-compile-phase goal executed" );
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent.pom b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent.pom
deleted file mode 100644
index 46447bf64..000000000
--- a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent.pom
+++ /dev/null
@@ -1,32 +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 https://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.sonatype.mavenbook.multi</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.9-MNG6656-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>Multi Chapter Parent Project</name>
-
-  <!-- Optimized from https://github.com/sonatype/maven-example-en/tree/master/examples/ch-multi -->
-  
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-parent.pom b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-parent.pom
deleted file mode 100644
index b7261985d..000000000
--- a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-parent.pom
+++ /dev/null
@@ -1,46 +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 https://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.9-MNG6656-SNAPSHOT</version>
-  </parent>
-  <artifactId>simple-parent</artifactId>
-  <packaging>pom</packaging>
-  <name>Multi Chapter Simple Parent Project</name>
- 
-  
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather.pom b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather.pom
deleted file mode 100644
index 970ec4779..000000000
--- a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather.pom
+++ /dev/null
@@ -1,34 +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 https://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>simple-parent</artifactId>
-    <version>0.9-MNG6656-SNAPSHOT</version>
-  </parent>
-  <artifactId>simple-weather</artifactId>
-  <packaging>jar</packaging>
-
-  <name>Multi Chapter Simple Weather API</name>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp.pom b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp.pom
deleted file mode 100644
index c7977a6d3..000000000
--- a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp.pom
+++ /dev/null
@@ -1,51 +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 https://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>simple-parent</artifactId>
-    <version>0.9-MNG6656-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>simple-webapp</artifactId>
-  <name>Multi Chapter Simple Web Application Project</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.sonatype.mavenbook.multi</groupId>
-      <artifactId>simple-weather</artifactId>
-      <version>0.9-MNG6656-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <finalName>simple-webapp</finalName>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-war-plugin</artifactId>
-          <version>2.6</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml b/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml
deleted file mode 100644
index 5060c68b5..000000000
--- a/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml
+++ /dev/null
@@ -1,36 +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 https://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.sonatype.mavenbook.multi</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.9-${changelist}-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>Multi Chapter Parent Project</name>
-
-  <!-- Optimized from https://github.com/sonatype/maven-example-en/tree/master/examples/ch-multi -->
-  <modules>
-    <module>simple-parent</module>
-  </modules>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml b/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml
deleted file mode 100644
index 2fbd5b203..000000000
--- a/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml
+++ /dev/null
@@ -1,50 +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 https://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>parent</artifactId>
-  </parent>
-  <artifactId>simple-parent</artifactId>
-  <packaging>pom</packaging>
-  <name>Multi Chapter Simple Parent Project</name>
- 
-  <modules>
-    <module>simple-weather</module>
-    <module>simple-webapp</module>
-  </modules>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml b/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml
deleted file mode 100644
index 4c19d0d58..000000000
--- a/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml
+++ /dev/null
@@ -1,35 +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 https://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>simple-parent</artifactId>
-  </parent>
-  <artifactId>simple-weather</artifactId>
-  <packaging>jar</packaging>
-
-  <name>Multi Chapter Simple Weather API</name>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml b/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml
deleted file mode 100644
index 776d54d07..000000000
--- a/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml
+++ /dev/null
@@ -1,51 +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 https://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>simple-parent</artifactId>
-  </parent>
-
-  <artifactId>simple-webapp</artifactId>
-  <name>Multi Chapter Simple Web Application Project</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.sonatype.mavenbook.multi</groupId>
-      <artifactId>simple-weather</artifactId>
-    </dependency>
-  </dependencies>
-  <build>
-    <finalName>simple-webapp</finalName>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-war-plugin</artifactId>
-          <version>2.6</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent.pom
deleted file mode 100644
index 9291614f0..000000000
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/parent.pom
+++ /dev/null
@@ -1,32 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.sonatype.mavenbook.multi</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.9-MNG6957-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>Multi Chapter Parent Project</name>
-
-  <!-- Optimized from https://github.com/sonatype/maven-example-en/tree/master/examples/ch-multi -->
-  
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent.pom
deleted file mode 100644
index cad5dee90..000000000
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-parent.pom
+++ /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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.9-MNG6957-SNAPSHOT</version>
-  </parent>
-  <artifactId>simple-parent</artifactId>
-  <packaging>pom</packaging>
-  <name>Multi Chapter Simple Parent Project</name>
- 
-  
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>0.1-stub-SNAPSHOT</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils.pom
deleted file mode 100644
index 05580dcd1..000000000
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils.pom
+++ /dev/null
@@ -1,30 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>utils-parent</artifactId>
-    <version>0.9-MNG6957-SNAPSHOT</version>
-  </parent>
-  <artifactId>simple-testutils</artifactId>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom
deleted file mode 100644
index 43bfc9c55..000000000
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom
+++ /dev/null
@@ -1,43 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>simple-parent</artifactId>
-    <version>0.9-MNG6957-SNAPSHOT</version>
-  </parent>
-  <artifactId>simple-weather</artifactId>
-  <packaging>jar</packaging>
-
-  <name>Multi Chapter Simple Weather API</name>
-  
-  <dependencies>
-    <dependency>
-      <groupId>org.sonatype.mavenbook.multi</groupId>
-      <artifactId>simple-testutils</artifactId>
-      <scope>test</scope>
-      <version>0.9-MNG6957-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp.pom
deleted file mode 100644
index edde31ab7..000000000
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp.pom
+++ /dev/null
@@ -1,51 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>simple-parent</artifactId>
-    <version>0.9-MNG6957-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>simple-webapp</artifactId>
-  <name>Multi Chapter Simple Web Application Project</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.sonatype.mavenbook.multi</groupId>
-      <artifactId>simple-weather</artifactId>
-      <version>0.9-MNG6957-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <finalName>simple-webapp</finalName>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-war-plugin</artifactId>
-          <version>2.6</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent.pom
deleted file mode 100644
index a7fedb617..000000000
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent.pom
+++ /dev/null
@@ -1,31 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>simple-parent</artifactId>
-    <version>0.9-MNG6957-SNAPSHOT</version>
-  </parent>
-  <artifactId>utils-parent</artifactId>
-  <packaging>pom</packaging>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml b/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml
deleted file mode 100644
index 46c4767b9..000000000
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml
+++ /dev/null
@@ -1,36 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.sonatype.mavenbook.multi</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.9-${changelist}-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>Multi Chapter Parent Project</name>
-
-  <!-- Optimized from https://github.com/sonatype/maven-example-en/tree/master/examples/ch-multi -->
-  <modules>
-    <module>simple-parent</module>
-  </modules>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml
deleted file mode 100644
index 40c8b0f3c..000000000
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>parent</artifactId>
-  </parent>
-  <artifactId>simple-parent</artifactId>
-  <packaging>pom</packaging>
-  <name>Multi Chapter Simple Parent Project</name>
- 
-  <modules>
-    <module>simple-weather</module>
-    <module>simple-webapp</module>
-
-    <!-- On purpose at the end, project graph is responsible for ordering -->
-    <!-- Build/consumer should not be effected by reverse order -->
-    <module>simple-testutils</module>
-    <module>utils-parent</module>
-  </modules>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>0.1-stub-SNAPSHOT</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml
deleted file mode 100644
index 3fab2e680..000000000
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml
+++ /dev/null
@@ -1,32 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>utils-parent</artifactId>
-    <relativePath>../utils-parent</relativePath>
-  </parent>
-  <artifactId>simple-testutils</artifactId>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml
deleted file mode 100644
index 800d68063..000000000
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml
+++ /dev/null
@@ -1,43 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>simple-parent</artifactId>
-  </parent>
-  <artifactId>simple-weather</artifactId>
-  <packaging>jar</packaging>
-
-  <name>Multi Chapter Simple Weather API</name>
-  
-  <dependencies>
-    <dependency>
-      <groupId>org.sonatype.mavenbook.multi</groupId>
-      <artifactId>simple-testutils</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml
deleted file mode 100644
index b1068b7ce..000000000
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml
+++ /dev/null
@@ -1,51 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>simple-parent</artifactId>
-  </parent>
-
-  <artifactId>simple-webapp</artifactId>
-  <name>Multi Chapter Simple Web Application Project</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.sonatype.mavenbook.multi</groupId>
-      <artifactId>simple-weather</artifactId>
-    </dependency>
-  </dependencies>
-  <build>
-    <finalName>simple-webapp</finalName>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-war-plugin</artifactId>
-          <version>2.6</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml
deleted file mode 100644
index cff9f65a7..000000000
--- a/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml
+++ /dev/null
@@ -1,32 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>simple-parent</artifactId>
-  </parent>
-  <artifactId>utils-parent</artifactId>
-  <packaging>pom</packaging>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6981-pl-should-include-children/module-a/module-a-1/pom.xml b/core-it-suite/src/test/resources/mng-6981-pl-should-include-children/module-a/module-a-1/pom.xml
deleted file mode 100644
index f004e69a5..000000000
--- a/core-it-suite/src/test/resources/mng-6981-pl-should-include-children/module-a/module-a-1/pom.xml
+++ /dev/null
@@ -1,36 +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>
-
-    <artifactId>module-a-1</artifactId>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng6981</groupId>
-        <artifactId>module-a</artifactId>
-        <version>1.0</version>
-    </parent>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6981-pl-should-include-children/module-a/pom.xml b/core-it-suite/src/test/resources/mng-6981-pl-should-include-children/module-a/pom.xml
deleted file mode 100644
index 2b1c7fa3a..000000000
--- a/core-it-suite/src/test/resources/mng-6981-pl-should-include-children/module-a/pom.xml
+++ /dev/null
@@ -1,42 +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>
-
-    <artifactId>module-a</artifactId>
-
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng6981</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <modules>
-        <module>module-a-1</module>
-    </modules>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-6981-pl-should-include-children/pom.xml b/core-it-suite/src/test/resources/mng-6981-pl-should-include-children/pom.xml
deleted file mode 100644
index 09e643fad..000000000
--- a/core-it-suite/src/test/resources/mng-6981-pl-should-include-children/pom.xml
+++ /dev/null
@@ -1,48 +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.its.mng6981</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0</version>
-
-    <packaging>pom</packaging>
-
-    <name>Maven Integration Test :: MNG-6981</name>
-    <description>
-        Test that the --projects flag will include the target project's children in the reactor.
-    </description>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-
-    <modules>
-        <module>module-a</module>
-    </modules>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7051-optional-profile-activation/pom.xml b/core-it-suite/src/test/resources/mng-7051-optional-profile-activation/pom.xml
deleted file mode 100644
index 0963c0b8f..000000000
--- a/core-it-suite/src/test/resources/mng-7051-optional-profile-activation/pom.xml
+++ /dev/null
@@ -1,37 +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.its.mng7051</groupId>
-    <artifactId>profile-selection</artifactId>
-    <version>1.0</version>
-
-    <profiles>
-        <profile>
-            <id>existing</id>
-        </profile>
-    </profiles>
-
-</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/aggregator-a/module-a/pom.xml b/core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/aggregator-a/module-a/pom.xml
deleted file mode 100644
index 5be4706f8..000000000
--- a/core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/aggregator-a/module-a/pom.xml
+++ /dev/null
@@ -1,44 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>module-a</artifactId>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng7112</groupId>
-        <artifactId>aggregator-a</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.its.plugins</groupId>
-                <artifactId>maven-it-plugin-log-file</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/aggregator-a/pom.xml b/core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/aggregator-a/pom.xml
deleted file mode 100644
index 81fbb5471..000000000
--- a/core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/aggregator-a/pom.xml
+++ /dev/null
@@ -1,50 +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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>aggregator-a</artifactId>
-    <version>1.0</version>
-
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng7112</groupId>
-        <artifactId>aggregator</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <modules>
-        <module>module-a</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.its.plugins</groupId>
-                <artifactId>maven-it-plugin-log-file</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/aggregator-b/module-b/pom.xml b/core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/aggregator-b/module-b/pom.xml
deleted file mode 100644
index dfe26dcca..000000000
--- a/core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/aggregator-b/module-b/pom.xml
+++ /dev/null
@@ -1,44 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>module-b</artifactId>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng7112</groupId>
-        <artifactId>aggregator-b</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.its.plugins</groupId>
-                <artifactId>maven-it-plugin-log-file</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/aggregator-b/pom.xml b/core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/aggregator-b/pom.xml
deleted file mode 100644
index 0220935a5..000000000
--- a/core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/aggregator-b/pom.xml
+++ /dev/null
@@ -1,50 +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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>aggregator-b</artifactId>
-    <version>1.0</version>
-
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng7112</groupId>
-        <artifactId>aggregator</artifactId>
-        <version>1.0</version>
-    </parent>
-
-    <modules>
-        <module>module-b</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.its.plugins</groupId>
-                <artifactId>maven-it-plugin-log-file</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/pom.xml b/core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/pom.xml
deleted file mode 100644
index 149b38111..000000000
--- a/core-it-suite/src/test/resources/mng-7112-projects-with-non-recursive/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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.apache.maven.its.mng7112</groupId>
-    <artifactId>aggregator</artifactId>
-    <version>1.0</version>
-
-    <packaging>pom</packaging>
-
-    <name>Maven Integration Test :: MNG-7112</name>
-    <description>
-        Test that --non-recursive can be used together with --projects to just build the aggregator project.
-    </description>
-
-    <modules>
-        <module>aggregator-a</module>
-        <module>aggregator-b</module>
-    </modules>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.its.plugins</groupId>
-                    <artifactId>maven-it-plugin-log-file</artifactId>
-                    <version>2.1-SNAPSHOT</version>
-                    <configuration>
-                        <logFile>target/touch.txt</logFile>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>test</id>
-                            <phase>validate</phase>
-                            <goals>
-                                <goal>reset</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.its.plugins</groupId>
-                <artifactId>maven-it-plugin-log-file</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7244-ignore-pom-prefix-in-expressions/pom.xml b/core-it-suite/src/test/resources/mng-7244-ignore-pom-prefix-in-expressions/pom.xml
deleted file mode 100644
index 2f034e1ea..000000000
--- a/core-it-suite/src/test/resources/mng-7244-ignore-pom-prefix-in-expressions/pom.xml
+++ /dev/null
@@ -1,12 +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.its.mng7244</groupId>
-    <artifactId>deprecated-pom-placeholders-should-be-ignored</artifactId>
-    <version>1.0</version>
-
-    <properties>
-        <projectVersion>${pom.version}</projectVersion>
-    </properties>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd-no-dotmvn/module-a/pom.xml b/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd-no-dotmvn/module-a/pom.xml
deleted file mode 100644
index ae48d0a65..000000000
--- a/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd-no-dotmvn/module-a/pom.xml
+++ /dev/null
@@ -1,34 +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">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>module-a</artifactId>
-
-  <parent>
-    <groupId>org.apache.maven.its.mng7390</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0</version>
-  </parent>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd-no-dotmvn/module-b/pom.xml b/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd-no-dotmvn/module-b/pom.xml
deleted file mode 100644
index f91ebc28f..000000000
--- a/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd-no-dotmvn/module-b/pom.xml
+++ /dev/null
@@ -1,34 +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">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>module-b</artifactId>
-
-  <parent>
-    <groupId>org.apache.maven.its.mng7390</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0</version>
-  </parent>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd-no-dotmvn/pom.xml b/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd-no-dotmvn/pom.xml
deleted file mode 100644
index 1e9a1545f..000000000
--- a/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd-no-dotmvn/pom.xml
+++ /dev/null
@@ -1,70 +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">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng7390</groupId>
-  <artifactId>parent</artifactId>
-  <version>1.0</version>
-
-  <packaging>pom</packaging>
-
-  <name>Maven Integration Test :: MNG-7390</name>
-  <description>
-    This test suite verifies that other modules in the same multi-module project cannot be selected when invoking Maven
-    from a submodule, when the .mvn directory in the root is missing.
-  </description>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
-  </properties>
-
-  <modules>
-    <module>module-a</module>
-    <module>module-b</module>
-  </modules>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-log-file</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <configuration>
-          <logFile>target/touch.txt</logFile>
-        </configuration>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>reset</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd/.mvn/.gitkeep b/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd/.mvn/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd/module-a/pom.xml b/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd/module-a/pom.xml
deleted file mode 100644
index ae48d0a65..000000000
--- a/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd/module-a/pom.xml
+++ /dev/null
@@ -1,34 +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">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>module-a</artifactId>
-
-  <parent>
-    <groupId>org.apache.maven.its.mng7390</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0</version>
-  </parent>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd/module-b/pom.xml b/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd/module-b/pom.xml
deleted file mode 100644
index f91ebc28f..000000000
--- a/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd/module-b/pom.xml
+++ /dev/null
@@ -1,34 +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">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>module-b</artifactId>
-
-  <parent>
-    <groupId>org.apache.maven.its.mng7390</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0</version>
-  </parent>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd/pom.xml b/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd/pom.xml
deleted file mode 100644
index ea34c3188..000000000
--- a/core-it-suite/src/test/resources/mng-7390-pl-outside-cwd/pom.xml
+++ /dev/null
@@ -1,70 +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">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng7390</groupId>
-  <artifactId>parent</artifactId>
-  <version>1.0</version>
-
-  <packaging>pom</packaging>
-
-  <name>Maven Integration Test :: MNG-7390</name>
-  <description>
-    This test suite tests whether other modules in the same multi-module project can be selected when invoking Maven
-    from a submodule.
-  </description>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
-  </properties>
-
-  <modules>
-    <module>module-a</module>
-    <module>module-b</module>
-  </modules>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-log-file</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <configuration>
-          <logFile>target/touch.txt</logFile>
-        </configuration>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>reset</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7404-ignore-prefixless-expressions/pom.xml b/core-it-suite/src/test/resources/mng-7404-ignore-prefixless-expressions/pom.xml
deleted file mode 100644
index 7906779c1..000000000
--- a/core-it-suite/src/test/resources/mng-7404-ignore-prefixless-expressions/pom.xml
+++ /dev/null
@@ -1,12 +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.its.mng7404</groupId>
-    <artifactId>prefixless-placeholders-should-be-ignored</artifactId>
-    <version>1.0</version>
-
-    <properties>
-        <projectVersion>${version}</projectVersion>
-    </properties>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7443-consistency-of-optional-profiles-and-projects/pom.xml b/core-it-suite/src/test/resources/mng-7443-consistency-of-optional-profiles-and-projects/pom.xml
deleted file mode 100644
index c2de91f27..000000000
--- a/core-it-suite/src/test/resources/mng-7443-consistency-of-optional-profiles-and-projects/pom.xml
+++ /dev/null
@@ -1,36 +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">
-  <!--
-   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.
-   -->
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng7443</groupId>
-  <artifactId>consistent-logging-of-optional-projects-and-profiles-selectors</artifactId>
-  <version>1.0</version>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.10.1</version>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7464-mojo-read-only-params/pom.xml b/core-it-suite/src/test/resources/mng-7464-mojo-read-only-params/pom.xml
deleted file mode 100644
index 5278a3e98..000000000
--- a/core-it-suite/src/test/resources/mng-7464-mojo-read-only-params/pom.xml
+++ /dev/null
@@ -1,79 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng7464</groupId>
-  <artifactId>maven-it-mng7464</artifactId>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: mng7464</name>
-  <description>
-    Test that ensures that warning about read-only mojo params are generated.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-configuration</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>read-only-config</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>config-values</id>
-    <build>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.its.plugins</groupId>
-          <artifactId>maven-it-plugin-configuration</artifactId>
-          <version>2.1-SNAPSHOT</version>
-          <executions>
-            <execution>
-              <goals>
-                <goal>read-only-config</goal>
-              </goals>
-            </execution>
-          </executions>
-          <configuration>
-            <readOnlyWithDefault>value1</readOnlyWithDefault>
-            <readOnlyWithOutDefaults>value2</readOnlyWithOutDefaults>
-            <readOnlyWithProperty>value3</readOnlyWithProperty>
-            <readOnlyWithUserProperty>value4</readOnlyWithUserProperty>
-          </configuration>
-        </plugin>
-      </plugins>
-    </build>
-    </profile>
-  </profiles>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-build-execution/pom.xml b/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-build-execution/pom.xml
deleted file mode 100644
index 6125d0b7e..000000000
--- a/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-build-execution/pom.xml
+++ /dev/null
@@ -1,57 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng7464</groupId>
-  <artifactId>maven-it-mng7468</artifactId>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: mng7468</name>
-  <description>
-    Test that ensures that warning about unsupported mojo parameters are generated.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-configuration</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>touch</goal>
-            </goals>
-            <configuration>
-              <invalidParam>value</invalidParam>
-              <invalidXml>
-                <item>value</item>
-              </invalidXml>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-build-mixed/pom.xml b/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-build-mixed/pom.xml
deleted file mode 100644
index 4ebbdf9f6..000000000
--- a/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-build-mixed/pom.xml
+++ /dev/null
@@ -1,59 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng7464</groupId>
-  <artifactId>maven-it-mng7468</artifactId>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: mng7468</name>
-  <description>
-    Test that ensures that warning about unsupported mojo parameters are generated.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-configuration</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>touch</goal>
-            </goals>
-            <configuration>
-              <invalidXml>
-                <item>value</item>
-              </invalidXml>
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <invalidParam>value</invalidParam>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-build-plugin/pom.xml b/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-build-plugin/pom.xml
deleted file mode 100644
index ac0c97e17..000000000
--- a/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-build-plugin/pom.xml
+++ /dev/null
@@ -1,57 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng7464</groupId>
-  <artifactId>maven-it-mng7468</artifactId>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: mng7468</name>
-  <description>
-    Test that ensures that warning about unsupported mojo parameters are generated.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-configuration</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>touch</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <invalidParam>value</invalidParam>
-          <invalidXml>
-            <item>value</item>
-          </invalidXml>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-plugin-management-parent/module/pom.xml b/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-plugin-management-parent/module/pom.xml
deleted file mode 100644
index f6378d051..000000000
--- a/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-plugin-management-parent/module/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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven.its.mng7464</groupId>
-    <artifactId>maven-it-mng7468</artifactId>
-    <version>1.0</version>
-  </parent>
-
-  <artifactId>module</artifactId>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-configuration</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>touch</goal>
-            </goals>
-            <phase>validate</phase>
-          </execution>
-        </executions>
-        <configuration>
-          <invalidXml>
-            <item>value</item>
-          </invalidXml>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-plugin-management-parent/pom.xml b/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-plugin-management-parent/pom.xml
deleted file mode 100644
index b1d012053..000000000
--- a/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-plugin-management-parent/pom.xml
+++ /dev/null
@@ -1,54 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng7464</groupId>
-  <artifactId>maven-it-mng7468</artifactId>
-  <version>1.0</version>
-  <packaging>pom</packaging>
-
-  <name>Maven Integration Test :: mng7468</name>
-  <description>
-    Test that ensures that warning about unsupported mojo parameters are generated.
-  </description>
-
-  <modules>
-    <module>module</module>
-  </modules>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.its.plugins</groupId>
-          <artifactId>maven-it-plugin-configuration</artifactId>
-          <version>2.1-SNAPSHOT</version>
-          <configuration>
-            <invalidParam>value</invalidParam>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-plugin-management/pom.xml b/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-plugin-management/pom.xml
deleted file mode 100644
index 1169e15f0..000000000
--- a/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-plugin-management/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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng7464</groupId>
-  <artifactId>maven-it-mng7468</artifactId>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: mng7468</name>
-  <description>
-    Test that ensures that warning about unsupported mojo parameters are generated.
-  </description>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.its.plugins</groupId>
-          <artifactId>maven-it-plugin-configuration</artifactId>
-          <version>2.1-SNAPSHOT</version>
-          <configuration>
-            <invalidParam>value</invalidParam>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-configuration</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>touch</goal>
-            </goals>
-            <phase>validate</phase>
-          </execution>
-        </executions>
-        <configuration>
-          <invalidXml>
-            <item>value</item>
-          </invalidXml>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-with-fork-goal/pom.xml b/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-with-fork-goal/pom.xml
deleted file mode 100644
index 2d8d2bda4..000000000
--- a/core-it-suite/src/test/resources/mng-7468-unsupported-params/config-with-fork-goal/pom.xml
+++ /dev/null
@@ -1,59 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng7468</groupId>
-  <artifactId>test</artifactId>
-  <version>0.1</version>
-  <packaging>pom</packaging>
-
-  <name>Maven Integration Test :: mng7468</name>
-  <description>
-    Test that ensures that warning about unsupported mojo parameters are generated.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-fork</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <id>fork</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>fork-goal</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <invalidParam>value</invalidParam>
-          <invalidXml>
-            <item>value</item>
-          </invalidXml>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7468-unsupported-params/no-config/pom.xml b/core-it-suite/src/test/resources/mng-7468-unsupported-params/no-config/pom.xml
deleted file mode 100644
index ac7841dd1..000000000
--- a/core-it-suite/src/test/resources/mng-7468-unsupported-params/no-config/pom.xml
+++ /dev/null
@@ -1,51 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng7464</groupId>
-  <artifactId>maven-it-mng7468</artifactId>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: mng7468</name>
-  <description>
-    Test that ensures that warning about unsupported mojo parameters are generated.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-configuration</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>touch</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7468-unsupported-params/valid-parameter-alias/pom.xml b/core-it-suite/src/test/resources/mng-7468-unsupported-params/valid-parameter-alias/pom.xml
deleted file mode 100644
index b2b5700a9..000000000
--- a/core-it-suite/src/test/resources/mng-7468-unsupported-params/valid-parameter-alias/pom.xml
+++ /dev/null
@@ -1,54 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng7464</groupId>
-  <artifactId>maven-it-mng7468</artifactId>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: mng7468</name>
-  <description>
-    Test that ensures that warning about unsupported mojo parameters are generated.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-configuration</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>touch</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <validParameterAlias>value</validParameterAlias>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7468-unsupported-params/valid-parameter-other-goal/pom.xml b/core-it-suite/src/test/resources/mng-7468-unsupported-params/valid-parameter-other-goal/pom.xml
deleted file mode 100644
index b135caed4..000000000
--- a/core-it-suite/src/test/resources/mng-7468-unsupported-params/valid-parameter-other-goal/pom.xml
+++ /dev/null
@@ -1,54 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng7464</groupId>
-  <artifactId>maven-it-mng7468</artifactId>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: mng7468</name>
-  <description>
-    Test that ensures that warning about unsupported mojo parameters are generated.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-configuration</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>touch</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <booleanParam>true</booleanParam>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7468-unsupported-params/valid-parameter/pom.xml b/core-it-suite/src/test/resources/mng-7468-unsupported-params/valid-parameter/pom.xml
deleted file mode 100644
index fca9bb05a..000000000
--- a/core-it-suite/src/test/resources/mng-7468-unsupported-params/valid-parameter/pom.xml
+++ /dev/null
@@ -1,54 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng7464</groupId>
-  <artifactId>maven-it-mng7468</artifactId>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: mng7468</name>
-  <description>
-    Test that ensures that warning about unsupported mojo parameters are generated.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-configuration</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>touch</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <validParameter>value</validParameter>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/project/pom.xml b/core-it-suite/src/test/resources/mng-7470-resolver-transport/project/pom.xml
deleted file mode 100644
index c9dbca26b..000000000
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/project/pom.xml
+++ /dev/null
@@ -1,61 +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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.resolver-transport</groupId>
-  <artifactId>project</artifactId>
-  <version>0.1</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: resolver-transport</name>
-  <description>
-    Verify that Maven transport works.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.10.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.resolver</groupId>
-        <artifactId>resolver-demo-maven-plugin</artifactId>
-        <version>1.7.3</version>
-        <executions>
-          <execution>
-            <id>resolve</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>resolve-artifact</goal>
-            </goals>
-            <configuration>
-              <artifactCoords>org.apache.maven.its.resolver-transport:dependency:1.0</artifactCoords>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/project/settings-template.xml b/core-it-suite/src/test/resources/mng-7470-resolver-transport/project/settings-template.xml
deleted file mode 100644
index ad1eed436..000000000
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/project/settings-template.xml
+++ /dev/null
@@ -1,52 +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.
--->
-
-<settings>
-  <profiles>
-    <profile>
-      <id>maven-core-it-repo</id>
-      <repositories>
-        <repository>
-          <id>maven-core-it</id>
-          <url>http://localhost:@port@</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>maven-core-it</id>
-          <url>http://localhost:@port@</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
-</settings>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/.gitattributes b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/.gitattributes
deleted file mode 100644
index e3bce59d1..000000000
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-*.pom    text eol=lf
-maven-metadata.xml    text eol=lf
-
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.jar b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.jar
deleted file mode 100644
index c7c00e8cc..000000000
Binary files a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.jar and /dev/null differ
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.jar.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.jar.sha1
deleted file mode 100644
index ad5066ce3..000000000
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b530516717ab5b3052fd3cdca860fc28574bd718
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom
deleted file mode 100644
index 2a2c030d4..000000000
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom
+++ /dev/null
@@ -1,34 +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>
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.apache.maven.its.resolver-transport</groupId>
-    <artifactId>dependency</artifactId>
-    <version>1.0</version>
-    <packaging>jar</packaging>
-
-    <name>Maven Integration Test :: resolver-transport :: dependency</name>
-    <description>
-        Dependency pulled with transport.
-    </description>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom.sha1
deleted file mode 100644
index 39318fa3a..000000000
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/its/resolver-transport/dependency/1.0/dependency-1.0.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b58c041fe630e9248109e305c5d2d0c5fea978a3
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar
deleted file mode 100644
index 4da7b2473..000000000
Binary files a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar and /dev/null differ
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar.sha1
deleted file mode 100644
index 644d46369..000000000
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ed81d315b44e79187fe8ad71b7b2665ac9b95f08
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom
deleted file mode 100644
index 3c2d2ff16..000000000
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom
+++ /dev/null
@@ -1,102 +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.resolver</groupId>
-  <artifactId>resolver-demo-maven-plugin</artifactId>
-  <version>1.7.3</version>
-  <packaging>maven-plugin</packaging>
-
-  <name>Maven Artifact Resolver Demo Maven Plugin 1.7.3</name>
-
-  <prerequisites>
-    <maven>${mavenVersion}</maven>
-  </prerequisites>
-
-  <properties>
-    <mavenVersion>3.8.5</mavenVersion>
-    <resolverVersion>1.7.3</resolverVersion>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.maven</groupId>
-          <artifactId>maven-model</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.maven</groupId>
-          <artifactId>maven-artifact</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.sisu</groupId>
-          <artifactId>org.eclipse.sisu.plexus</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-api</artifactId>
-      <version>${resolverVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!--
-    These dependencies BELOW are NOT USED by plugin,
-    but are here to mimic what other not quite nicely written plugins do:
-    they pull all resolver that are transitive dependencies of some maven
-    artifact they use
-    -->
-    <dependency>
-      <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-spi</artifactId>
-      <version>${resolverVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-util</artifactId>
-      <version>${resolverVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-impl</artifactId>
-      <version>${resolverVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-connector-basic</artifactId>
-      <version>${resolverVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.5</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1 b/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1
deleted file mode 100644
index 54520c0e6..000000000
--- a/core-it-suite/src/test/resources/mng-7470-resolver-transport/repo/org/apache/maven/resolver/resolver-demo-maven-plugin/1.7.3/resolver-demo-maven-plugin-1.7.3.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2a2ae11ad8e4c90eb3d48f3621b5d20eafea3ae3
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/pom.xml b/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/pom.xml
deleted file mode 100644
index f37a47ab6..000000000
--- a/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/pom.xml
+++ /dev/null
@@ -1,59 +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.its.mng7474</groupId>
-    <artifactId>plugin</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>maven-plugin</packaging>
-
-    <properties>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <maven-version>3.2.5</maven-version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-core</artifactId>
-            <version>${maven-version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.plugin-tools</groupId>
-            <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.3</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>${maven-version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
-                <version>0.3.5</version>
-                <executions>
-                    <execution>
-                        <id>generate-index</id>
-                        <goals>
-                            <goal>main-index</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/src/main/java/org/apache/maven/its/mng7474/TestComponent.java b/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/src/main/java/org/apache/maven/its/mng7474/TestComponent.java
deleted file mode 100644
index d6d8eef9e..000000000
--- a/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/src/main/java/org/apache/maven/its/mng7474/TestComponent.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.maven.its.mng7474;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import javax.inject.Named;
-
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.apache.maven.SessionScoped;
-
-@SessionScoped
-@Named
-public class TestComponent
-{
-
-    public static List<TestComponent> allInstances = new CopyOnWriteArrayList<>();
-
-    public TestComponent()
-    {
-        allInstances.add( this );
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/src/main/java/org/apache/maven/its/mng7474/TestMojo.java b/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/src/main/java/org/apache/maven/its/mng7474/TestMojo.java
deleted file mode 100644
index 3d90092f6..000000000
--- a/core-it-suite/src/test/resources/mng-7474-session-scope/plugin/src/main/java/org/apache/maven/its/mng7474/TestMojo.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.maven.its.mng7474;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Mojo;
-
-@Mojo( name = "test" )
-public class TestMojo
-        extends AbstractMojo
-{
-
-    @Component
-    TestComponent component;
-
-    @Override
-    public void execute() throws MojoExecutionException, MojoFailureException
-    {
-        if ( TestComponent.allInstances.size() > 1 )
-        {
-            throw new IllegalStateException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-7474-session-scope/project/pom.xml b/core-it-suite/src/test/resources/mng-7474-session-scope/project/pom.xml
deleted file mode 100644
index 3ab320e90..000000000
--- a/core-it-suite/src/test/resources/mng-7474-session-scope/project/pom.xml
+++ /dev/null
@@ -1,15 +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.its.mng7474</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>project-a</module>
-        <module>project-b</module>
-    </modules>
-
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7474-session-scope/project/project-a/pom.xml b/core-it-suite/src/test/resources/mng-7474-session-scope/project/project-a/pom.xml
deleted file mode 100644
index e9494f041..000000000
--- a/core-it-suite/src/test/resources/mng-7474-session-scope/project/project-a/pom.xml
+++ /dev/null
@@ -1,34 +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>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng7474</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>project-a</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.its.mng7474</groupId>
-                <artifactId>plugin</artifactId>
-                <version>1.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <id>test</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7474-session-scope/project/project-b/pom.xml b/core-it-suite/src/test/resources/mng-7474-session-scope/project/project-b/pom.xml
deleted file mode 100644
index 28fd8b0e3..000000000
--- a/core-it-suite/src/test/resources/mng-7474-session-scope/project/project-b/pom.xml
+++ /dev/null
@@ -1,34 +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>
-
-    <parent>
-        <groupId>org.apache.maven.its.mng7474</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>project-b</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.its.mng7474</groupId>
-                <artifactId>plugin</artifactId>
-                <version>1.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <id>test</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-7504-warn-unsupported-report-plugins/pom.xml b/core-it-suite/src/test/resources/mng-7504-warn-unsupported-report-plugins/pom.xml
deleted file mode 100644
index 0c4c39f63..000000000
--- a/core-it-suite/src/test/resources/mng-7504-warn-unsupported-report-plugins/pom.xml
+++ /dev/null
@@ -1,28 +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.its.7504</groupId>
-    <artifactId>warn-unsupported-report-plugins</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0</version>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>0.1-stub-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <id>site</id>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>site</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
... 214 lines suppressed ...