You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2019/12/28 16:20:27 UTC

[maven-integration-testing] branch CLEANING-UP updated: Cleaning up IT's.

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

khmarbaise pushed a commit to branch CLEANING-UP
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git


The following commit(s) were added to refs/heads/CLEANING-UP by this push:
     new 3c580f5  Cleaning up IT's.
3c580f5 is described below

commit 3c580f55cc6800959499f9365ae58c23147006f5
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Dec 28 17:20:06 2019 +0100

    Cleaning up IT's.
---
 .../org/apache/maven/it/IntegrationTestSuite.java  |  58 ----
 .../apache/maven/it/MavenIT0036ReleasePomTest.java |  60 ----
 .../it/MavenIT0039ReleasePomInReactorTest.java     |  66 -----
 ...MavenIT0145ReactorWithIncludesExcludesTest.java | 115 --------
 .../maven/it/MavenITmng0469ReportConfigTest.java   | 109 -------
 .../it/MavenITmng0731LegacyRepoLayoutTest.java     |  63 -----
 .../maven/it/MavenITmng1830ShowVersionTest.java    |  79 ------
 .../it/MavenITmng1908LegacySnapshotUpdateTest.java |  64 -----
 ...avenITmng1999DefaultReportsInheritanceTest.java |  84 ------
 ...9PluginDependenciesComeFromPluginReposTest.java |  64 -----
 .../maven/it/MavenITmng2562Timestamp322Test.java   | 122 --------
 .../maven/it/MavenITmng2562TimestampTest.java      | 122 --------
 .../MavenITmng2878DefaultReportXmlImportTest.java  |  65 -----
 .../it/MavenITmng2883LegacyRepoOfflineTest.java    | 314 ---------------------
 .../it/MavenITmng3052DepRepoAggregationTest.java   |  73 -----
 ...venITmng3057VersionExprTransformationsTest.java | 105 -------
 ...avenITmng3106ProfileMultipleActivatorsTest.java |  66 -----
 .../it/MavenITmng3221InfiniteForkingTest.java      | 115 --------
 ...avenITmng3271DefaultReportsSuppressionTest.java |  64 -----
 ...428PluginDescriptorArtifactsIncompleteTest.java |  75 -----
 .../MavenITmng3530DynamicPOMInterpolationTest.java | 123 --------
 .../MavenITmng3599useHttpProxyForWebDAVTest.java   | 222 ---------------
 ...MavenITmng3704LifecycleExecutorWrapperTest.java |  66 -----
 ...MavenITmng3743ForkWithPluginManagementTest.java |  62 ----
 .../it/MavenITmng3760BaseUriPropertyTest.java      |  85 ------
 ...Tmng3885UniqueVersionFromParentProfileTest.java | 133 ---------
 .../MavenITmng3933ProfilesXmlActivationTest.java   |  98 -------
 ...ng3948ParentResolutionFromProfileReposTest.java |  85 ------
 ...ITmng3970DepResolutionFromProfileReposTest.java | 106 -------
 ...ng3983PluginResolutionFromProfileReposTest.java | 112 --------
 .../it/MavenITmng3991ValidDependencyScopeTest.java |  69 -----
 ...ng4036ParentResolutionFromSettingsRepoTest.java |  86 ------
 ...avenITmng4086ExplicitPluginMetaversionTest.java |  92 ------
 .../it/MavenITmng4126ParentProfilesXmlTest.java    |  86 ------
 ...MavenITmng4254SelectableWagonProvidersTest.java | 132 ---------
 .../MavenITmng4279WagonProviderFailoverTest.java   |  62 ----
 .../it/MavenITmng4428FollowHttpRedirectTest.java   | 248 ----------------
 .../it/MavenITmng5805PkgTypeMojoConfiguration.java |  29 --
 .../maven/it/MavenITmng6352PrintVersionTest.java   | 157 -----------
 .../maven/it/MavenITmng6391PrintVersionTest.java   | 159 -----------
 .../src/test/resources/it0145/mod-a/pom.xml        |  55 ----
 .../src/test/resources/it0145/mod-b/pom.xml        |  55 ----
 core-it-suite/src/test/resources/it0145/pom.xml    |  55 ----
 .../src/test/resources/mng-0469/test0/pom.xml      |  49 ----
 .../src/test/resources/mng-0469/test1/pom.xml      |  62 ----
 .../src/test/resources/mng-0469/test2/pom.xml      |  92 ------
 .../src/test/resources/mng-0731/artifact.jar       | Bin 345 -> 0 bytes
 core-it-suite/src/test/resources/mng-0731/pom.xml  |  68 -----
 core-it-suite/src/test/resources/mng-1830/pom.xml  |   9 -
 core-it-suite/src/test/resources/mng-2539/pom.xml  |  42 ---
 .../maven/its/mng2539/mail/1.3.2/mail-1.3.2.jar    |   1 -
 .../maven/its/mng2539/mail/1.3.2/mail-1.3.2.pom    |   7 -
 .../test/resources/mng-2539/settings-template.xml  |  43 ---
 .../src/test/resources/mng-2562/custom/pom.xml     |  62 ----
 .../src/test/resources/mng-2562/default/pom.xml    |  62 ----
 .../resources/mng-2562/reactor/child-1/pom.xml     |  43 ---
 .../resources/mng-2562/reactor/child-2/pom.xml     |  43 ---
 .../resources/mng-2562/reactor/child-3/pom.xml     |  43 ---
 .../src/test/resources/mng-2562/reactor/pom.xml    |  68 -----
 core-it-suite/src/test/resources/mng-2878/pom.xml  |  57 ----
 .../src/test/resources/mng-2883/dependency/pom.xml |  38 ---
 .../jars/dep-1.0-SNAPSHOT.jar                      | Bin 2207 -> 0 bytes
 .../poms/dep-1.0-SNAPSHOT.pom                      |  17 --
 .../src/test/resources/mng-2883/parent/pom.xml     |  13 -
 .../poms/parent-1.0-SNAPSHOT.pom                   |  19 --
 .../maven-plugins/plugin-1.0-SNAPSHOT.jar          | Bin 6450 -> 0 bytes
 .../poms/plugin-1.0-SNAPSHOT.pom                   |  17 --
 .../test/resources/mng-2883/settings-template.xml  |  55 ----
 core-it-suite/src/test/resources/mng-3052/pom.xml  |  63 -----
 .../0.1-SNAPSHOT/direct-0.1-20090517.133956-1.jar  | Bin 2103 -> 0 bytes
 .../mng3052/direct/0.1-SNAPSHOT/maven-metadata.xml |  14 -
 .../its/mng3052/direct/0.1-SNAPSHOT/template.pom   |  57 ----
 .../maven/its/mng3052/direct/maven-metadata.xml    |  13 -
 .../mng3052/trans/0.1-SNAPSHOT/maven-metadata.xml  |  14 -
 .../0.1-SNAPSHOT/trans-0.1-20090517.132833-1.jar   | Bin 1979 -> 0 bytes
 .../0.1-SNAPSHOT/trans-0.1-20090517.132833-1.pom   |  36 ---
 .../maven/its/mng3052/trans/maven-metadata.xml     |  13 -
 .../test/resources/mng-3052/settings-template.xml  |  43 ---
 .../resources/mng-3057/level2/level3/artifact.jar  | Bin 345 -> 0 bytes
 .../test/resources/mng-3057/level2/level3/pom.xml  |  36 ---
 .../src/test/resources/mng-3057/level2/pom.xml     |  18 --
 core-it-suite/src/test/resources/mng-3057/pom.xml  |  69 -----
 core-it-suite/src/test/resources/mng-3106/pom.xml  |  81 ------
 .../src/test/resources/mng-3221/plugin/pom.xml     |  37 ---
 .../plugin/src/main/java/tests/Test2Mojo.java      |  34 ---
 .../plugin/src/main/java/tests/TestMojo.java       |  34 ---
 .../src/test/resources/mng-3221/report/pom.xml     |  47 ---
 .../report/src/main/java/tests/ForkingReport.java  |  69 -----
 .../src/test/resources/mng-3221/user/pom.xml       |  82 ------
 .../mng-3221/user/src/main/java/tests/App.java     |  13 -
 .../mng-3221/user/src/test/java/tests/AppTest.java |  38 ---
 core-it-suite/src/test/resources/mng-3271/pom.xml  |  59 ----
 .../resources/mng-3530/build-path/plugin/pom.xml   |  28 --
 .../plugin/src/main/java/mng3530/SetPathMojo.java  |  72 -----
 .../src/main/java/mng3530/ValidatePathMojo.java    |  69 -----
 .../resources/mng-3530/build-path/project/pom.xml  |  45 ---
 .../project/src/main/java/tests/App.java           |  13 -
 .../project/src/test/java/tests/AppTest.java       |  38 ---
 .../resources/mng-3530/pom-property/plugin/pom.xml |  28 --
 .../src/main/java/mng3530/SetPropertyMojo.java     |  69 -----
 .../main/java/mng3530/ValidatePropertyMojo.java    |  63 -----
 .../mng-3530/pom-property/project/pom.xml          |  49 ----
 .../project/src/main/java/tests/App.java           |  13 -
 .../project/src/test/java/tests/AppTest.java       |  38 ---
 .../mng-3530/resource-object/plugin/pom.xml        |  26 --
 .../main/java/mng3530/ValidatePropertyMojo.java    |  57 ----
 .../mng-3530/resource-object/project/pom.xml       |  45 ---
 .../project/src/main/java/tests/App.java           |  13 -
 .../project/src/test/java/tests/AppTest.java       |  38 ---
 core-it-suite/src/test/resources/mng-3599/pom.xml  |  23 --
 .../test/resources/mng-3599/settings-template.xml  |  18 --
 .../plugins/maven-mng3743-check-plugin/pom.xml     |  27 --
 .../src/main/java/jar/CheckMojo.java               |  46 ---
 .../plugins/maven-mng3743-report-plugin/pom.xml    |  32 ---
 .../src/main/java/jar/ForkingReport.java           |  85 ------
 .../mng-3743/plugins/mng3743-lifecycle/pom.xml     |  21 --
 .../main/resources/META-INF/plexus/components.xml  |  19 --
 .../src/test/resources/mng-3743/plugins/pom.xml    |  13 -
 core-it-suite/src/test/resources/mng-3743/pom.xml  |  13 -
 .../src/test/resources/mng-3743/project/pom.xml    |  51 ----
 .../src/test/resources/mng-3743/project/readme.txt |   3 -
 core-it-suite/src/test/resources/mng-3760/pom.xml  |  62 ----
 .../src/test/resources/mng-3885/pom-template.xml   |  62 ----
 .../src/test/resources/mng-3885/sub/main.jar       | Bin 345 -> 0 bytes
 .../src/test/resources/mng-3885/sub/pom.xml        |  63 -----
 core-it-suite/src/test/resources/mng-3933/pom.xml  |  57 ----
 .../src/test/resources/mng-3933/profiles.xml       | 173 ------------
 .../src/test/resources/mng-3948/test-1/pom.xml     |  37 ---
 .../test/resources/mng-3948/test-1/profiles.xml    |  43 ---
 .../maven/its/mng3948/parent/0.1/parent-0.1.pom    |  40 ---
 .../maven/its/mng3948/parent/maven-metadata.xml    |  12 -
 .../src/test/resources/mng-3948/test-2/pom.xml     |  58 ----
 .../maven/its/mng3948/parent/0.2/parent-0.2.pom    |  40 ---
 .../maven/its/mng3948/parent/maven-metadata.xml    |  12 -
 .../src/test/resources/mng-3970/test-1/pom.xml     |  60 ----
 .../test/resources/mng-3970/test-1/profiles.xml    |  43 ---
 .../org/apache/maven/its/mng3970/a/0.1/a-0.1.jar   | Bin 1928 -> 0 bytes
 .../org/apache/maven/its/mng3970/a/0.1/a-0.1.pom   |  36 ---
 .../apache/maven/its/mng3970/a/maven-metadata.xml  |  12 -
 .../src/test/resources/mng-3970/test-2/pom.xml     |  81 ------
 .../org/apache/maven/its/mng3970/a/0.1/a-0.1.jar   | Bin 1928 -> 0 bytes
 .../org/apache/maven/its/mng3970/a/0.1/a-0.1.pom   |  36 ---
 .../apache/maven/its/mng3970/a/maven-metadata.xml  |  12 -
 .../src/test/resources/mng-3970/test-3/pom.xml     |  60 ----
 .../org/apache/maven/its/mng3970/a/0.1/a-0.1.jar   | Bin 1928 -> 0 bytes
 .../org/apache/maven/its/mng3970/a/0.1/a-0.1.pom   |  36 ---
 .../apache/maven/its/mng3970/a/maven-metadata.xml  |  12 -
 .../test/resources/mng-3970/test-3/settings.xml    |  43 ---
 .../src/test/resources/mng-3983/test-1/pom.xml     |  73 -----
 .../apache/maven/its/mng3983/maven-metadata.xml    |   9 -
 .../org/apache/maven/its/mng3983/p/0.1/p-0.1.jar   | Bin 7385 -> 0 bytes
 .../org/apache/maven/its/mng3983/p/0.1/p-0.1.pom   |  65 -----
 .../apache/maven/its/mng3983/p/maven-metadata.xml  |  13 -
 .../src/test/resources/mng-3983/test-2/pom.xml     |  52 ----
 .../test/resources/mng-3983/test-2/profiles.xml    |  43 ---
 .../apache/maven/its/mng3983/maven-metadata.xml    |   9 -
 .../org/apache/maven/its/mng3983/p/0.1/p-0.1.jar   | Bin 7385 -> 0 bytes
 .../org/apache/maven/its/mng3983/p/0.1/p-0.1.pom   |  65 -----
 .../apache/maven/its/mng3983/p/maven-metadata.xml  |  13 -
 .../src/test/resources/mng-3983/test-3/pom.xml     |  52 ----
 .../apache/maven/its/mng3983/maven-metadata.xml    |   9 -
 .../org/apache/maven/its/mng3983/p/0.1/p-0.1.jar   | Bin 7385 -> 0 bytes
 .../org/apache/maven/its/mng3983/p/0.1/p-0.1.pom   |  65 -----
 .../apache/maven/its/mng3983/p/maven-metadata.xml  |  13 -
 .../test/resources/mng-3983/test-3/settings.xml    |  43 ---
 core-it-suite/src/test/resources/mng-3991/pom.xml  |  43 ---
 .../src/test/resources/mng-4036/default/pom.xml    |  39 ---
 .../maven/its/mng4036/parent/0.2/parent-0.2.pom    |  41 ---
 .../maven/its/mng4036/parent/maven-metadata.xml    |  12 -
 .../test/resources/mng-4036/default/settings.xml   |  43 ---
 .../src/test/resources/mng-4036/legacy/pom.xml     |  39 ---
 .../poms/maven-metadata.xml                        |  12 -
 .../poms/parent-0.1.pom                            |  41 ---
 .../test/resources/mng-4036/legacy/settings.xml    |  44 ---
 core-it-suite/src/test/resources/mng-4086/pom.xml  |  35 ---
 .../0.1/maven-it-plugin-a-0.1.jar                  | Bin 7896 -> 0 bytes
 .../0.1/maven-it-plugin-a-0.1.pom                  |  69 -----
 .../maven-it-plugin-a-0.2-20090315.124508-1.jar    | Bin 7928 -> 0 bytes
 .../maven-it-plugin-a-0.2-20090315.124508-1.pom    |  69 -----
 .../0.2-SNAPSHOT/maven-metadata.xml                |  13 -
 .../mng4086/maven-it-plugin-a/maven-metadata.xml   |  15 -
 .../apache/maven/its/mng4086/maven-metadata.xml    |  10 -
 .../test/resources/mng-4086/settings-template.xml  |  63 -----
 core-it-suite/src/test/resources/mng-4126/pom.xml  |  40 ---
 .../src/test/resources/mng-4126/profiles.xml       |  34 ---
 .../src/test/resources/mng-4126/sub/pom.xml        |  65 -----
 core-it-suite/src/test/resources/mng-4254/pom.xml  |  49 ----
 .../src/test/resources/mng-4254/settings.xml       |  10 -
 core-it-suite/src/test/resources/mng-4279/pom.xml  |  73 -----
 .../src/test/resources/mng-4279/settings.xml       |  31 --
 core-it-suite/src/test/resources/mng-4428/keystore | Bin 1364 -> 0 bytes
 core-it-suite/src/test/resources/mng-4428/pom.xml  |  64 -----
 .../test/resources/mng-4428/settings-template.xml  |  43 ---
 .../mng-5805-pkg-type-mojo-configuration/pom.xml   |  40 ---
 .../mng-6352-print-version/module-1/pom.xml        |  33 ---
 .../mng-6352-print-version/module-2/pom.xml        |  41 ---
 .../mng-6352-print-version/module-3/pom.xml        |  41 ---
 .../test/resources/mng-6352-print-version/pom.xml  |  58 ----
 .../module-1/pom.xml                               |  30 --
 .../module-2/pom.xml                               |  30 --
 .../module-3/pom.xml                               |  30 --
 .../mng-6391-print-version-aggregator/pom.xml      |  58 ----
 .../mng-6391-print-version/module-1/pom.xml        |  33 ---
 .../mng-6391-print-version/module-2/pom.xml        |  41 ---
 .../mng-6391-print-version/module-3/pom.xml        |  41 ---
 .../test/resources/mng-6391-print-version/pom.xml  |  58 ----
 .../maven/it/AbstractMavenIntegrationTestCase.java |   2 +-
 207 files changed, 1 insertion(+), 10241 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 10951b6..d071cde 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
@@ -92,21 +92,6 @@ public class IntegrationTestSuite
          * a fail fast technique as well.
          */
 
-        // -------------------------------------------------------------------------------------------------------------
-        // Tests that currently don't pass for any Maven version, i.e. the corresponding issue hasn't been resolved yet
-        // -------------------------------------------------------------------------------------------------------------
-        // suite.addTestSuite( MavenITmng4148DepPomInterpWithSettingsProfilesTest.class );
-        // suite.addTestSuite( MavenITmng3890TransitiveDependencyScopeUpdateTest.class );
-        // suite.addTestSuite( MavenITmng3092SnapshotsExcludedFromVersionRangeTest.class );
-        // suite.addTestSuite( MavenITmng3038TransitiveDepManVersionTest.class );
-        // suite.addTestSuite( MavenITmng2771PomExtensionComponentOverrideTest.class );
-        // suite.addTestSuite( MavenITmng0612NewestConflictResolverTest.class );
-
-        // -------------------------------------------------------------------------------------------------------------
-        // Tests that don't run stable and need to be fixed
-        // -------------------------------------------------------------------------------------------------------------
-        // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137
-
         suite.addTestSuite( MavenITmng6759TransitiveDependencyRepositoriesTest.class );
         suite.addTestSuite( MavenITmng6720FailFastTest.class );
         suite.addTestSuite( MavenITmng6506PackageAnnotationTest.class );
@@ -116,7 +101,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng5965ParallelBuildMultipliesWorkTest.class );
         suite.addTestSuite( MavenITmng6255FixConcatLines.class );
         suite.addTestSuite( MavenITmng6240PluginExtensionAetherProvider.class );
-        suite.addTestSuite( MavenITmng6223FindBasedir.class );
         suite.addTestSuite( MavenITmng6189SiteReportPluginsWarningTest.class );
         suite.addTestSuite( MavenITmng6127PluginExecutionConfigurationInterferenceTest.class );
         suite.addTestSuite( MavenITmng6065FailOnSeverityTest.class );
@@ -129,10 +113,8 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng5958LifecyclePhaseBinaryCompat.class );
         suite.addTestSuite( MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.class );
         suite.addTestSuite( MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.class );
-        suite.addTestSuite( MavenITmng5889FindBasedir.class );
         suite.addTestSuite( MavenITmng5840ParentVersionRanges.class );
         suite.addTestSuite( MavenITmng5840RelativePathReactorMatching.class );
-        suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration.class );
         suite.addTestSuite( MavenITmng5805PkgTypeMojoConfiguration2.class );
         suite.addTestSuite( MavenITmng5783PluginDependencyFiltering.class );
         suite.addTestSuite( MavenITmng5774ConfigurationProcessorsTest.class );
@@ -143,7 +125,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng5753CustomMojoExecutionConfiguratorTest.class );
         suite.addTestSuite( MavenITmng5716ToolchainsTypeTest.class );
         suite.addTestSuite( MavenITmng5663NestedImportScopePomResolutionTest.class );
-        suite.addTestSuite( MavenITmng2562Timestamp322Test.class );
         suite.addTestSuite( MavenITmng2199ParentVersionRangeTest.class );
         suite.addTestSuite( MavenITmng5640LifecycleParticipantAfterSessionEnd.class );
         suite.addTestSuite( MavenITmng5639ImportScopePomResolutionTest.class );
@@ -153,7 +134,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng5572ReactorPluginExtensionsTest.class  );
         suite.addTestSuite( MavenITmng5576CdFriendlyVersions.class );
         suite.addTestSuite( MavenITmng5530MojoExecutionScopeTest.class );
-        //suite.addTestSuite( MavenITmng5208EventSpyParallelTest.class );
         suite.addTestSuite( MavenITmng5482AetherNotFoundTest.class );
         suite.addTestSuite( MavenITmng5445LegacyStringSearchModelInterpolatorTest.class );
         suite.addTestSuite( MavenITmng5389LifecycleParticipantAfterSessionEnd.class );
@@ -232,7 +212,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng4666CoreRealmImportTest.class );
         suite.addTestSuite( MavenITmng4654ArtifactHandlerForMainArtifactTest.class );
         suite.addTestSuite( MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.class );
-        // suite.addTestSuite( MavenITmng4633DualCompilerExecutionsWeaveModeTest.class );
         suite.addTestSuite( MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.class );
         suite.addTestSuite( MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.class );
         suite.addTestSuite( MavenITmng4618AggregatorBuiltAfterModulesTest.class );
@@ -271,7 +250,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng4433ForceParentSnapshotUpdateTest.class );
         suite.addTestSuite( MavenITmng4430DistributionManagementStatusTest.class );
         suite.addTestSuite( MavenITmng4429CompRequirementOnNonDefaultImplTest.class );
-        suite.addTestSuite( MavenITmng4428FollowHttpRedirectTest.class );
         suite.addTestSuite( MavenITmng4423SessionDataFromPluginParameterExpressionTest.class );
         suite.addTestSuite( MavenITmng4422PluginExecutionPhaseInterpolationTest.class );
         suite.addTestSuite( MavenITmng4421DeprecatedPomInterpolationExpressionsTest.class );
@@ -337,7 +315,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng4291MojoRequiresOnlineModeTest.class );
         suite.addTestSuite( MavenITmng4283ParentPomPackagingTest.class );
         suite.addTestSuite( MavenITmng4281PreferLocalSnapshotTest.class );
-        suite.addTestSuite( MavenITmng4279WagonProviderFailoverTest.class );
         suite.addTestSuite( MavenITmng4276WrongTransitivePlexusUtilsTest.class );
         suite.addTestSuite( MavenITmng4275RelocationWarningTest.class );
         suite.addTestSuite( MavenITmng4274PluginRealmArtifactsTest.class );
@@ -345,7 +322,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng4270ArtifactHandlersFromPluginDepsTest.class );
         suite.addTestSuite( MavenITmng4269BadReactorResolutionFromOutDirTest.class );
         suite.addTestSuite( MavenITmng4262MakeLikeReactorDottedPathTest.class );
-        suite.addTestSuite( MavenITmng4254SelectableWagonProvidersTest.class );
         suite.addTestSuite( MavenITmng4238ArtifactHandlerExtensionUsageTest.class );
         suite.addTestSuite( MavenITmng4235HttpAuthDeploymentChecksumsTest.class );
         suite.addTestSuite( MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.class );
@@ -365,7 +341,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng4162ReportingMigrationTest.class );
         suite.addTestSuite( MavenITmng4150VersionRangeTest.class );
         suite.addTestSuite( MavenITmng4129PluginExecutionInheritanceTest.class );
-        suite.addTestSuite( MavenITmng4126ParentProfilesXmlTest.class );
         suite.addTestSuite( MavenITmng4116UndecodedUrlsTest.class );
         suite.addTestSuite( MavenITmng4112MavenVersionPropertyTest.class );
         suite.addTestSuite( MavenITmng4107InterpolationUsesDominantProfileSourceTest.class );
@@ -373,7 +348,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng4102InheritedPropertyInterpolationTest.class );
         suite.addTestSuite( MavenITmng4091BadPluginDescriptorTest.class );
         suite.addTestSuite( MavenITmng4087PercentEncodedFileUrlTest.class );
-        suite.addTestSuite( MavenITmng4086ExplicitPluginMetaversionTest.class );
         suite.addTestSuite( MavenITmng4072InactiveProfileReposTest.class );
         suite.addTestSuite( MavenITmng4070WhitespaceTrimmingTest.class );
         suite.addTestSuite( MavenITmng4068AuthenticatedMirrorTest.class );
@@ -382,7 +356,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng4052ReactorAwareImportScopeTest.class );
         suite.addTestSuite( MavenITmng4048VersionRangeReactorResolutionTest.class );
         suite.addTestSuite( MavenITmng4040ProfileInjectedModulesTest.class );
-        suite.addTestSuite( MavenITmng4036ParentResolutionFromSettingsRepoTest.class );
         suite.addTestSuite( MavenITmng4034ManagedProfileDependencyTest.class );
         suite.addTestSuite( MavenITmng4026ReactorDependenciesOrderTest.class );
         suite.addTestSuite( MavenITmng4023ParentProfileOneTimeInjectionTest.class );
@@ -394,15 +367,11 @@ 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 );
-        suite.addTestSuite( MavenITmng3970DepResolutionFromProfileReposTest.class );
         suite.addTestSuite( MavenITmng3955EffectiveSettingsTest.class );
         suite.addTestSuite( MavenITmng3953AuthenticatedDeploymentTest.class );
         suite.addTestSuite( MavenITmng3951AbsolutePathsTest.class );
-        suite.addTestSuite( MavenITmng3948ParentResolutionFromProfileReposTest.class );
         suite.addTestSuite( MavenITmng3947PluginDefaultExecutionConfigTest.class );
         suite.addTestSuite( MavenITmng3944BasedirInterpolationTest.class );
         suite.addTestSuite( MavenITmng3943PluginExecutionInheritanceTest.class );
@@ -410,7 +379,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng3940EnvVarInterpolationTest.class );
         suite.addTestSuite( MavenITmng3938MergePluginExecutionsTest.class );
         suite.addTestSuite( MavenITmng3937MergedPluginExecutionGoalsTest.class );
-        suite.addTestSuite( MavenITmng3933ProfilesXmlActivationTest.class );
         suite.addTestSuite( MavenITmng3927PluginDefaultExecutionConfigTest.class );
         suite.addTestSuite( MavenITmng3925MergedPluginExecutionOrderTest.class );
         suite.addTestSuite( MavenITmng3924XmlMarkupInterpolationTest.class );
@@ -422,7 +390,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng3892ReleaseDeploymentTest.class );
         suite.addTestSuite( MavenITmng3887PluginExecutionOrderTest.class );
         suite.addTestSuite( MavenITmng3886ExecutionGoalsOrderTest.class );
-        suite.addTestSuite( MavenITmng3885UniqueVersionFromParentProfileTest.class );
         suite.addTestSuite( MavenITmng3877BasedirAlignedModelTest.class );
         suite.addTestSuite( MavenITmng3873MultipleExecutionGoalsTest.class );
         suite.addTestSuite( MavenITmng3872ProfileActivationInRelocatedPomTest.class );
@@ -454,11 +421,9 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng3775ConflictResolutionBacktrackingTest.class );
         suite.addTestSuite( MavenITmng3769ExclusionRelocatedTransdepsTest.class );
         suite.addTestSuite( MavenITmng3766ToolchainsFromExtensionTest.class );
-        suite.addTestSuite( MavenITmng3760BaseUriPropertyTest.class );
         suite.addTestSuite( MavenITmng3748BadSettingsXmlTest.class );
         suite.addTestSuite( MavenITmng3747PrefixedPathExpressionTest.class );
         suite.addTestSuite( MavenITmng3746POMPropertyOverrideTest.class );
-        suite.addTestSuite( MavenITmng3743ForkWithPluginManagementTest.class );
         suite.addTestSuite( MavenITmng3740SelfReferentialReactorProjectsTest.class );
         suite.addTestSuite( MavenITmng3732ActiveProfilesTest.class );
         suite.addTestSuite( MavenITmng3729MultiForkAggregatorsTest.class );
@@ -468,7 +433,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng3716AggregatorForkingTest.class );
         suite.addTestSuite( MavenITmng3714ToolchainsCliOptionTest.class );
         suite.addTestSuite( MavenITmng3710PollutedClonedPluginsTest.class );
-        suite.addTestSuite( MavenITmng3704LifecycleExecutorWrapperTest.class );
         suite.addTestSuite( MavenITmng3703ExecutionProjectWithRelativePathsTest.class );
         suite.addTestSuite( MavenITmng3701ImplicitProfileIdTest.class );
         suite.addTestSuite( MavenITmng3694ReactorProjectsDynamismTest.class );
@@ -485,7 +449,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng3621UNCInheritedPathsTest.class );
         suite.addTestSuite( MavenITmng3607ClassLoadersUseValidUrlsTest.class );
         suite.addTestSuite( MavenITmng3600DeploymentModeDefaultsTest.class );
-        suite.addTestSuite( MavenITmng3599useHttpProxyForWebDAVTest.class );
         suite.addTestSuite( MavenITmng3599useHttpProxyForWebDAVMk2Test.class );
         suite.addTestSuite( MavenITmng3586SystemScopePluginDependencyTest.class );
         suite.addTestSuite( MavenITmng3581PluginUsesWagonDependencyTest.class );
@@ -493,7 +456,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng3545ProfileDeactivationTest.class );
         suite.addTestSuite( MavenITmng3536AppendedAbsolutePathsTest.class );
         suite.addTestSuite( MavenITmng3535SelfReferentialPropertiesTest.class );
-        suite.addTestSuite( MavenITmng3530DynamicPOMInterpolationTest.class );
         suite.addTestSuite( MavenITmng3529QuotedCliArgTest.class );
         suite.addTestSuite( MavenITmng3506ArtifactHandlersFromPluginsTest.class );
         suite.addTestSuite( MavenITmng3503Xpp3ShadingTest.class );
@@ -506,7 +468,6 @@ public class IntegrationTestSuite
 		// Fails in a locked-down environment, see MNG-6613
         suite.addTestSuite( MavenITmng3461MirrorMatchingTest.class );
         suite.addTestSuite( MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.class );
-        suite.addTestSuite( MavenITmng3428PluginDescriptorArtifactsIncompleteTest.class );
         suite.addTestSuite( MavenITmng3422ActiveComponentCollectionTest.class );
         suite.addTestSuite( MavenITmng3415JunkRepositoryMetadataTest.class );
         suite.addTestSuite( MavenITmng3401CLIDefaultExecIdTest.class );
@@ -521,8 +482,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng3297DependenciesNotLeakedToMojoTest.class );
         suite.addTestSuite( MavenITmng3288SystemScopeDirTest.class );
         suite.addTestSuite( MavenITmng3284UsingCachedPluginsTest.class );
-        suite.addTestSuite( MavenITmng3271DefaultReportsSuppressionTest.class );
-        suite.addTestSuite( MavenITmng3221InfiniteForkingTest.class );
         suite.addTestSuite( MavenITmng3268MultipleHyphenPCommandLineTest.class );
         suite.addTestSuite( MavenITmng3259DepsDroppedInMultiModuleBuildTest.class );
         suite.addTestSuite( MavenITmng3220ImportScopeTest.class );
@@ -534,10 +493,7 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.class );
         suite.addTestSuite( MavenITmng3122ActiveProfilesNoDuplicatesTest.class );
         suite.addTestSuite( MavenITmng3118TestClassPathOrderTest.class );
-        suite.addTestSuite( MavenITmng3106ProfileMultipleActivatorsTest.class );
         suite.addTestSuite( MavenITmng3099SettingsProfilesWithNoPomTest.class );
-        suite.addTestSuite( MavenITmng3057VersionExprTransformationsTest.class );
-        suite.addTestSuite( MavenITmng3052DepRepoAggregationTest.class );
         suite.addTestSuite( MavenITmng3043BestEffortReactorResolutionTest.class );
         suite.addTestSuite( MavenITmng3023ReactorDependencyResolutionTest.class );
         suite.addTestSuite( MavenITmng3012CoreClassImportTest.class );
@@ -547,8 +503,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng2926PluginPrefixOrderTest.class );
         suite.addTestSuite( MavenITmng2921ActiveAttachedArtifactsTest.class );
         suite.addTestSuite( MavenITmng2892HideCorePlexusUtilsTest.class );
-        suite.addTestSuite( MavenITmng2883LegacyRepoOfflineTest.class );
-        suite.addTestSuite( MavenITmng2878DefaultReportXmlImportTest.class );
         suite.addTestSuite( MavenITmng2871PrePackageSubartifactResolutionTest.class );
         suite.addTestSuite( MavenITmng2865MirrorWildcardTest.class );
         suite.addTestSuite( MavenITmng2861RelocationsAndRangesTest.class );
@@ -571,8 +525,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng2591MergeInheritedPluginConfigTest.class );
         suite.addTestSuite( MavenITmng2577SettingsXmlInterpolationTest.class );
         suite.addTestSuite( MavenITmng2576MakeLikeReactorTest.class );
-        suite.addTestSuite( MavenITmng2562TimestampTest.class );
-        suite.addTestSuite( MavenITmng2539PluginDependenciesComeFromPluginReposTest.class );
         suite.addTestSuite( MavenITmng2486TimestampedDependencyVersionInterpolationTest.class );
         suite.addTestSuite( MavenITmng2432PluginPrefixOrderTest.class );
         suite.addTestSuite( MavenITmng2387InactiveProxyTest.class );
@@ -605,13 +557,10 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.class );
         suite.addTestSuite( MavenITmng2045testJarDependenciesBrokenInReactorTest.class );
         suite.addTestSuite( MavenITmng2006ChildPathAwareUrlInheritanceTest.class );
-        suite.addTestSuite( MavenITmng1999DefaultReportsInheritanceTest.class );
         suite.addTestSuite( MavenITmng1995InterpolateBooleanModelElementsTest.class );
         suite.addTestSuite( MavenITmng1992SystemPropOverridesPomPropTest.class );
         suite.addTestSuite( MavenITmng1957JdkActivationWithVersionRangeTest.class );
-        suite.addTestSuite( MavenITmng1908LegacySnapshotUpdateTest.class );
         suite.addTestSuite( MavenITmng1895ScopeConflictResolutionTest.class );
-        suite.addTestSuite( MavenITmng1830ShowVersionTest.class );
         suite.addTestSuite( MavenITmng1803PomValidationErrorIncludesLineNumberTest.class );
         suite.addTestSuite( MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.class );
         suite.addTestSuite( MavenITmng1703PluginMgmtDepInheritanceTest.class );
@@ -645,7 +594,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng0773SettingsProfileReactorPollutionTest.class );
         suite.addTestSuite( MavenITmng0768OfflineModeTest.class );
         suite.addTestSuite( MavenITmng0761MissingSnapshotDistRepoTest.class );
-        suite.addTestSuite( MavenITmng0731LegacyRepoLayoutTest.class );
         suite.addTestSuite( MavenITmng0680ParentBasedirTest.class );
         suite.addTestSuite( MavenITmng0674PluginParameterAliasTest.class );
         suite.addTestSuite( MavenITmng0666IgnoreLegacyPomTest.class );
@@ -657,7 +605,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng0496IgnoreUnknownPluginParametersTest.class );
         suite.addTestSuite( MavenITmng0479OverrideCentralRepoTest.class );
         suite.addTestSuite( MavenITmng0471CustomLifecycleTest.class );
-        suite.addTestSuite( MavenITmng0469ReportConfigTest.class );
         suite.addTestSuite( MavenITmng0461TolerateMissingDependencyPomTest.class );
         suite.addTestSuite( MavenITmng0449PluginVersionResolutionTest.class );
         suite.addTestSuite( MavenITmng0377PluginLookupFromPrefixTest.class );
@@ -667,7 +614,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng0187CollectedProjectsTest.class );
         suite.addTestSuite( MavenITmng0095ReactorFailureBehaviorTest.class );
         suite.addTestSuite( MavenIT0146InstallerSnapshotNaming.class );
-        suite.addTestSuite( MavenIT0145ReactorWithIncludesExcludesTest.class );
         suite.addTestSuite( MavenIT0144LifecycleExecutionOrderTest.class );
         suite.addTestSuite( MavenIT0143TransitiveDependencyScopesTest.class );
         suite.addTestSuite( MavenIT0142DirectDependencyScopesTest.class );
@@ -696,10 +642,8 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenIT0051ReleaseProfileTest.class );
         suite.addTestSuite( MavenIT0041ArtifactTypeFromPluginExtensionTest.class );
         suite.addTestSuite( MavenIT0040PackagingFromPluginExtensionTest.class );
-        suite.addTestSuite( MavenIT0039ReleasePomInReactorTest.class );
         suite.addTestSuite( MavenIT0038AlternatePomFileDifferentDirTest.class );
         suite.addTestSuite( MavenIT0037AlternatePomFileSameDirTest.class );
-        suite.addTestSuite( MavenIT0036ReleasePomTest.class );
         suite.addTestSuite( MavenIT0032MavenPrerequisiteTest.class );
         suite.addTestSuite( MavenIT0030DepPomDepMngtInheritanceTest.class );
         suite.addTestSuite( MavenIT0025MultipleExecutionLevelConfigsTest.class );
@@ -714,8 +658,6 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenIT0009GoalConfigurationTest.class );
         suite.addTestSuite( MavenIT0008SimplePluginTest.class );
         suite.addTestSuite( MavenITmng6210CoreExtensionsCustomScopesTest.class );
-        suite.addTestSuite( MavenITmng6352PrintVersionTest.class );
-        suite.addTestSuite( MavenITmng6391PrintVersionTest.class );
         suite.addTestSuite( MavenITmng6558ToolchainsBuildingEventTest.class );
         /*
          * Add tests in reverse alpha order above.
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java
deleted file mode 100644
index 23948e7..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java
+++ /dev/null
@@ -1,60 +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.Verifier;
-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-607">MNG-607</a>.
- * 
- * @author John Casey
- *
- */
-public class MavenIT0036ReleasePomTest
-    extends AbstractMavenIntegrationTestCase
-{
-    public MavenIT0036ReleasePomTest()
-    {
-        super( "(2.0,3.0-alpha-1)" );
-    }
-
-    /**
-     * Test building from release-pom.xml when it's available
-     */
-    public void testit0036()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0036" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertFilePresent( "target/passed.log" );
-        verifier.assertFileNotPresent( "target/failed.log" );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
deleted file mode 100644
index e459c2a..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
+++ /dev/null
@@ -1,66 +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.Verifier;
-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-607">MNG-607</a>.
- * 
- * @author John Casey
- *
- */
-public class MavenIT0039ReleasePomInReactorTest
-    extends AbstractMavenIntegrationTestCase
-{
-    public MavenIT0039ReleasePomInReactorTest()
-    {
-        super( "[2.0,3.0-alpha-1)" );
-    }
-
-    /**
-     * Test reactor for projects that have release-pom.xml in addition to
-     * pom.xml. The release-pom.xml file should be chosen above pom.xml for
-     * these projects in the build.
-     */
-    public void testit0039()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0039" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "project/target" );
-        verifier.deleteDirectory( "project2/target" );
-        verifier.addCliOption( "-r" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertFilePresent( "project/target/passed.log" );
-        verifier.assertFileNotPresent( "project/target/failed.log" );
-        verifier.assertFilePresent( "project2/target/passed.log" );
-        verifier.assertFileNotPresent( "project2/target/failed.log" );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java
deleted file mode 100644
index 43e0094..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java
+++ /dev/null
@@ -1,115 +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.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * 
- * @author Benjamin Bentmann
- */
-public class MavenIT0145ReactorWithIncludesExcludesTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenIT0145ReactorWithIncludesExcludesTest()
-    {
-        // superseded by make-like reactor mode in 3.x (see also MNG-4260)
-        super( "[2.0,3.0-alpha-1)" );
-    }
-
-    /**
-     * Test the old-style reactor mode with includes/excludes to locate projects.
-     */
-    public void testitDefaultIncludesExcludes()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0145" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteDirectory( "mod-a/target" );
-        verifier.deleteDirectory( "mod-b/target" );
-        verifier.addCliOption( "-r" );
-        verifier.setLogFileName( "log-defaults.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertFileNotPresent( "target/touch.txt" );
-        verifier.assertFilePresent( "mod-a/target/touch-a.txt" );
-        verifier.assertFilePresent( "mod-b/target/touch-b.txt" );
-    }
-
-    /**
-     * Test the old-style reactor mode with includes/excludes to locate projects.
-     */
-    public void testitCustomIncludes()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0145" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteDirectory( "mod-a/target" );
-        verifier.deleteDirectory( "mod-b/target" );
-        verifier.addCliOption( "-r" );
-        verifier.addCliOption( "-Dmaven.reactor.includes=mod-a/pom.xml" );
-        verifier.setLogFileName( "log-includes.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertFileNotPresent( "target/touch.txt" );
-        verifier.assertFilePresent( "mod-a/target/touch-a.txt" );
-        verifier.assertFileNotPresent( "mod-b/target/touch-b.txt" );
-    }
-
-    /**
-     * Test the old-style reactor mode with includes/excludes to locate projects.
-     */
-    public void testitCustomExcludes()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0145" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteDirectory( "mod-a/target" );
-        verifier.deleteDirectory( "mod-b/target" );
-        verifier.addCliOption( "-r" );
-        verifier.addCliOption( "-Dmaven.reactor.excludes=mod-a/pom.xml" );
-        verifier.setLogFileName( "log-excludes.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertFilePresent( "target/touch.txt" );
-        verifier.assertFileNotPresent( "mod-a/target/touch-a.txt" );
-        verifier.assertFilePresent( "mod-b/target/touch-b.txt" );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
deleted file mode 100644
index 0feec2a..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.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.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.util.Properties;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-469">MNG-469</a>.
- * 
- * @author Benjamin Bentmann
- *
- */
-public class MavenITmng0469ReportConfigTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng0469ReportConfigTest()
-    {
-        super( "[2.0.0,)" );
-    }
-
-    /**
-     * Test that <reporting> configuration also affects build plugins unless <build> configuration is also given.
-     */
-    public void testitReportConfigOverridesBuildDefaults()
-        throws Exception
-    {
-        requiresMavenVersion( "[2.0.0,3.0-alpha-1)" );
-
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0469/test0" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.deleteDirectory( "target" );
-        verifier.setAutoclean( false );
-        verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties props = verifier.loadProperties( "target/config.properties" );
-        assertEquals( "not-the-default-value", props.getProperty( "defaultParam" ) );
-    }
-
-    /**
-     * Test that <build> configuration dominates <reporting> configuration for build goals.
-     */
-    public void testitBuildConfigDominantDuringBuild()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0469/test1" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.deleteDirectory( "target" );
-        verifier.setAutoclean( false );
-        verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-configuration:2.1-SNAPSHOT:config" );
-        verifier.assertFilePresent( "target/build.txt" );
-        verifier.assertFileNotPresent( "target/reporting.txt" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-    }
-
-    /**
-     * Test that <build> configuration does not affect report goals.
-     */
-    public void testitBuildConfigIrrelevantForReports()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0469/test2" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
-        verifier.deleteDirectory( "target" );
-        verifier.setAutoclean( false );
-        if ( matchesVersionRange( "(,3.0-alpha-1)" ) )
-        {
-            verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-site:2.1-SNAPSHOT:generate" );
-            verifier.assertFilePresent( "target/site/info.properties" );
-        }
-        else
-        {
-            verifier.executeGoal( "validate" );
-            Properties props = verifier.loadProperties( "target/config.properties" );
-            assertEquals( "maven-it-plugin-site", props.getProperty( "project.reporting.plugins.0.artifactId" ) );
-            assertFalse( "fail.properties".equals( props.getProperty( "project.reporting.plugins.0.configuration.children.infoFile.0.value" ) ) );
-        }
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
deleted file mode 100644
index 0cba5f0..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
+++ /dev/null
@@ -1,63 +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.Verifier;
-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-731">MNG-731</a>.
- * 
- * @author John Casey
- *
- */
-public class MavenITmng0731LegacyRepoLayoutTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng0731LegacyRepoLayoutTest()
-    {
-        // legacy layout no longer supported in Maven 3.x (see MNG-4204)
-        super( "[2.0,3.0-alpha-3)" );
-    }
-
-    /**
-     * Verify that deployment of artifacts to a legacy-layout repository
-     * results in a groupId directory of 'the.full.group.id' instead of
-     * 'the/full/group/id'.
-     */
-    public void testitMNG731()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0731" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.executeGoal( "validate" );
-        verifier.assertFilePresent( "target/test-repo/org.apache.maven.its.it0061/jars/maven-it-it0061-1.0.jar" );
-        verifier.assertFilePresent( "target/test-repo/org.apache.maven.its.it0061/poms/maven-it-it0061-1.0.pom" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
deleted file mode 100644
index 9f91996..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
+++ /dev/null
@@ -1,79 +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.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1830">MNG-1830</a>.
- * 
- * @author Brett Porter
- * @version $Id: ba3c28edf533dba3dfa60e384a670575e0cd6901 $
- */
-public class MavenITmng1830ShowVersionTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng1830ShowVersionTest()
-    {
-        super( "(2.0.10,2.1.0-M1),(2.1.0-M1,3.0-alpha-1),[3.0-alpha-3,3.2)" ); // Maven 2.0.11 + , 2.1.0-M2 +
-    }
-
-    /**
-     * Test that the version format
-     */
-    public void testVersion()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1830" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.addCliOption( "-X" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        boolean apacheVersionInTheRightFormatWasFound = false;
-        List<String> lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false );
-        for( String line : lines )
-        {
-            if ( line.matches( "^Apache Maven (.*?) \\(r[0-9]+; .*\\)$" ) 
-             ||  line.matches( "^Apache Maven (.*?) \\(rNON-CANONICAL_[-_0-9]+.+?; .*\\)$" ) 
-             ||  line.matches( "^Apache Maven (.*?) \\([0-9a-z]{5,41}; .*\\)$" ) )
-            {
-                apacheVersionInTheRightFormatWasFound = true;
-                // check timestamp parses
-                String timestamp = line.substring( line.lastIndexOf( ';' ) + 1, line.length() - 1 ).trim();
-                SimpleDateFormat fmt = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ssZ" );
-                Date date = fmt.parse( timestamp );
-                assertEquals( timestamp, fmt.format( date ) );
-                break;
-            }
-        }
-        
-        assertTrue( apacheVersionInTheRightFormatWasFound );
-    }    
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java
deleted file mode 100644
index 20a42b6..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java
+++ /dev/null
@@ -1,64 +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.Verifier;
-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-1908">MNG-1908</a>.
- * 
- * @author Brett Porter
- *
- */
-public class MavenITmng1908LegacySnapshotUpdateTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng1908LegacySnapshotUpdateTest()
-    {
-        // legacy layout no longer supported in Maven 3.x (see MNG-4204)
-        super( "[2.0,3.0-alpha-3)" );
-    }
-    
-    /**
-     * Test that legacy repositories with legacy snapshots (i.e. without metadata) download correctly.
-     */
-    public void testitMNG1908()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1908" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng1908" );
-        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.addCliOption( "--settings" );
-        verifier.addCliOption( "settings.xml" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertArtifactPresent( "org.apache.maven.its.mng1908", "artifact", "1.0-SNAPSHOT", "jar" );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java
deleted file mode 100644
index 2c05d07..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java
+++ /dev/null
@@ -1,84 +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.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.util.Properties;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-1999">MNG-1999</a>.
- * 
- * @author Benjamin Bentmann
- *
- */
-public class MavenITmng1999DefaultReportsInheritanceTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng1999DefaultReportsInheritanceTest()
-    {
-        // reporting not supported by Maven 3.x core as per MNG-4162
-        super( "(2.0.9,2.1.0-M1),(2.1.0-M1,3.0-alpha-1)" ); // 2.0.10+, excluding 2.1.0-M1
-    }
-
-    /**
-     * Test that default reports can be suppressed via inheritance from the parent.
-     */
-    public void testitInheritSuppression()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1999" );
-
-        Verifier verifier = newVerifier( new File( testDir, "child1" ).getAbsolutePath() );
-        verifier.deleteDirectory( "target" );
-        verifier.setAutoclean( false );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties props = verifier.loadProperties( "target/reports.properties" );
-        assertEquals( "0", props.getProperty( "reports" ) );
-        assertNull( props.getProperty( "reports.0" ) );
-    }
-
-    /**
-     * Verify that children can re-enable default reports if suppressed via inheritance from the parent.
-     */
-    public void testitOverrideSuppression()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1999" );
-
-        Verifier verifier = newVerifier( new File( testDir, "child2" ).getAbsolutePath(), "remote" );
-        verifier.deleteDirectory( "target" );
-        verifier.setAutoclean( false );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties props = verifier.loadProperties( "target/reports.properties" );
-        props = verifier.loadProperties( "target/reports.properties" );
-        assertNotNull( props.getProperty( "reports.0" ) );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
deleted file mode 100644
index 86481ac..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
+++ /dev/null
@@ -1,64 +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.Verifier;
-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-2539">MNG-2539</a>.
- * 
- *
- */
-public class MavenITmng2539PluginDependenciesComeFromPluginReposTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng2539PluginDependenciesComeFromPluginReposTest()
-    {
-        // plugin repositories and normal artifact repositories are completely separated in 3.x (see MNG-4191)
-        super( "(2.0.4,3.0-alpha-3)" );
-    }
-
-    /**
-     * Verify that dependencies specified in plugins are also retrieved from ordinary/non-plugin repositories.
-     */
-    public void testitMNG2539()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2539" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng2539" );
-        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.addCliOption( "--settings" );
-        verifier.addCliOption( "settings.xml" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertFilePresent( "target/log.txt" );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java
deleted file mode 100644
index 2fe5e80..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java
+++ /dev/null
@@ -1,122 +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.it.Verifier;
-
-import java.io.File;
-import java.util.Date;
-import java.util.Properties;
-import java.text.SimpleDateFormat;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2562">MNG-2562</a>.
- * 
- *
- */
-public class MavenITmng2562Timestamp322Test
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng2562Timestamp322Test()
-    {
-        super( "[3.2.2,)" ); // 3.2.2+ only as we changed the timestamp format
-    }
-
-    public void testitDefaultFormat()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2562/default" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Date now = new Date();
-
-        Properties props = verifier.loadProperties( "target/pom.properties" );
-
-        String timestamp1 = props.getProperty( "project.properties.timestamp1", "" );
-        assertTrue( timestamp1, timestamp1.matches( "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z" ) );
-        Date date = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss'Z'" ).parse( timestamp1 );
-        assertTrue( now + " vs " + date, Math.abs( now.getTime() - date.getTime() ) < 24 * 60 * 60 * 1000 );
-
-        String timestamp2 = props.getProperty( "project.properties.timestamp2", "" );
-        assertEquals( timestamp1, timestamp2 );
-    }
-
-    public void testitCustomFormat()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2562/custom" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Date now = new Date();
-
-        Properties props = verifier.loadProperties( "target/pom.properties" );
-
-        String timestamp1 = props.getProperty( "project.properties.timestamp", "" );
-        Date date = new SimpleDateFormat( "mm:HH dd-MM-yyyy" ).parse( timestamp1 );
-        assertTrue( now + " vs " + date, Math.abs( now.getTime() - date.getTime() ) < 24 * 60 * 60 * 1000 );
-    }
-
-    public void testitSameValueAcrossModules()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2562/reactor" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteDirectory( "child-1/target" );
-        verifier.deleteDirectory( "child-2/target" );
-        verifier.deleteDirectory( "child-3/target" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties props = verifier.loadProperties( "target/pom.properties" );
-        String timestamp = props.getProperty( "project.properties.timestamp", "" );
-
-        Properties props1 = verifier.loadProperties( "child-1/target/pom.properties" );
-        String timestamp1 = props1.getProperty( "project.properties.timestamp", "" );
-
-        Properties props2 = verifier.loadProperties( "child-2/target/pom.properties" );
-        String timestamp2 = props2.getProperty( "project.properties.timestamp", "" );
-
-        Properties props3 = verifier.loadProperties( "child-3/target/pom.properties" );
-        String timestamp3 = props3.getProperty( "project.properties.timestamp", "" );
-
-        assertEquals( timestamp, timestamp1 );
-        assertEquals( timestamp, timestamp2 );
-        assertEquals( timestamp, timestamp3 );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562TimestampTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562TimestampTest.java
deleted file mode 100644
index 1d60700..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562TimestampTest.java
+++ /dev/null
@@ -1,122 +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.it.Verifier;
-
-import java.io.File;
-import java.util.Date;
-import java.util.Properties;
-import java.text.SimpleDateFormat;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2562">MNG-2562</a>.
- * 
- *
- */
-public class MavenITmng2562TimestampTest
-    extends AbstractMavenIntegrationTestCase
-{
-    
-    public MavenITmng2562TimestampTest()
-    {
-        super( "[2.1.0-M1,3.2.2)" ); // 2.1.0+ only
-    }
-
-    public void testitDefaultFormat()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2562/default" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Date now = new Date();
-
-        Properties props = verifier.loadProperties( "target/pom.properties" );
-
-        String timestamp1 = props.getProperty( "project.properties.timestamp1", "" );
-        assertTrue( timestamp1, timestamp1.matches( "[0-9]{8}-[0-9]{4}" ) );
-        Date date = new SimpleDateFormat( "yyyyMMdd-HHmm" ).parse( timestamp1 );
-        assertTrue( now + " vs " + date, Math.abs( now.getTime() - date.getTime() ) < 24 * 60 * 60 * 1000 );
-
-        String timestamp2 = props.getProperty( "project.properties.timestamp2", "" );
-        assertEquals( timestamp1, timestamp2 );
-    }
-
-    public void testitCustomFormat()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2562/custom" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Date now = new Date();
-
-        Properties props = verifier.loadProperties( "target/pom.properties" );
-
-        String timestamp1 = props.getProperty( "project.properties.timestamp", "" );
-        Date date = new SimpleDateFormat( "mm:HH dd-MM-yyyy" ).parse( timestamp1 );
-        assertTrue( now + " vs " + date, Math.abs( now.getTime() - date.getTime() ) < 24 * 60 * 60 * 1000 );
-    }
-
-    public void testitSameValueAcrossModules()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2562/reactor" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteDirectory( "child-1/target" );
-        verifier.deleteDirectory( "child-2/target" );
-        verifier.deleteDirectory( "child-3/target" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties props = verifier.loadProperties( "target/pom.properties" );
-        String timestamp = props.getProperty( "project.properties.timestamp", "" );
-
-        Properties props1 = verifier.loadProperties( "child-1/target/pom.properties" );
-        String timestamp1 = props1.getProperty( "project.properties.timestamp", "" );
-
-        Properties props2 = verifier.loadProperties( "child-2/target/pom.properties" );
-        String timestamp2 = props2.getProperty( "project.properties.timestamp", "" );
-
-        Properties props3 = verifier.loadProperties( "child-3/target/pom.properties" );
-        String timestamp3 = props3.getProperty( "project.properties.timestamp", "" );
-
-        assertEquals( timestamp, timestamp1 );
-        assertEquals( timestamp, timestamp2 );
-        assertEquals( timestamp, timestamp3 );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2878DefaultReportXmlImportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2878DefaultReportXmlImportTest.java
deleted file mode 100644
index 52ffc1f..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2878DefaultReportXmlImportTest.java
+++ /dev/null
@@ -1,65 +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.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.util.Properties;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2878">MNG-2878</a>.
- * 
- * @author Benjamin Bentmann
- *
- */
-public class MavenITmng2878DefaultReportXmlImportTest
-    extends AbstractMavenIntegrationTestCase
-{
-    public MavenITmng2878DefaultReportXmlImportTest()
-    {
-        // reporting is not supported in 3.x core (see MNG-4162)
-        super( "(,3.0-alpha-1)" );
-    }
-
-    /**
-     * Verify that a plugin can load default-report.xml from the core.
-     */
-    public void testitMNG2878()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2878" );
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties pclProps = verifier.loadProperties( "target/pcl.properties" );
-        assertNotNull( "target/pcl.properties does not contain 'default-report.xml' property",
-                       pclProps.getProperty( "default-report.xml" ) );
-
-        Properties tcclProps = verifier.loadProperties( "target/tccl.properties" );
-        assertEquals( pclProps, tcclProps );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
deleted file mode 100644
index 61c8f42..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
+++ /dev/null
@@ -1,314 +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.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-2883">MNG-2883</a>.
- *
- * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- */
-public class MavenITmng2883LegacyRepoOfflineTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng2883LegacyRepoOfflineTest()
-    {
-        super( "(2.0.9,2.1.0-M1),(2.1.0-M1,3.0-alpha-1)" );
-    }
-
-    public void testParentUnresolvable()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2883" );
-        testDir = new File( testDir, "parent" );
-
-        Verifier verifier;
-
-        verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
-
-        File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8",
-                                             verifier.newDefaultFilterProperties() );
-
-        // used to inject the remote repository
-        verifier.addCliOption( "-s" );
-        verifier.addCliOption( settings.getName() );
-
-        // execute once just to make sure this test works at all!
-        try
-        {
-            verifier.setLogFileName( "log-parent-a.txt" );
-            // this will ensure that all relevant plugins are present.
-            verifier.executeGoal( "validate" );
-        }
-        catch ( VerificationException e )
-        {
-            throw new VerificationException( "Build should succeed the first time through when NOT in offline mode!",
-                                             e );
-        }
-
-        // the centerpiece of these tests!
-        verifier.addCliOption( "-o" );
-
-        // re-run in offline mode, should still succeed by using local repo
-        verifier.setLogFileName( "log-parent-b.txt" );
-        verifier.executeGoal( "validate" );
-
-        // clear out the parent POM if it's in the local repository.
-        verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
-
-        try
-        {
-            verifier.setLogFileName( "log-parent-c.txt" );
-            verifier.executeGoal( "validate" );
-
-            fail( "Build should fail with unresolvable parent POM." );
-        }
-        catch ( VerificationException e )
-        {
-            // expected
-        }
-
-        List<String> missingMessages = new ArrayList<>();
-        missingMessages.add( " is offline" );
-        missingMessages.add( "org.apache.maven.its.mng2883:parent:pom:1.0-SNAPSHOT" );
-
-        List<String> lines = verifier.loadFile( new File( testDir, verifier.getLogFileName() ), false );
-
-        for ( String line : lines )
-        {
-            for ( Iterator<String> messageIt = missingMessages.iterator(); messageIt.hasNext(); )
-            {
-                String message = messageIt.next();
-
-                if ( line.contains( message ) )
-                {
-                    messageIt.remove();
-                }
-            }
-        }
-
-        if ( !missingMessages.isEmpty() )
-        {
-            StringBuilder buffer = new StringBuilder();
-
-            buffer.append( "The following key messages were missing from build output:\n\n" );
-
-            for ( String message : missingMessages )
-            {
-                if ( buffer.length() < 1 )
-                {
-                    buffer.append( "\n" );
-                }
-                buffer.append( '\'' ).append( message ).append( '\'' );
-            }
-
-            fail( buffer.toString() );
-        }
-    }
-
-    public void testDependencyUnresolvable()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2883" );
-        testDir = new File( testDir, "dependency" );
-
-        Verifier verifier;
-
-        verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
-
-        File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8",
-                                             verifier.newDefaultFilterProperties() );
-
-        // used to inject the remote repository
-        verifier.addCliOption( "-s" );
-        verifier.addCliOption( settings.getName() );
-
-        // execute once just to make sure this test works at all!
-        try
-        {
-            verifier.setLogFileName( "log-dep-a.txt" );
-            // this will ensure that all relevant plugins are present.
-            verifier.executeGoal( "validate" );
-        }
-        catch ( VerificationException e )
-        {
-            throw new VerificationException( "Build should succeed the first time through when NOT in offline mode!",
-                                             e );
-        }
-
-        // the centerpiece of these tests!
-        verifier.addCliOption( "-o" );
-
-        // re-run in offline mode, should still succeed by using local repo
-        verifier.setLogFileName( "log-dep-b.txt" );
-        verifier.executeGoal( "validate" );
-
-        // clear out the dependency if it's in the local repository.
-        verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
-
-        try
-        {
-            verifier.setLogFileName( "log-dep-c.txt" );
-            verifier.executeGoal( "validate" );
-
-            fail( "Build should fail with unresolvable dependency artifact." );
-        }
-        catch ( VerificationException e )
-        {
-            // expected
-        }
-
-        List<String> missingMessages = new ArrayList<>();
-
-        // FIXME: We need a more prominent diagnosis including system being in offline mode for 2.0.x.
-        missingMessages.add( "offline mode." );
-        missingMessages.add( "org.apache.maven.its.mng2883:dep:jar:1.0-SNAPSHOT" );
-
-        List<String> lines = verifier.loadFile( new File( testDir, verifier.getLogFileName() ), false );
-
-        for ( String line : lines )
-        {
-            for ( Iterator<String> messageIt = missingMessages.iterator(); messageIt.hasNext(); )
-            {
-                String message = (String) messageIt.next();
-
-                if ( line.contains( message ) )
-                {
-                    messageIt.remove();
-                }
-            }
-        }
-
-        if ( !missingMessages.isEmpty() )
-        {
-            StringBuilder buffer = new StringBuilder();
-
-            buffer.append( "The following key messages were missing from build output:\n\n" );
-
-            for ( String message : missingMessages )
-            {
-                if ( buffer.length() < 1 )
-                {
-                    buffer.append( "\n" );
-                }
-                buffer.append( '\'' ).append( message ).append( '\'' );
-            }
-
-            fail( buffer.toString() );
-        }
-    }
-
-    public void testPluginUnresolvable()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2883" );
-        testDir = new File( testDir, "plugin" );
-
-        Verifier verifier;
-
-        verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
-
-        File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8",
-                                             verifier.newDefaultFilterProperties() );
-
-        // used to inject the remote repository
-        verifier.addCliOption( "-s" );
-        verifier.addCliOption( settings.getName() );
-
-        verifier.setLogFileName( "log-plugin-a.txt" );
-        verifier.executeGoal( "org.apache.maven.its.mng2883:plugin:1.0-SNAPSHOT:run" );
-
-        // the centerpiece of these tests!
-        verifier.addCliOption( "-o" );
-
-        // re-run in offline mode, should still succeed by using local repo
-        verifier.setLogFileName( "log-plugin-b.txt" );
-        verifier.executeGoal( "org.apache.maven.its.mng2883:plugin:1.0-SNAPSHOT:run" );
-
-        // clear out the dependency if it's in the local repository.
-        verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
-
-        try
-        {
-            verifier.setLogFileName( "log-plugin-c.txt" );
-            verifier.executeGoal( "org.apache.maven.its.mng2883:plugin:1.0-SNAPSHOT:run" );
-
-            fail( "Build should fail with unresolvable plugin artifact." );
-        }
-        catch ( VerificationException e )
-        {
-            // expected
-        }
-
-        List<String> missingMessages = new ArrayList<>();
-        missingMessages.add( " is offline" );
-        missingMessages.add( "org.apache.maven.its.mng2883:plugin" );
-
-        List<String> lines = verifier.loadFile( new File( testDir, verifier.getLogFileName() ), false );
-
-        for ( String line : lines )
-        {
-            for ( Iterator<String> messageIt = missingMessages.iterator(); messageIt.hasNext(); )
-            {
-                String message = messageIt.next();
-
-                if ( line.contains( message ) )
-                {
-                    messageIt.remove();
-                }
-            }
-        }
-
-        if ( !missingMessages.isEmpty() )
-        {
-            StringBuilder buffer = new StringBuilder();
-
-            buffer.append( "The following key messages were missing from build output:\n\n" );
-
-            for ( String message : missingMessages )
-            {
-                if ( buffer.length() < 1 )
-                {
-                    buffer.append( "\n" );
-                }
-                buffer.append( '\'' ).append( message ).append( '\'' );
-            }
-
-            fail( buffer.toString() );
-        }
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
deleted file mode 100644
index 36df972..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java
+++ /dev/null
@@ -1,73 +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.Properties;
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3052">MNG-3052</a>.
- *
- * When a project dependency declares its own repositories, they should be used to
- * resolve that dependency's dependencies. This includes both steps: determining
- * the dependency artifact information (version, etc.) AND resolving the actual
- * artifact itself.
- *
- * NOTE: The SNAPSHOT versions are CRITICAL in this test, since they force the
- * correct resolution of artifact metadata, which depends on having the correct
- * set of repositories present.
- *
- * @author jdcasey
- */
-public class MavenITmng3052DepRepoAggregationTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng3052DepRepoAggregationTest()
-    {
-        super( "(2.0.9,)" ); // only test in 2.0.10+
-    }
-
-    public void testitMNG3052 ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3052" ).getCanonicalFile();
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng3052" );
-        Properties filterProps = verifier.newDefaultFilterProperties();
-        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-        verifier.filterFile( "repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/template.pom", 
-            "repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/direct-0.1-20090517.133956-1.pom", "UTF-8", filterProps );
-        verifier.addCliOption( "--settings" );
-        verifier.addCliOption( "settings.xml" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertArtifactPresent( "org.apache.maven.its.mng3052", "direct", "0.1-SNAPSHOT", "jar" );
-        verifier.assertArtifactPresent( "org.apache.maven.its.mng3052", "trans", "0.1-SNAPSHOT", "jar" );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
deleted file mode 100644
index f37c1f5..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
+++ /dev/null
@@ -1,105 +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 java.util.Properties;
-
-import org.apache.maven.it.util.ResourceExtractor;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3057">MNG-3057</a>.
- *
- * @todo Fill in a better description of what this test verifies!
- * 
- * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- * @author jdcasey
- * 
- */
-public class MavenITmng3057VersionExprTransformationsTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng3057VersionExprTransformationsTest()
-    {
-        super( "[2.1.0,2.1.1)" ); // only test in 2.1.0
-    }
-
-    public void testitMNG3057 ()
-        throws Exception
-    {
-        requiresJavaVersion( "[1.5,)" );
-
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3057" );
-        
-        File remoteRepo = new File( testDir, "target/deployment" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteDirectory( "level2/target" );
-        verifier.deleteDirectory( "level2/level3/target" );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng3057" );
-        
-        Properties properties = verifier.newDefaultFilterProperties();
-        properties.setProperty( "@deployTo@", remoteRepo.toURI().toURL().toExternalForm() );
-
-        verifier.filterFile( "pom.xml", "pom-filtered.xml", "UTF-8", properties );
-
-        verifier.addCliOption( "-V" );
-        verifier.addCliOption( "-DtestVersion=1" );
-        verifier.addCliOption( "-f pom-filtered.xml" );
-
-        verifier.executeGoal( "generate-sources" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        assertVersions( new File( verifier.getArtifactPath( "org.apache.maven.its.mng3057", "mng-3057", "1", "pom" ) ), "1", null );
-        assertVersions( new File( verifier.getArtifactPath( "org.apache.maven.its.mng3057", "level2", "1", "pom" ) ), "1", "1" );
-        assertVersions( new File( verifier.getArtifactPath( "org.apache.maven.its.mng3057", "level3", "1", "pom" ) ), "1", "1" );
-        
-        assertVersions( new File( remoteRepo, "org/apache/maven/its/mng3057/mng-3057/1/mng-3057-1.pom" ), "1", null );
-        assertVersions( new File( remoteRepo, "org/apache/maven/its/mng3057/level2/1/level2-1.pom" ), "1", "1" );
-        assertVersions( new File( remoteRepo, "org/apache/maven/its/mng3057/level2/1/level2-1.pom" ), "1", "1" );
-    }
-
-    private void assertVersions( File file, String version, String parentVersion )
-        throws XmlPullParserException, IOException
-    {
-        Xpp3Dom dom = Xpp3DomBuilder.build( ReaderFactory.newXmlReader( file ) );        
-        assertEquals( version, dom.getChild( "version" ).getValue() );
-        Xpp3Dom parent = dom.getChild( "parent" );
-        if ( parentVersion != null )
-        {
-            assertNotNull( parent );
-            assertEquals( parentVersion, parent.getChild( "version" ).getValue() );
-        }
-        else
-        {
-            assertNull( parent );
-        }
-    }    
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
deleted file mode 100644
index d17d3ae..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
+++ /dev/null
@@ -1,66 +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.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3106">MNG-3106</a>:
- * it tests that profiles with multiple activators are activated 
- * when any of the activators are on.
- * 
- */
-public class MavenITmng3106ProfileMultipleActivatorsTest
-    extends AbstractMavenIntegrationTestCase
-{
-    public MavenITmng3106ProfileMultipleActivatorsTest()
-    {
-        super( "(2.0.9,3.2.2)" );
-    }
-
-    /**
-     * Test build with two profiles, each with more than one activator.
-     * The profiles should be activated even though only one of the activators 
-     * returns true.
-     * 
-     */
-    public void testProfilesWithMultipleActivators()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3106" );
-
-        Verifier verifier;
-
-        verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.addCliOption( "-Dprofile1.on=true" );
-        verifier.executeGoal( "validate" );
-
-        verifier.verifyErrorFreeLog();
-        verifier.assertFilePresent( "target/profile1/touch.txt" );
-        verifier.assertFilePresent( "target/profile2/touch.txt" );
-        verifier.resetStreams();
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
deleted file mode 100644
index b298c7a..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
+++ /dev/null
@@ -1,115 +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.Verifier;
-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-3221">MNG-3221</a>.
- * 
- *
- */
-public class MavenITmng3221InfiniteForkingTest
-    extends AbstractMavenIntegrationTestCase
-{
-    public MavenITmng3221InfiniteForkingTest()
-    {
-        super( "(2.0.8,3.0-alpha-1)" ); // irrelevant in 3.0+
-    }
-
-    public void testitMNG3221a()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3221" );
-
-        File reportDir = new File( testDir, "report" );
-        File projectDir = new File( testDir, "user" );
-
-        Verifier verifier = null;
-
-        try
-        {
-            verifier = newVerifier( reportDir.getAbsolutePath(), "remote" );
-
-            verifier.deleteArtifact( "org.apache.maven.its.mng3221", "maven-forking-report-plugin", "1", "jar" );
-
-            verifier.setLogFileName( "mng-3221-a-log.txt" );
-            verifier.executeGoal( "install" );
-            verifier.verifyErrorFreeLog();
-            verifier.resetStreams();
-
-            verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
-
-            verifier.addCliOption( "-Psite" );
-
-            verifier.setLogFileName( "mng-3221-a-log.txt" );
-            verifier.executeGoal( "site" );
-            verifier.verifyErrorFreeLog();
-        }
-        finally
-        {
-            if ( verifier != null )
-            {
-                verifier.resetStreams();
-            }
-        }
-   }
-
-    public void testitMNG3221b()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3221" );
-
-        File pluginDir = new File( testDir, "plugin" );
-        File projectDir = new File( testDir, "user" );
-
-        Verifier verifier = null;
-
-        try
-        {
-            verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
-
-            verifier.deleteArtifact( "org.apache.maven.its.mng3221", "maven-forking-test-plugin", "1", "jar" );
-
-            verifier.setLogFileName( "mng-3221-b-log.txt" );
-            verifier.executeGoal( "install" );
-            verifier.verifyErrorFreeLog();
-            verifier.resetStreams();
-
-            verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
-
-            verifier.addCliOption( "-Pplugin" );
-
-            verifier.setLogFileName( "mng-3221-b-log.txt" );
-            verifier.executeGoal( "package" );
-            verifier.verifyErrorFreeLog();
-        }
-        finally
-        {
-            if ( verifier != null )
-            {
-                verifier.resetStreams();
-            }
-        }
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3271DefaultReportsSuppressionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3271DefaultReportsSuppressionTest.java
deleted file mode 100644
index 4d75c53..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3271DefaultReportsSuppressionTest.java
+++ /dev/null
@@ -1,64 +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.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.util.Properties;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3271">MNG-3271</a>.
- * 
- * @author Benjamin Bentmann
- *
- */
-public class MavenITmng3271DefaultReportsSuppressionTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng3271DefaultReportsSuppressionTest()
-    {
-        // reporting is not supported in 3.x core (see MNG-4162)
-        super( "(2.0.9,2.1.0-M1),(2.1.0-M1,3.0-alpha-1)" );
-    }
-
-    /**
-     * Test that default reports can be suppressed.
-     */
-    public void testitMNG3271()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3271" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.deleteDirectory( "target" );
-        verifier.setAutoclean( false );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties props = verifier.loadProperties( "target/reports.properties" );
-        assertEquals( "0", props.getProperty( "reports" ) );
-        assertNull( props.getProperty( "reports.0" ) );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java
deleted file mode 100644
index e8a81ff..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java
+++ /dev/null
@@ -1,75 +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.Verifier;
-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-3428">MNG-3428</a>:
- * it tests that the PluginDescriptor.getArtifacts() call returns all of the dependencies of the plugin,
- * not just those that made it past the filter excluding Maven's core artifacts.
- */
-public class MavenITmng3428PluginDescriptorArtifactsIncompleteTest
-    extends AbstractMavenIntegrationTestCase
-{
-    public MavenITmng3428PluginDescriptorArtifactsIncompleteTest()
-    {
-        // core artifacts are deliberately excluded in 3.x (see MNG-4277)
-        super( "(2.0.8,3.0-alpha-1)" ); // 2.0.8+
-    }
-
-    public void testitMNG3428 ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3428" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" );
-
-        // First, build the plugin we'll use to test the PluginDescriptor artifact collection.
-        verifier.executeGoal( "install" );
-
-        /*
-         * This is the simplest way to check a build
-         * succeeded. It is also the simplest way to create
-         * an IT test: make the build pass when the test
-         * should pass, and make the build fail when the
-         * test should fail. There are other methods
-         * supported by the verifier. They can be seen here:
-         * http://maven.apache.org/shared/maven-verifier/apidocs/index.html
-         */
-        verifier.verifyErrorFreeLog();
-
-        /*
-         * Reset the streams before executing the verifier
-         * again.
-         */
-        verifier.resetStreams();
-
-        // This should only succeed if commons-cli is part of ${plugin.artifacts}. The
-        // commons-cli library is part of Maven's core classpath, so if this mojo succeeds
-        // it means the PluginDescriptor.getArtifacts() call returns an unfiltered collection.
-        verifier.executeGoal( "org.apache.maven.its.mng3428:test-cli-maven-plugin:1:test" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java
deleted file mode 100644
index 8fa8c60..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3530DynamicPOMInterpolationTest.java
+++ /dev/null
@@ -1,123 +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.Verifier;
-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-3530">MNG-3530</a>.
- *
- * Contains various tests for dynamism of interpolation expressions within the POM.
- *
- * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- * @author jdcasey
- *
- */
-public class MavenITmng3530DynamicPOMInterpolationTest
-    extends AbstractMavenIntegrationTestCase
-{
-    private static final String BASEDIR = "/mng-3530/";
-
-    public MavenITmng3530DynamicPOMInterpolationTest()
-    {   //Dynamic properties for forked lifecycles not supported in 3.0
-        super( "[2.1.0-M1,3.0-alpha-1)" );
-    }
-
-    public void testitMNG3530_BuildPath()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), BASEDIR + "build-path" );
-        File pluginDir = new File( testDir, "plugin" );
-        File projectDir = new File( testDir, "project" );
-
-        // First, install the plugin that modifies the project.build.directory and
-        // validates that the modification propagated into the validation-mojo
-        // configuration. Once this is installed, we can run a project build that
-        // uses it to see how Maven will respond to a modification in the project build directory.
-        Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
-        verifier.executeGoal( "install" );
-
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        // Now, build the project. If the plugin configuration doesn't recognize
-        // the update to the project.build.directory, it will fail the build.
-        verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
-
-        verifier.executeGoal( "package" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-    }
-
-    public void testitMNG3530_POMProperty()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), BASEDIR
-                                                                             + "pom-property" );
-        File pluginDir = new File( testDir, "plugin" );
-        File projectDir = new File( testDir, "project" );
-
-        // First, install the plugin that modifies the myDirectory and
-        // validates that the modification propagated into the validation-mojo
-        // configuration. Once this is installed, we can run a project build that
-        // uses it to see how Maven will respond to a modification in the POM property.
-        Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
-        verifier.executeGoal( "install" );
-
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        // Now, build the project. If the plugin configuration doesn't recognize
-        // the update to the myDirectory, it will fail the build.
-        verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
-
-        verifier.executeGoal( "package" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-    }
-
-    public void testitMNG3530_ResourceDirectoryInterpolation()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), BASEDIR
-                                                                             + "resource-object" );
-        File pluginDir = new File( testDir, "plugin" );
-        File projectDir = new File( testDir, "project" );
-
-        // First, install the plugin which validates that all resource directory
-        // specifications have been interpolated.
-        Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
-        verifier.executeGoal( "install" );
-
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        // Now, build the project. If the plugin finds an uninterpolated resource
-        // directory, it will fail the build.
-        verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
-
-        verifier.executeGoal( "package" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
deleted file mode 100644
index 38af749..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
+++ /dev/null
@@ -1,222 +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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.shared.utils.StringUtils;
-import org.apache.maven.shared.utils.io.FileUtils;
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.NetworkConnector;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3599">MNG-3599</a>.
- * 
- * @author Brett Porter
- * @author John Casey
- *
- */
-public class MavenITmng3599useHttpProxyForWebDAVTest
-    extends AbstractMavenIntegrationTestCase
-{
-    private static final String LS = System.getProperty( "line.separator" );
-    
-    private Server server;
-
-    private int port;
-
-    private static final String content = "<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
-                            "  xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n" +
-                            "  <modelVersion>4.0.0</modelVersion>\n" +
-                            "  <groupId>org.apache.maven.its.mng3599</groupId>\n" +
-                            "  <artifactId>test</artifactId>\n" +
-                            "  <version>1.0-SNAPSHOT</version>\n" +
-                            "  <name>MNG-3599</name>\n" +
-                            "</project>";
-
-    public MavenITmng3599useHttpProxyForWebDAVTest()
-    {
-        super( "(2.0.9,3.3.9)" );
-    }
-
-    @Override
-    protected void setUp()
-        throws Exception
-    {
-        Handler handler = new AbstractHandler()
-        {
-            @Override
-            public void handle( String target, Request baseRequest, HttpServletRequest request,
-                                HttpServletResponse response )
-                throws IOException
-            {
-                System.out.println( "Got request for URL: '" + request.getRequestURL() + "'" );
-                System.out.flush();
-                
-                response.setContentType( "text/plain" );
-
-                System.out.println( "Checking for 'Proxy-Connection' header..." );
-                if ( request.getHeader( "Proxy-Connection" ) != null )
-                {
-                    response.setStatus( HttpServletResponse.SC_OK );
-                    response.getWriter().println( content );
-                    
-                    System.out.println( "Proxy-Connection found." );
-                }
-                /*
-                 * 2008-09-29 Oleg: "Proxy-Connection" is not part of http spec, but an extended header, and 
-                 * as such cannot be expected from all the clients.
-                 * Changing the code to test for more generalized case: local proxy receives a request with
-                 * correct server url and resource uri
-                 */
-                else if( 
-                    request.getRequestURI().startsWith( "/org/apache/maven/its/mng3599/test-dependency" )
-                    && request.getRequestURL().toString().startsWith( "http://www.example.com" )
-                )
-                {
-                    response.setStatus( HttpServletResponse.SC_OK );
-                    response.getWriter().println( content );
-                    
-                    System.out.println( "Correct proxied request 'http://www.example.com' for resource '/org/apache/maven/its/mng3599/test-dependency' found." );
-                }
-                else
-                {
-                    response.setStatus( HttpServletResponse.SC_BAD_REQUEST );
-                    
-                    System.out.println( "Proxy-Connection not found." );
-                }
-
-                ( (Request) request ).setHandled( true );
-            }
-        };
-
-        server = new Server( 0 );
-        server.setHandler( handler );
-        server.start();
-        if ( server.isFailed() )
-        {
-            fail( "Couldn't bind the server socket to a free port!" );
-        }
-        port = ( (NetworkConnector) server.getConnectors()[0] ).getLocalPort();
-        System.out.println( "Bound server socket to the port " + port );
-    }
-
-    @Override
-    protected void tearDown()
-        throws Exception
-    {
-        if ( server != null )
-        {
-            server.stop();
-            server.join();
-        }
-    }
-
-    public void testitUseHttpProxyForHttp()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3599" );
-
-        /*
-         * NOTE: Make sure the WebDAV extension required by the test project has been pulled down into the local
-         * repo before the actual test installs Jetty as a mirror for everything. Otherwise, we will get garbage
-         * for the JAR/POM of the extension and its dependencies when run against a vanilla repo.
-         */
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        String settings = FileUtils.fileRead( new File( testDir, "settings-template.xml" ) );
-        settings = StringUtils.replace( settings, "@port@", Integer.toString( port ) );
-        String newSettings = StringUtils.replace( settings, "@protocol@", "http" );
-        
-        FileUtils.fileWrite( new File( testDir, "settings.xml" ).getAbsolutePath(), newSettings );
-        
-        verifier = newVerifier( testDir.getAbsolutePath() );
-
-        verifier.addCliOption( "--settings" );
-        verifier.addCliOption( "settings.xml" );
-        verifier.addCliOption( "-X" );
-
-        verifier.deleteArtifacts( "org.apache.maven.its.mng3599" );
-
-        verifier.setLogFileName( "logHttp.txt" );
-        verifier.executeGoal( "compile" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
-        verifier.assertArtifactContents( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar",
-                                         content + LS );
-    }
-
-    /**
-     * Test that HTTP proxy is used for HTTP and for WebDAV.
-     */
-    public void testitUseHttpProxyForWebDAV()
-        throws Exception
-    {
-        requiresMavenVersion( "[2.1.0-M1,3.0-alpha-1),[3.0-beta-3,3.3.9)" );
-
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3599" );
-
-        /*
-         * NOTE: Make sure the WebDAV extension required by the test project has been pulled down into the local
-         * repo before the actual test installs Jetty as a mirror for everything. Otherwise, we will get garbage
-         * for the JAR/POM of the extension and its dependencies when run against a vanilla repo.
-         */
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        String settings = FileUtils.fileRead( new File( testDir, "settings-template.xml" ) );
-        settings = StringUtils.replace( settings, "@port@", Integer.toString( port ) );
-        String newSettings = StringUtils.replace( settings, "@protocol@", "dav" );
-        
-        FileUtils.fileWrite( new File( testDir, "settings.xml" ).getAbsolutePath(), newSettings );
-
-        verifier = newVerifier( testDir.getAbsolutePath() );
-
-        verifier.addCliOption( "--settings" );
-        verifier.addCliOption( "settings.xml" );
-        verifier.addCliOption( "-X" );
-
-        verifier.deleteArtifacts( "org.apache.maven.its.mng3599" );
-
-        verifier.setLogFileName( "logDAV.txt" );
-        verifier.executeGoal( "compile" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
-        verifier.assertArtifactContents( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar",
-                                         content + LS );
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java
deleted file mode 100644
index 5cdb970..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java
+++ /dev/null
@@ -1,66 +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.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3704">MNG-3704</a>.
- *
- * @todo Fill in a better description of what this test verifies!
- * 
- * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- * @author jdcasey
- * 
- */
-public class MavenITmng3704LifecycleExecutorWrapperTest
-    extends AbstractMavenIntegrationTestCase
-{
-    public MavenITmng3704LifecycleExecutorWrapperTest()
-    {
-        super( "[2.0.9,3.0-alpha-1)" ); // 2.0.9+, lifecycle switching not supported in the same way in 3.0
-    }
-
-    public void testitMNG3704 ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3704" );
-        File pluginDir = new File( testDir, "maven-mng3704-plugin" );
-        File projectDir = new File( testDir, "project" );
-
-        Verifier verifier;
-        verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" );
-
-        verifier.executeGoal( "install" );
-
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
-
-        verifier.executeGoal( "package" );
-
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java
deleted file mode 100644
index a2a0f28..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java
+++ /dev/null
@@ -1,62 +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.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3743">MNG-3743</a>.
- *
- * @todo Fill in a better description of what this test verifies!
- * 
- * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- * @author jdcasey
- * 
- */
-public class MavenITmng3743ForkWithPluginManagementTest
-    extends AbstractMavenIntegrationTestCase
-{
-    public MavenITmng3743ForkWithPluginManagementTest()
-    {
-        super( "(2.0.8,3.1-SNAPSHOT)" ); // only test in 2.0.9+
-    }
-
-    public void testitMNG3743 ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3743" );
-        File pluginsDir = new File( testDir, "plugins" );
-        File projectDir = new File( testDir, "project" );
-
-        Verifier verifier = newVerifier( pluginsDir.getAbsolutePath(), "remote" );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng3743" );
-        verifier.executeGoal( "install" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        verifier = newVerifier( projectDir.getAbsolutePath(), "remote" );
-        verifier.executeGoal( "site" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
deleted file mode 100644
index 1d71775..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
+++ /dev/null
@@ -1,85 +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.Properties;
-
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3760">MNG-3760</a>.
- * 
- * @author Brett Porter
- *
- */
-public class MavenITmng3760BaseUriPropertyTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng3760BaseUriPropertyTest()
-    {
-        super( "(2.1.0-M1,3.0-alpha-1),(3.0-alpha-2,3.5.4)" ); // 2.1.0-M2+
-    }
-
-    public void testitMNG3760()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3760" ).getCanonicalFile();
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.setLogFileName( "log-basic.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties props = verifier.loadProperties( "target/profile.properties" );
-        // set via project
-        assertEquals( testDir.toURI().toString(), props.getProperty( "project.properties.pomProperty" ) );
-        // check that project prefix is required
-        assertEquals( "${baseUri}", props.getProperty( "project.properties.baseUriProperty" ) );
-    }
-
-    public void testitMNG3760SystemPropertyOverride()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3760" ).getCanonicalFile();
-
-        // check that setting baseUri doesn't override project value
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.addCliOption( "-DbaseUri=myBaseUri" );
-        verifier.setLogFileName( "log-sysprop.txt" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties props = verifier.loadProperties( "target/profile.properties" );
-        // set via project
-        assertEquals( testDir.toURI().toString(), props.getProperty( "project.properties.pomProperty" ) );
-        // check that project prefix is required
-        assertEquals( "myBaseUri", props.getProperty( "project.properties.baseUriProperty" ) );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
deleted file mode 100644
index 6f011d7..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
+++ /dev/null
@@ -1,133 +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.Verifier;
-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-3885">MNG-3885</a>.
- * 
- * @author Benjamin Bentmann
- *
- */
-public class MavenITmng3885UniqueVersionFromParentProfileTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng3885UniqueVersionFromParentProfileTest()
-    {
-        // support for non-unique deployments removed in 3.x (see MNG-4059)
-        super( "(2.0.10,3.0-alpha-1)" );
-    }
-
-    /**
-     * Test that uniqueVersion=false defined by a parent profile is effective for child modules when building
-     * from the parent.
-     */
-    public void testitNonUniqueVersionReactor()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3885" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setLogFileName( "log-f.txt" );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "repo-f" );
-        verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.addCliOption( "-Pnon-unique-version" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertFilePresent( "repo-f/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-SNAPSHOT.jar" );
-    }
-
-    /**
-     * Test that uniqueVersion=false defined by a parent profile is effective for child modules when building
-     * the child in isolation.
-     */
-    public void testitNonUniqueVersionStandalone()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3885" );
-
-        Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
-        verifier.setLogFileName( "log-f.txt" );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "repo-f" );
-        verifier.filterFile( "../pom-template.xml", "../pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.addCliOption( "-Pnon-unique-version" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertFilePresent( "repo-f/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-SNAPSHOT.jar" );
-    }
-
-    /**
-     * Test that uniqueVersion=true defined by a parent profile is effective for child modules when building
-     * from the parent.
-     */
-    public void testitUniqueVersionReactor()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3885" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setLogFileName( "log-t.txt" );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "repo-t" );
-        verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.addCliOption( "-Punique-version" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertFileNotPresent( "repo-t/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-SNAPSHOT.jar" );
-        verifier.assertFilePresent( "repo-t/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-*-1.jar" );
-    }
-
-    /**
-     * Test that uniqueVersion=true defined by a parent profile is effective for child modules when building
-     * the child in isolation.
-     */
-    public void testitUniqueVersionStandalone()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3885" );
-
-        Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
-        verifier.setLogFileName( "log-t.txt" );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "repo-t" );
-        verifier.filterFile( "../pom-template.xml", "../pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.addCliOption( "-Punique-version" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertFileNotPresent( "repo-t/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-SNAPSHOT.jar" );
-        verifier.assertFilePresent( "repo-t/org/apache/maven/its/mng3885/sub/0.2-SNAPSHOT/sub-0.2-*-1.jar" );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java
deleted file mode 100644
index eecdb57..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.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 java.io.File;
-import java.util.Collections;
-import java.util.Properties;
-
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.shared.utils.Os;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-3933">MNG-3933</a>.
- * 
- * @author Benjamin Bentmann
- *
- */
-public class MavenITmng3933ProfilesXmlActivationTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng3933ProfilesXmlActivationTest()
-    {
-        // support for profiles.xml removed from 3.x (see MNG-4060)
-        super( "[2.0,3.0-alpha-1)" );
-    }
-
-    /**
-     * Test that profiles from an external profiles.xml are properly activated. This is really a different story
-     * than profiles in the settings.xml or the POM.
-     */
-    public void testitMNG3933()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3933" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.getSystemProperties().setProperty( "maven.profile.activator", "test" );
-        verifier.executeGoal( "validate", Collections.singletonMap( "MAVEN_PROFILE", "test" ) );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties props = verifier.loadProperties( "target/profile.properties" );
-
-        assertEquals( "DEFAULT-ACTIVATION", props.getProperty( "project.properties.defaultProperty" ) );
-
-        assertEquals( "SYS-PROP-ACTIVATION", props.getProperty( "project.properties.sysProperty" ) );
-
-        if ( matchesVersionRange( "(2.0.8,)" ) )
-        {
-            // MNG-2848
-            assertEquals( "ENV-PROP-ACTIVATION", props.getProperty( "project.properties.envProperty" ) );
-        }
-
-        assertEquals( "MISSING-FILE-ACTIVATION", props.getProperty( "project.properties.fileProperty" ) );
-
-        assertEquals( "JDK-ACTIVATION", props.getProperty( "project.properties.jdkProperty" ) );
-
-        if ( matchesVersionRange( "(2.0.10,2.1.0-M1),(2.1.0-M1,)" ) )
-        {
-            // MNG-3933
-            if ( Os.isFamily( Os.FAMILY_WINDOWS ) || Os.isFamily( Os.FAMILY_MAC ) || Os.isFamily( Os.FAMILY_UNIX ) )
-            {
-                assertEquals( "OS-FAMILY-ACTIVATION", props.getProperty( "project.properties.osFamilyProperty" ) );
-            }
-            else
-            {
-                System.out.println();
-                System.out.println( "[WARNING] Skipping OS activation test on unrecognized OS: " + Os.OS_NAME );
-                System.out.println();
-            }
-        }
-
-        assertEquals( null, props.getProperty( "project.properties.sysPropertyMissing" ) );
-        assertEquals( null, props.getProperty( "project.properties.envPropertyMissing" ) );
-        assertEquals( null, props.getProperty( "project.properties.filePropertyMissing" ) );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
deleted file mode 100644
index 374797b..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
+++ /dev/null
@@ -1,85 +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.Verifier;
-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-3948">MNG-3948</a>.
- * 
- * @author Benjamin Bentmann
- *
- */
-public class MavenITmng3948ParentResolutionFromProfileReposTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng3948ParentResolutionFromProfileReposTest()
-    {
-        super( "(2.0.10,2.1.0-M1),(2.1.0-M1,)" );
-    }
-
-    /**
-     * Test that parent POMs can be resolved from remote repositories defined by (active) profiles in profiles.xml.
-     */
-    public void testitFromProfilesXml()
-        throws Exception
-    {
-        // support for profiles.xml removed from 3.x (see MNG-4060)
-        requiresMavenVersion( "[2.0,3.0-alpha-1)" );
-
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3948/test-1" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng3948" );
-        verifier.filterFile( "profiles.xml", "profiles.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertArtifactPresent( "org.apache.maven.its.mng3948", "parent", "0.1", "pom" );
-    }
-
-    /**
-     * Test that parent POMs can be resolved from remote repositories defined by (active) profiles in the POM.
-     */
-    public void testitFromPom()
-        throws Exception
-    {
-        requiresMavenVersion( "[2.0,3.0-alpha-1),[3.0-beta-1,)" );
-
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3948/test-2" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng3948" );
-        verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertArtifactPresent( "org.apache.maven.its.mng3948", "parent", "0.2", "pom" );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
deleted file mode 100644
index e7d7a57..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
+++ /dev/null
@@ -1,106 +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.Verifier;
-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-3970">MNG-3970</a>.
- * 
- * @author Benjamin Bentmann
- *
- */
-public class MavenITmng3970DepResolutionFromProfileReposTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng3970DepResolutionFromProfileReposTest()
-    {
-        super( ALL_MAVEN_VERSIONS );
-    }
-
-    /**
-     * Test that dependencies can be resolved from remote repositories defined by (active) profiles in profiles.xml.
-     */
-    public void testitFromProfilesXml()
-        throws Exception
-    {
-        // support for profiles.xml removed from 3.x (see MNG-4060)
-        requiresMavenVersion( "[2.0,3.0-alpha-1)" );
-
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3970/test-1" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng3970" );
-        verifier.filterFile( "profiles.xml", "profiles.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertArtifactPresent( "org.apache.maven.its.mng3970", "a", "0.1", "jar" );
-    }
-
-    /**
-     * Test that dependencies can be resolved from remote repositories defined by (active) profiles in the POM.
-     */
-    public void testitFromPom()
-        throws Exception
-    {
-        requiresMavenVersion( "[2.0,3.0-alpha-1),[3.0-beta-1,)" );
-
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3970/test-2" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng3970" );
-        verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertArtifactPresent( "org.apache.maven.its.mng3970", "a", "0.1", "jar" );
-    }
-
-    /**
-     * Test that dependencies can be resolved from remote repositories defined by (active) profiles in settings.xml.
-     */
-    public void testitFromSettings()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3970/test-3" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng3970" );
-        verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.addCliOption( "--settings" );
-        verifier.addCliOption( "settings.xml" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertArtifactPresent( "org.apache.maven.its.mng3970", "a", "0.1", "jar" );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
deleted file mode 100644
index ec5bf12..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
+++ /dev/null
@@ -1,112 +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.Verifier;
-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-3983">MNG-3983</a>.
- * 
- * @author Benjamin Bentmann
- *
- */
-public class MavenITmng3983PluginResolutionFromProfileReposTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng3983PluginResolutionFromProfileReposTest()
-    {
-        super( ALL_MAVEN_VERSIONS );
-    }
-
-    /**
-     * Test that plugins can be resolved from remote plugin repositories defined by (active) profiles in the POM.
-     */
-    public void testitFromPom()
-        throws Exception
-    {
-        requiresMavenVersion( "[2.0,3.0-alpha-1),[3.0-alpha-3,)" );
-
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3983/test-1" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setForkJvm( true ); // Don't lock up plugin files in class loader within current JVM
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng3983" );
-        verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertArtifactPresent( "org.apache.maven.its.mng3983", "p", "0.1", "jar" );
-    }
-
-    /**
-     * Test that plugins can be resolved from remote plugin repositories defined by (active) profiles in profiles.xml.
-     */
-    public void testitFromProfilesXml()
-        throws Exception
-    {
-        // support for profiles.xml removed from 3.x (see MNG-4060)
-        requiresMavenVersion( "[2.0,3.0-alpha-1)" );
-
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3983/test-2" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setForkJvm( true ); // Don't lock up plugin files in class loader within current JVM
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng3983" );
-        verifier.filterFile( "profiles.xml", "profiles.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertArtifactPresent( "org.apache.maven.its.mng3983", "p", "0.1", "jar" );
-    }
-
-    /**
-     * Test that plugins can be resolved from remote plugin repositories defined by (active) profiles in settings.xml.
-     */
-    public void testitFromSettings()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3983/test-3" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setForkJvm( true ); // Don't lock up plugin files in class loader within current JVM
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng3983" );
-        verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.addCliOption( "--settings" );
-        verifier.addCliOption( "settings.xml" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertArtifactPresent( "org.apache.maven.its.mng3983", "p", "0.1", "jar" );
-    }
-
-}
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 d855573..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.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.Verifier;
-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.
-     */
-    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/MavenITmng4036ParentResolutionFromSettingsRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java
deleted file mode 100644
index 3a6f18a..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java
+++ /dev/null
@@ -1,86 +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.Verifier;
-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-4036">MNG-4036</a>.
- * 
- * @author Benjamin Bentmann
- */
-public class MavenITmng4036ParentResolutionFromSettingsRepoTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng4036ParentResolutionFromSettingsRepoTest()
-    {
-        super( ALL_MAVEN_VERSIONS );
-    }
-
-    /**
-     * Verify that a parent POM is downloaded from a default-style remote repo defined in the settings.
-     */
-    public void testitDefaultLayout()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4036/default" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng4036" );
-        verifier.addCliOption( "-s" );
-        verifier.addCliOption( "settings.xml" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertArtifactPresent( "org.apache.maven.its.mng4036", "parent", "0.2", "pom" );
-    }
-
-    /**
-     * Verify that a parent POM is downloaded from a legacy-style remote repo defined in the settings.
-     */
-    public void testitLegacyLayout()
-        throws Exception
-    {
-        // legacy layout no longer supported in Maven 3.x (see MNG-4204)
-        requiresMavenVersion( "[2.0,3.0-alpha-3)" );
-
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4036/legacy" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng4036" );
-        verifier.addCliOption( "-s" );
-        verifier.addCliOption( "settings.xml" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertArtifactPresent( "org.apache.maven.its.mng4036", "parent", "0.1", "pom" );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java
deleted file mode 100644
index 859b1b4..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java
+++ /dev/null
@@ -1,92 +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.Verifier;
-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-4086">MNG-4086</a>.
- * 
- * @author Benjamin Bentmann
- */
-public class MavenITmng4086ExplicitPluginMetaversionTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng4086ExplicitPluginMetaversionTest()
-    {
-        // metaversions no longer explicitly supported by 3.x (see MNG-4205)
-        super( "[2.0.6,3.0-alpha-3)" );
-    }
-
-    /**
-     * Verify that the plugin metaversion RELEASE can be explicitly used and especially is resolved
-     * to a proper version before the plugin manager creates the key for the plugin realm.
-     */
-    public void testitRelease()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4086" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng4086" );
-        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.addCliOption( "--settings" );
-        verifier.addCliOption( "settings.xml" );
-        verifier.setLogFileName( "log-release.txt" );
-        verifier.executeGoal( "org.apache.maven.its.mng4086:maven-it-plugin-a:RELEASE:touch" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertFileNotPresent( "target/touch-latest.txt" );
-        verifier.assertFilePresent( "target/touch-release.txt" );
-    }
-
-    /**
-     * Verify that the plugin metaversion LATEST can be explicitly used and especially is resolved
-     * to a proper version before the plugin manager creates the key for the plugin realm.
-     */
-    public void testitLatest()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4086" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.deleteArtifacts( "org.apache.maven.its.mng4086" );
-        verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
-        verifier.addCliOption( "--settings" );
-        verifier.addCliOption( "settings.xml" );
-        verifier.setLogFileName( "log-latest.txt" );
-        verifier.executeGoal( "org.apache.maven.its.mng4086:maven-it-plugin-a:LATEST:touch" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertFileNotPresent( "target/touch-release.txt" );
-        verifier.assertFilePresent( "target/touch-latest.txt" );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4126ParentProfilesXmlTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4126ParentProfilesXmlTest.java
deleted file mode 100644
index 11e6634..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4126ParentProfilesXmlTest.java
+++ /dev/null
@@ -1,86 +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.Properties;
-
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4126">MNG-4126</a>.
- * 
- * @author Benjamin Bentmann
- *
- */
-public class MavenITmng4126ParentProfilesXmlTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng4126ParentProfilesXmlTest()
-    {
-        // MNG-4060, profiles.xml support dropped
-        super( "[2.0,2.1.0),(2.1.0,3.0-alpha-1)" );
-    }
-
-    /**
-     * Verify that effects of active profiles from the profiles.xml of a local parent are inherited by children when
-     * parent and child are build together during a reactor invocation. This boils down to the reactor cache not
-     * interfering with profile injection from profiles.xml by properly tracking the base directory of cached projects.
-     */
-    public void testitReactorBuild()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4126" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "sub/target" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties props = verifier.loadProperties( "sub/target/pom.properties" );
-        assertEquals( "PASSED", props.getProperty( "project.properties.testProperty" ) );
-    }
-
-    /**
-     * Verify that effects of active profiles from the profiles.xml of a local parent are inherited by children when
-     * parent and child are build together during a reactor invocation. This boils down to the reactor cache not
-     * interfering with profile injection from profiles.xml by properly tracking the base directory of cached projects.
-     */
-    public void testitChildOnlyBuild()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4126" );
-
-        Verifier verifier = newVerifier( new File( testDir, "sub" ).getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties props = verifier.loadProperties( "target/pom.properties" );
-        assertEquals( "PASSED", props.getProperty( "project.properties.testProperty" ) );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
deleted file mode 100644
index cb1a479..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
+++ /dev/null
@@ -1,132 +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.Properties;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4254">MNG-4254</a>.
- * 
- * @author John Casey
- *
- */
-public class MavenITmng4254SelectableWagonProvidersTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng4254SelectableWagonProvidersTest()
-    {
-        // not supported in 3.x, there will be a single HTTP wagon
-        super( "(2.2.0,3.0-alpha-1)" );
-    }
-
-    public void testCliUsage()
-        throws IOException, VerificationException
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4254" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-
-        verifier.addCliOption( "-Dmaven.wagon.provider.http=coreit" );
-        verifier.addCliOption( "-V" );
-
-        verifier.setLogFileName( "log-cli.txt" );
-        verifier.executeGoal( "validate" );
-
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties props = verifier.loadProperties( "target/wagon-impl.properties" );
-        assertEquals( "org.apache.maven.wagon.providers.coreit.CoreItHttpWagon", props.getProperty( "wagon.class" ) );
-    }
-
-    public void testSettingsUsage()
-        throws IOException, VerificationException
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4254" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-
-        verifier.addCliOption( "--settings" );
-        verifier.addCliOption( "settings.xml" );
-        verifier.addCliOption( "-V" );
-        
-        verifier.setLogFileName( "log-settings.txt" );
-        verifier.executeGoal( "validate" );
-
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties props = verifier.loadProperties( "target/wagon-impl.properties" );
-        assertEquals( "org.apache.maven.wagon.providers.coreit.CoreItHttpWagon", props.getProperty( "wagon.class" ) );
-    }
-
-    public void testDefaultHttpWagon()
-        throws IOException, VerificationException
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4254" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-
-        verifier.addCliOption( "-V" );
-        
-        verifier.setLogFileName( "log-default-http.txt" );
-        verifier.executeGoal( "validate" );
-
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties props = verifier.loadProperties( "target/wagon-impl.properties" );
-        assertEquals( "org.apache.maven.wagon.providers.http.LightweightHttpWagon", props.getProperty( "wagon.class" ) );
-    }
-
-    public void testDefaultHttpsWagon()
-        throws IOException, VerificationException
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4254" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-
-        verifier.addCliOption( "-V" );
-        verifier.addCliOption( "-DwagonProtocol=https" );
-        
-        verifier.setLogFileName( "log-default-https.txt" );
-        verifier.executeGoal( "validate" );
-
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        Properties props = verifier.loadProperties( "target/wagon-impl.properties" );
-        assertEquals( "org.apache.maven.wagon.providers.http.LightweightHttpsWagon", props.getProperty( "wagon.class" ) );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
deleted file mode 100644
index d08cbd4..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java
+++ /dev/null
@@ -1,62 +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-4279">MNG-4279</a>.
- *
- * @author John Casey
- */
-public class MavenITmng4279WagonProviderFailoverTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng4279WagonProviderFailoverTest()
-    {
-        super( "[2.2.1,3.0-alpha-1)" );
-    }
-
-    /**
-     * Test that wagon provider selection fails gracefully and uses protocol for roleHint if protocol-provider roleHint
-     * isn't available.
-     */
-    public void testit()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4279" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.setAutoclean( false );
-        verifier.deleteDirectory( "target" );
-        verifier.addCliOption( "-s" );
-        verifier.addCliOption( "settings.xml" );
-        verifier.executeGoal( "validate" );
-        
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        verifier.assertFilePresent( "target/wagon.properties" );
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
deleted file mode 100644
index 2374f7e..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
+++ /dev/null
@@ -1,248 +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.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.HttpConfiguration;
-import org.eclipse.jetty.server.HttpConnectionFactory;
-import org.eclipse.jetty.server.NetworkConnector;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.SecureRequestCustomizer;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.SslConnectionFactory;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.List;
-import java.util.Properties;
-
-import static org.eclipse.jetty.http.HttpVersion.HTTP_1_1;
-
-/**
- * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-4428">MNG-4428</a>.
- * 
- * @author Benjamin Bentmann
- *
- */
-public class MavenITmng4428FollowHttpRedirectTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng4428FollowHttpRedirectTest()
-    {
-        super( "[2.0.3,3.0-alpha-1),(3.0-alpha-1,)" );
-    }
-
-    /**
-     * Verify that redirects from HTTP to HTTP are getting followed.
-     */
-    public void testitHttpToHttp()
-        throws Exception
-    {
-        testit( true, true );
-    }
-
-    /**
-     * Verify that redirects from HTTPS to HTTPS are getting followed.
-     */
-    public void testitHttpsToHttps()
-        throws Exception
-    {
-        testit( false, false );
-    }
-
-    /**
-     * Verify that redirects from HTTP to HTTPS are getting followed.
-     */
-    public void testitHttpToHttps()
-        throws Exception
-    {
-        requiresMavenVersion( "[2.2.0]" );
-
-        testit( true, false );
-    }
-
-    /**
-     * Verify that redirects from HTTPS to HTTP are getting followed.
-     */
-    public void testitHttpsToHttp()
-        throws Exception
-    {
-        requiresMavenVersion( "[2.2.0]" );
-
-        testit( false, true );
-    }
-
-    /**
-     * Verify that redirects using a relative location URL are getting followed. While a relative URL violates the
-     * HTTP spec, popular HTTP clients do support them so we better do, too.
-     */
-    public void testitRelativeLocation()
-        throws Exception
-    {
-        testit( true, true, true );
-    }
-
-    private void testit( boolean fromHttp, boolean toHttp )
-        throws Exception
-    {
-        testit( fromHttp, toHttp, false );
-    }
-
-    private void testit( boolean fromHttp, boolean toHttp, boolean relativeLocation )
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4428" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath() );
-
-        // NOTE: trust store cannot be reliably configured for the current JVM
-        verifier.setForkJvm( true );
-
-        // keytool -genkey -alias localhost -keypass key-passwd -keystore keystore -storepass store-passwd \
-        //   -validity 4096 -dname "cn=localhost, ou=None, L=Seattle, ST=Washington, o=ExampleOrg, c=US" -keyalg RSA
-        String storePath = new File( testDir, "keystore" ).getAbsolutePath();
-        String storePwd = "store-passwd";
-        String keyPwd = "key-passwd";
-
-        Server server = new Server( 0 );
-        addHttpsConnector( server, storePath, storePwd, keyPwd );
-        Connector from = server.getConnectors()[ fromHttp ? 0 : 1 ];
-        Connector to = server.getConnectors()[ toHttp ? 0 : 1 ];
-        server.setHandler(
-                new RedirectHandler( toHttp ? "http" : "https", relativeLocation ? null : (NetworkConnector) to ) );
-
-        try
-        {
-            server.start();
-            if ( server.isFailed() )
-            {
-                fail( "Couldn't bind the server socket to a free port!" );
-            }
-            verifier.setAutoclean( false );
-            verifier.deleteArtifacts( "org.apache.maven.its.mng4428" );
-            verifier.deleteDirectory( "target" );
-            Properties filterProps = verifier.newDefaultFilterProperties();
-            filterProps.setProperty( "@protocol@", fromHttp ? "http" : "https" );
-            filterProps.setProperty( "@port@", Integer.toString( ( (NetworkConnector) from ).getLocalPort() ) );
-            verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
-            verifier.addCliOption( "-X --settings" );
-            verifier.addCliOption( "settings.xml" );
-            verifier.setSystemProperty( "javax.net.ssl.trustStore", storePath );
-            verifier.setSystemProperty( "javax.net.ssl.trustStorePassword", storePwd );
-            verifier.setLogFileName( "log-" + getName().substring( 6 ) + ".txt" );
-            verifier.executeGoal( "validate" );
-            verifier.verifyErrorFreeLog();
-            verifier.resetStreams();
-        }
-        finally
-        {
-            server.stop();
-            server.join();
-        }
-
-        List<String> cp = verifier.loadLines( "target/classpath.txt", "UTF-8" );
-        assertTrue( cp.toString(), cp.contains( "dep-0.1.jar" ) );
-    }
-
-    private void addHttpsConnector( Server server, String keyStorePath, String keyStorePassword, String keyPassword )
-    {
-        SslContextFactory sslContextFactory = new SslContextFactory( keyStorePath );
-        sslContextFactory.setKeyStorePassword( keyStorePassword );
-        sslContextFactory.setKeyManagerPassword( keyPassword );
-        HttpConfiguration httpConfiguration = new HttpConfiguration();
-        httpConfiguration.setSecureScheme( "https" );
-        HttpConfiguration httpsConfiguration = new HttpConfiguration( httpConfiguration );
-        httpsConfiguration.addCustomizer( new SecureRequestCustomizer() );
-        ServerConnector httpsConnector = new ServerConnector( server,
-                new SslConnectionFactory( sslContextFactory, HTTP_1_1.asString() ),
-                new HttpConnectionFactory( httpsConfiguration ) );
-        server.addConnector( httpsConnector );
-    }
-
-    static class RedirectHandler extends AbstractHandler
-    {
-        private final String protocol;
-
-        private final NetworkConnector connector;
-
-        RedirectHandler( String protocol, NetworkConnector connector )
-        {
-            this.protocol = protocol;
-            this.connector = connector;
-        }
-
-        public void handle( String target, Request baseRequest, HttpServletRequest request,
-                            HttpServletResponse response )
-            throws IOException
-        {
-            System.out.println( "Handling " + request.getMethod() + " " + request.getRequestURL() );
-
-            PrintWriter writer = response.getWriter();
-
-            String uri = request.getRequestURI();
-            if ( uri.startsWith( "/repo/" ) )
-            {
-                String location = "/redirected/" + uri.substring( 6 );
-                if ( protocol != null && connector != null )
-                {
-                    location = protocol + "://localhost:" + connector.getLocalPort() + location;
-                }
-                if ( uri.endsWith( ".pom" ) )
-                {
-                    response.setStatus( HttpServletResponse.SC_MOVED_TEMPORARILY );
-                }
-                else
-                {
-                    response.setStatus( HttpServletResponse.SC_MOVED_PERMANENTLY );
-                }
-                response.setHeader( "Location", location );
-            }
-            else if ( uri.endsWith( ".pom" ) )
-            {
-                writer.println( "<project>" );
-                writer.println( "  <modelVersion>4.0.0</modelVersion>" );
-                writer.println( "  <groupId>org.apache.maven.its.mng4428</groupId>" );
-                writer.println( "  <artifactId>dep</artifactId>" );
-                writer.println( "  <version>0.1</version>" );
-                writer.println( "</project>" );
-                response.setStatus( HttpServletResponse.SC_OK );
-            }
-            else if ( uri.endsWith( ".jar" ) )
-            {
-                writer.println( "empty" );
-                response.setStatus( HttpServletResponse.SC_OK );
-            }
-            else
-            {
-                response.setStatus( HttpServletResponse.SC_NOT_FOUND );
-            }
-
-            ( (Request) request ).setHandled( true );
-        }
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
deleted file mode 100644
index 0e8aa01..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.apache.maven.it;
-
-import java.io.File;
-
-import org.apache.maven.it.util.ResourceExtractor;
-
-public class MavenITmng5805PkgTypeMojoConfiguration
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng5805PkgTypeMojoConfiguration()
-    {
-        super( "(3.3.3,3.5.0-alpha)" );
-    }
-
-    public void testPkgTypeMojoConfiguration()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5805-pkg-type-mojo-configuration" );
-        
-        Verifier verifier;
-
-        verifier = newVerifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "validate" );
-        verifier.verifyErrorFreeLog();
-        verifier.verifyTextInLog( "CLASS_NAME=org.apache.maven.its.mng5805.TestClass1" );
-        verifier.resetStreams();
-    }
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6352PrintVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6352PrintVersionTest.java
deleted file mode 100644
index 72e8d41..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6352PrintVersionTest.java
+++ /dev/null
@@ -1,157 +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.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * An integration test to check the enhancements to print out version
- * information during the reactor summary output at the correct
- * positions.
- *  
- * <a href="https://issues.apache.org/jira/browse/MNG-6352">MNG-6352</a>.
- * 
- * @author Karl Heinz Marbaise khmarbaise@apache.org
- */
-public class MavenITmng6352PrintVersionTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng6352PrintVersionTest()
-    {
-        super( "[3.5.3-SNAPSHOT,3.5.4-SNAPSHOT]" );
-    }
-
-    /**
-     * Check that the resulting output is
-     * as expected for the root module and last 
-     * module in build but not for the intermediate
-     * modules. 
-     */
-    public void testitShouldPrintVersionAtTopAndAtBottom()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6352-print-version" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        verifier.setMavenDebug( false );
-        verifier.setAutoclean( false );
-        
-        verifier.setLogFileName( "version-log.txt" );
-        verifier.executeGoals( Arrays.asList( "clean" ) );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        List<String> loadedLines = verifier.loadLines( "version-log.txt", "UTF-8" );
-        List<String> resultingLines = extractReactorBuildOrder( loadedLines );
-
-        // We expecting exactly four lines as result.
-        assertEquals( 4, resultingLines.size() );
-
-        // We expect those lines in the following exact order.
-        assertTrue( resultingLines.get( 0 ).startsWith( "[INFO] base-project 1.3.0-SNAPSHOT ........................ SUCCESS [" ) );
-        assertTrue( resultingLines.get( 1 ).startsWith( "[INFO] module-1 ........................................... SUCCESS [" ) );
-        assertTrue( resultingLines.get( 2 ).startsWith( "[INFO] module-2 ........................................... SUCCESS [" ) );
-        assertTrue( resultingLines.get( 3 ).startsWith( "[INFO] module-3 1.3.0-SNAPSHOT ............................ SUCCESS [" ) );
-        
-    }
-
-    /**
-     * Check that the resulting output is
-     * as expected for all modules in case
-     * for an aggregator build. 
-     */
-    public void testitShouldPrintVersionInAllLines()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6352-print-version-aggregator" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        verifier.setMavenDebug( false );
-        verifier.setAutoclean( false );
-        
-        verifier.setLogFileName( "version-log.txt" );
-        verifier.executeGoals( Arrays.asList( "clean" ) );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        List<String> loadedLines = verifier.loadLines( "version-log.txt", "UTF-8" );
-        List<String> resultingLines = extractReactorBuildOrder( loadedLines );
-
-        // We expecting exactly four lines as result.
-        assertEquals( 4, resultingLines.size() );
-
-        // We expect those lines in the following exact order.
-        assertTrue( resultingLines.get( 0 ).startsWith( "[INFO] module-1 1.2.7.43.RELEASE .......................... SUCCESS [  " ) );
-        assertTrue( resultingLines.get( 1 ).startsWith( "[INFO] module-2 7.5-SNAPSHOT .............................. SUCCESS [  " ) );
-        assertTrue( resultingLines.get( 2 ).startsWith( "[INFO] module-3 1-RC1 ..................................... SUCCESS [  " ) );
-        assertTrue( resultingLines.get( 3 ).startsWith( "[INFO] base-project 1.0.0-SNAPSHOT ........................ SUCCESS [  " ) );
-
-    }
-
-    
-    /**
-     * Extract the lines at the end of the Maven output:
-     * 
-     * <pre>
-     * [INFO] Reactor Summary:
-     * [INFO]
-     * [INFO] ...SUCCESS [  0.035 s]
-     * [INFO] ...SUCCESS [  0.035 s]
-     * [INFO] ...SUCCESS [  0.035 s]
-     * </pre>
-     */
-    private List<String> extractReactorBuildOrder( List<String> loadedLines )
-    {
-        List<String> resultingLines = new LinkedList<String>();
-        boolean start = false;
-        for ( String line : loadedLines )
-        {
-            if ( start )
-            {
-                if ( line.startsWith( "[INFO] -------------" ) )
-                {
-                    start = false;
-                }
-                else if ( !line.endsWith( "[INFO] " ) )
-                {
-                    resultingLines.add( line );
-                }
-            }
-            else
-            {
-                if ( line.startsWith( "[INFO] Reactor Summary:" ) )
-                {
-                    start = true;
-                }
-
-            }
-        }
-        return resultingLines;
-
-    }
-
-}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java
deleted file mode 100644
index a5bd6cd..0000000
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java
+++ /dev/null
@@ -1,159 +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.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * An integration test to check the enhancements to print out version
- * information during the reactor summary output at the correct
- * positions.
- *  
- * <a href="https://issues.apache.org/jira/browse/MNG-6391">MNG-6391</a>.
- * 
- * @author Karl Heinz Marbaise khmarbaise@apache.org
- */
-public class MavenITmng6391PrintVersionTest
-    extends AbstractMavenIntegrationTestCase
-{
-
-    public MavenITmng6391PrintVersionTest()
-    {
-        super( "[3.6.0-SNAPSHOT,)" );
-    }
-
-    /**
-     * Check that the resulting output is
-     * as expected for the root module and last 
-     * module in build but not for the intermediate
-     * modules. 
-     */
-    public void testitShouldPrintVersionAtTopAndAtBottom()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6391-print-version" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        verifier.setMavenDebug( false );
-        verifier.setAutoclean( false );
-        
-        verifier.setLogFileName( "version-log.txt" );
-        verifier.executeGoals( Arrays.asList( "clean" ) );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        List<String> loadedLines = verifier.loadLines( "version-log.txt", "UTF-8" );
-        List<String> resultingLines = extractReactorBuildOrder( loadedLines );
-
-        // We expecting exactly four lines as result.
-        assertEquals( 5, resultingLines.size() );
-
-        // We expect those lines in the following exact order.
-        assertTrue( resultingLines.get( 0 ).startsWith( "[INFO] Reactor Summary for base-project 1.3.0-SNAPSHOT:" ) );
-        assertTrue( resultingLines.get( 1 ).startsWith( "[INFO] base-project ....................................... SUCCESS [" ) );
-        assertTrue( resultingLines.get( 2 ).startsWith( "[INFO] module-1 ........................................... SUCCESS [" ) );
-        assertTrue( resultingLines.get( 3 ).startsWith( "[INFO] module-2 ........................................... SUCCESS [" ) );
-        assertTrue( resultingLines.get( 4 ).startsWith( "[INFO] module-3 ........................................... SUCCESS [" ) );
-        
-    }
-
-    /**
-     * Check that the resulting output is
-     * as expected for all modules in case
-     * for an aggregator build. 
-     */
-    public void testitShouldPrintVersionInAllLines()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6391-print-version-aggregator" );
-
-        Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
-        verifier.setMavenDebug( false );
-        verifier.setAutoclean( false );
-        
-        verifier.setLogFileName( "version-log.txt" );
-        verifier.executeGoals( Arrays.asList( "clean" ) );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        List<String> loadedLines = verifier.loadLines( "version-log.txt", "UTF-8" );
-        List<String> resultingLines = extractReactorBuildOrder( loadedLines );
-
-        // We expecting exactly four lines as result.
-        assertEquals( 5, resultingLines.size() );
-
-        // We expect those lines in the following exact order.
-        assertTrue( resultingLines.get( 0 ).startsWith( "[INFO] Reactor Summary:" ) );
-        assertTrue( resultingLines.get( 1 ).startsWith( "[INFO] module-1 1.2.7.43.RELEASE .......................... SUCCESS [  " ) );
-        assertTrue( resultingLines.get( 2 ).startsWith( "[INFO] module-2 7.5-SNAPSHOT .............................. SUCCESS [  " ) );
-        assertTrue( resultingLines.get( 3 ).startsWith( "[INFO] module-3 1-RC1 ..................................... SUCCESS [  " ) );
-        assertTrue( resultingLines.get( 4 ).startsWith( "[INFO] base-project 1.0.0-SNAPSHOT ........................ SUCCESS [  " ) );
-
-    }
-    
-    /**
-     * Extract the lines at the end of the Maven output:
-     * 
-     * <pre>
-     * [INFO] Reactor Summary..: XXX
-     * [INFO]
-     * [INFO] ...SUCCESS [  0.035 s]
-     * [INFO] ...SUCCESS [  0.035 s]
-     * [INFO] ...SUCCESS [  0.035 s]
-     * </pre>
-     */
-    private List<String> extractReactorBuildOrder( List<String> loadedLines )
-    {
-        List<String> resultingLines = new LinkedList<String>();
-        boolean start = false;
-        for ( String line : loadedLines )
-        {
-            if ( start )
-            {
-                if ( line.startsWith( "[INFO] -------------" ) )
-                {
-                    start = false;
-                }
-                else if ( !line.endsWith( "[INFO] " ) )
-                {
-                    resultingLines.add( line );
-                }
-            }
-            else
-            {
-                if ( line.startsWith( "[INFO] Reactor Summary" ) )
-                {
-                    start = true;
-                    resultingLines.add( line );
-                }
-
-            }
-        }
-        return resultingLines;
-
-    }
-
-}
diff --git a/core-it-suite/src/test/resources/it0145/mod-a/pom.xml b/core-it-suite/src/test/resources/it0145/mod-a/pom.xml
deleted file mode 100644
index a045f19..0000000
--- a/core-it-suite/src/test/resources/it0145/mod-a/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>
-
-  <groupId>org.apache.maven.its.it0145</groupId>
-  <artifactId>mod-a</artifactId>
-  <version>0.1</version>
-
-  <name>Maven Integration Test :: MNG-???? :: Module A</name>
-  <description>
-    Test the old-style reactor mode with includes/excludes to locate projects.
-  </description>
-
-  <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-a.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/it0145/mod-b/pom.xml b/core-it-suite/src/test/resources/it0145/mod-b/pom.xml
deleted file mode 100644
index 530de35..0000000
--- a/core-it-suite/src/test/resources/it0145/mod-b/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>
-
-  <groupId>org.apache.maven.its.it0145</groupId>
-  <artifactId>mod-b</artifactId>
-  <version>0.1</version>
-
-  <name>Maven Integration Test :: MNG-???? :: Module B</name>
-  <description>
-    Test the old-style reactor mode with includes/excludes to locate projects.
-  </description>
-
-  <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-b.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/it0145/pom.xml b/core-it-suite/src/test/resources/it0145/pom.xml
deleted file mode 100644
index fe92898..0000000
--- a/core-it-suite/src/test/resources/it0145/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>
-
-  <groupId>org.apache.maven.its.it0145</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.1</version>
-
-  <name>Maven Integration Test :: MNG-????</name>
-  <description>
-    Test the old-style reactor mode with includes/excludes to locate projects.
-  </description>
-
-  <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-0469/test0/pom.xml b/core-it-suite/src/test/resources/mng-0469/test0/pom.xml
deleted file mode 100644
index 8c83f74..0000000
--- a/core-it-suite/src/test/resources/mng-0469/test0/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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng469</groupId>
-  <artifactId>maven-it-mng469</artifactId>
-  <version>1.0</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: MNG-469</name>
-  <description>
-    Test that reporting configuration applies to build plugins, too.
-  </description>
-  
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-configuration</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <configuration>
-          <propertiesFile>target/config.properties</propertiesFile>
-          <!-- should override default value when plugin is invoked during build lifecycle -->
-          <defaultParam>not-the-default-value</defaultParam>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-0469/test1/pom.xml b/core-it-suite/src/test/resources/mng-0469/test1/pom.xml
deleted file mode 100644
index e0d42c4..0000000
--- a/core-it-suite/src/test/resources/mng-0469/test1/pom.xml
+++ /dev/null
@@ -1,62 +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.mng469</groupId>
-  <artifactId>maven-it-mng469</artifactId>
-  <version>1.1</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: MNG-469</name>
-  <description>
-    Test that reporting configuration does not override build configuration during build lifecycle.
-  </description>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-configuration</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <configuration>
-          <!-- should be dominant when plugin is invoked during build lifecycle -->
-          <propertiesFile>target/build.txt</propertiesFile>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-configuration</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <configuration>
-          <!-- should not override value from <build> configuration when plugin is invoked during build lifecycle -->
-          <propertiesFile>target/reporting.txt</propertiesFile>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-0469/test2/pom.xml b/core-it-suite/src/test/resources/mng-0469/test2/pom.xml
deleted file mode 100644
index da48edb..0000000
--- a/core-it-suite/src/test/resources/mng-0469/test2/pom.xml
+++ /dev/null
@@ -1,92 +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.mng469</groupId>
-  <artifactId>maven-it-mng469</artifactId>
-  <version>1.1</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: MNG-469</name> 
-  <description>
-    Test that build configuration does not affect report goals.
-  </description>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-site</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <configuration>
-          <!-- should not affect report goal -->
-          <infoFile>fail.properties</infoFile>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-expression</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <configuration>
-          <outputFile>target/config.properties</outputFile>
-          <expressions>
-            <expression>project/reporting/plugins/0</expression>
-            <expression>project/reporting/plugins/0/configuration</expression>
-          </expressions>
-        </configuration>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>eval</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-site</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <!-- info report should still use default value "info.properties" -->
-      </plugin>
-      <plugin>
-        <!-- that's a default report plugin, just disable to prevent interferences -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0-beta-3</version>
-        <reportSets>
-          <reportSet>
-            <reports>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-    </plugins>
-  </reporting>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-0731/artifact.jar b/core-it-suite/src/test/resources/mng-0731/artifact.jar
deleted file mode 100644
index 5224409..0000000
Binary files a/core-it-suite/src/test/resources/mng-0731/artifact.jar and /dev/null differ
diff --git a/core-it-suite/src/test/resources/mng-0731/pom.xml b/core-it-suite/src/test/resources/mng-0731/pom.xml
deleted file mode 100644
index 32698e1..0000000
--- a/core-it-suite/src/test/resources/mng-0731/pom.xml
+++ /dev/null
@@ -1,68 +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.it0061</groupId>
-  <artifactId>maven-it-it0061</artifactId>
-  <version>1.0</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: it0061</name> 
-  <description>
-    Verify that deployment of artifacts to a legacy-layout repository
-    results in a groupId directory of 'the.full.group.id' instead of
-    'the/full/group/id'.
-  </description>
-
-  <distributionManagement>
-    <repository>
-      <id>test</id>
-      <url>file:///${basedir}/target/test-repo</url>
-      <layout>legacy</layout>
-    </repository>
-  </distributionManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-artifact</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <configuration>
-          <mainFile>artifact.jar</mainFile>
-        </configuration>
-        <executions>
-          <execution>
-            <id>deploy</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>set</goal>
-              <goal>attach-pom</goal>
-              <goal>deploy</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-1830/pom.xml b/core-it-suite/src/test/resources/mng-1830/pom.xml
deleted file mode 100644
index c29e254..0000000
--- a/core-it-suite/src/test/resources/mng-1830/pom.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <name>Maven Integration Test :: MNG-1830</name> 
-  <groupId>org.apache.maven.its.mng1830</groupId>
-  <artifactId>maven-it-mng-1830</artifactId>
-  <description>Test -v</description>
-  <version>1.0</version>
-  <packaging>pom</packaging>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-2539/pom.xml b/core-it-suite/src/test/resources/mng-2539/pom.xml
deleted file mode 100644
index a286c47..0000000
--- a/core-it-suite/src/test/resources/mng-2539/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng2539</groupId>
-  <artifactId>mng-2539</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <name>Maven Integration Test :: MNG-2539</name> 
-  <description>
-    Verify that dependencies specified in plugins are also retrieved from ordinary/non-plugin repositories.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-log-file</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.maven.its.mng2539</groupId>
-            <artifactId>mail</artifactId>
-            <version>1.3.2</version>
-          </dependency>
-        </dependencies>
-        <configuration>
-          <logFile>target/log.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-2539/repo/org/apache/maven/its/mng2539/mail/1.3.2/mail-1.3.2.jar b/core-it-suite/src/test/resources/mng-2539/repo/org/apache/maven/its/mng2539/mail/1.3.2/mail-1.3.2.jar
deleted file mode 100644
index 89e22fc..0000000
--- a/core-it-suite/src/test/resources/mng-2539/repo/org/apache/maven/its/mng2539/mail/1.3.2/mail-1.3.2.jar
+++ /dev/null
@@ -1 +0,0 @@
-This is a placeholder for a real jar.
diff --git a/core-it-suite/src/test/resources/mng-2539/repo/org/apache/maven/its/mng2539/mail/1.3.2/mail-1.3.2.pom b/core-it-suite/src/test/resources/mng-2539/repo/org/apache/maven/its/mng2539/mail/1.3.2/mail-1.3.2.pom
deleted file mode 100644
index 0a4b078..0000000
--- a/core-it-suite/src/test/resources/mng-2539/repo/org/apache/maven/its/mng2539/mail/1.3.2/mail-1.3.2.pom
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng2539</groupId>
-  <artifactId>mail</artifactId>
-  <version>1.3.2</version>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-2539/settings-template.xml b/core-it-suite/src/test/resources/mng-2539/settings-template.xml
deleted file mode 100644
index c985d1a..0000000
--- a/core-it-suite/src/test/resources/mng-2539/settings-template.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.
--->
-
-<settings>
-  <profiles>
-    <profile>
-      <id>maven-core-it-repo</id>
-      <repositories>
-        <repository>
-          <id>maven-core-it</id>
-          <url>@baseurl@/repo</url>
-          <releases>
-            <checksumPolicy>ignore</checksumPolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-  </profiles>
-  <activeProfiles>
-    <activeProfile>maven-core-it-repo</activeProfile>
-  </activeProfiles>
-</settings>
diff --git a/core-it-suite/src/test/resources/mng-2562/custom/pom.xml b/core-it-suite/src/test/resources/mng-2562/custom/pom.xml
deleted file mode 100644
index e3f951c..0000000
--- a/core-it-suite/src/test/resources/mng-2562/custom/pom.xml
+++ /dev/null
@@ -1,62 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.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.mng2562</groupId>
-  <artifactId>timestamp</artifactId>
-  <packaging>pom</packaging>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: MNG-2562</name> 
-  <description>
-    Verify that the format of the timestamp can be customized via maven.build.timestamp.format.
-  </description>
-
-  <properties>
-    <timestamp>${maven.build.timestamp}</timestamp>
-    <maven.build.timestamp.format>mm:HH dd-MM-yyyy</maven.build.timestamp.format>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <version>2.1-SNAPSHOT</version>
-        <artifactId>maven-it-plugin-expression</artifactId>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>eval</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <outputFile>target/pom.properties</outputFile>
-          <expressions>
-            <expression>project/properties</expression>
-          </expressions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-2562/default/pom.xml b/core-it-suite/src/test/resources/mng-2562/default/pom.xml
deleted file mode 100644
index 5d67ce6..0000000
--- a/core-it-suite/src/test/resources/mng-2562/default/pom.xml
+++ /dev/null
@@ -1,62 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.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.mng2562</groupId>
-  <artifactId>timestamp</artifactId>
-  <packaging>pom</packaging>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: MNG-2562</name> 
-  <description>
-    Verify that the property build.timestamp is available for POM interpolation.
-  </description>
-
-  <properties>
-    <timestamp1>${maven.build.timestamp}</timestamp1>
-    <timestamp2>${build.timestamp}</timestamp2>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <version>2.1-SNAPSHOT</version>
-        <artifactId>maven-it-plugin-expression</artifactId>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>eval</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <outputFile>target/pom.properties</outputFile>
-          <expressions>
-            <expression>project/properties</expression>
-          </expressions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-2562/reactor/child-1/pom.xml b/core-it-suite/src/test/resources/mng-2562/reactor/child-1/pom.xml
deleted file mode 100644
index 5d5bce4..0000000
--- a/core-it-suite/src/test/resources/mng-2562/reactor/child-1/pom.xml
+++ /dev/null
@@ -1,43 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven.its.mng2562</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0</version>
-  </parent>
-
-  <groupId>org.apache.maven.its.mng2562</groupId>
-  <artifactId>child-1</artifactId>
-  <version>1.0</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: MNG-2562 :: Child 1</name> 
-  <description>
-    Verify that the timestamp is the same for all modules of a reactor build.
-  </description>
-
-  <properties>
-    <timestamp>${maven.build.timestamp}</timestamp>
-  </properties>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-2562/reactor/child-2/pom.xml b/core-it-suite/src/test/resources/mng-2562/reactor/child-2/pom.xml
deleted file mode 100644
index b582780..0000000
--- a/core-it-suite/src/test/resources/mng-2562/reactor/child-2/pom.xml
+++ /dev/null
@@ -1,43 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven.its.mng2562</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0</version>
-  </parent>
-
-  <groupId>org.apache.maven.its.mng2562</groupId>
-  <artifactId>child-2</artifactId>
-  <version>1.0</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: MNG-2562 :: Child 2</name> 
-  <description>
-    Verify that the timestamp is the same for all modules of a reactor build.
-  </description>
-
-  <properties>
-    <timestamp>${maven.build.timestamp}</timestamp>
-  </properties>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-2562/reactor/child-3/pom.xml b/core-it-suite/src/test/resources/mng-2562/reactor/child-3/pom.xml
deleted file mode 100644
index bb20901..0000000
--- a/core-it-suite/src/test/resources/mng-2562/reactor/child-3/pom.xml
+++ /dev/null
@@ -1,43 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven.its.mng2562</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.0</version>
-  </parent>
-
-  <groupId>org.apache.maven.its.mng2562</groupId>
-  <artifactId>child-3</artifactId>
-  <version>1.0</version>
-  <packaging>jar</packaging>
-
-  <name>Maven Integration Test :: MNG-2562 :: Child 3</name> 
-  <description>
-    Verify that the timestamp is the same for all modules of a reactor build.
-  </description>
-
-  <properties>
-    <timestamp>${maven.build.timestamp}</timestamp>
-  </properties>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-2562/reactor/pom.xml b/core-it-suite/src/test/resources/mng-2562/reactor/pom.xml
deleted file mode 100644
index feee18f..0000000
--- a/core-it-suite/src/test/resources/mng-2562/reactor/pom.xml
+++ /dev/null
@@ -1,68 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.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.mng2562</groupId>
-  <artifactId>parent</artifactId>
-  <packaging>pom</packaging>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: MNG-2562</name> 
-  <description>
-    Verify that the timestamp is the same for all modules of a reactor build.
-  </description>
-
-  <modules>
-    <module>child-1</module>
-    <module>child-2</module>
-    <module>child-3</module>
-  </modules>
-
-  <properties>
-    <timestamp>${maven.build.timestamp}</timestamp>
-    <maven.build.timestamp.format>HH:mm:ss:SSS</maven.build.timestamp.format>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <version>2.1-SNAPSHOT</version>
-        <artifactId>maven-it-plugin-expression</artifactId>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>eval</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <outputFile>target/pom.properties</outputFile>
-          <expressions>
-            <expression>project/properties</expression>
-          </expressions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-2878/pom.xml b/core-it-suite/src/test/resources/mng-2878/pom.xml
deleted file mode 100644
index e46f8ae..0000000
--- a/core-it-suite/src/test/resources/mng-2878/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.mng2878</groupId>
-  <artifactId>test1</artifactId>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: MNG-2878</name> 
-  <description>
-    Verify that a plugin can load default-report.xml from the core.
-  </description>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-class-loader</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <id>load</id>
-            <phase>validate</phase>
-            <configuration>
-              <resourcePaths>default-report.xml</resourcePaths>
-              <pluginClassLoaderOutput>target/pcl.properties</pluginClassLoaderOutput>
-              <contextClassLoaderOutput>target/tccl.properties</contextClassLoaderOutput>
-            </configuration>
-            <goals>
-              <goal>load</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-2883/dependency/pom.xml b/core-it-suite/src/test/resources/mng-2883/dependency/pom.xml
deleted file mode 100644
index cb967d3..0000000
--- a/core-it-suite/src/test/resources/mng-2883/dependency/pom.xml
+++ /dev/null
@@ -1,38 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng2883</groupId>
-  <artifactId>dependency-user</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its.mng2883</groupId>
-      <artifactId>dep</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-dependency-resolution</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <testArtifacts>target/artifacts.txt</testArtifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-2883/dependency/repo/org.apache.maven.its.mng2883/jars/dep-1.0-SNAPSHOT.jar b/core-it-suite/src/test/resources/mng-2883/dependency/repo/org.apache.maven.its.mng2883/jars/dep-1.0-SNAPSHOT.jar
deleted file mode 100644
index 668bdc1..0000000
Binary files a/core-it-suite/src/test/resources/mng-2883/dependency/repo/org.apache.maven.its.mng2883/jars/dep-1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/core-it-suite/src/test/resources/mng-2883/dependency/repo/org.apache.maven.its.mng2883/poms/dep-1.0-SNAPSHOT.pom b/core-it-suite/src/test/resources/mng-2883/dependency/repo/org.apache.maven.its.mng2883/poms/dep-1.0-SNAPSHOT.pom
deleted file mode 100644
index 340a7be..0000000
--- a/core-it-suite/src/test/resources/mng-2883/dependency/repo/org.apache.maven.its.mng2883/poms/dep-1.0-SNAPSHOT.pom
+++ /dev/null
@@ -1,17 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng2883</groupId>
-  <artifactId>dep</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-2883/parent/pom.xml b/core-it-suite/src/test/resources/mng-2883/parent/pom.xml
deleted file mode 100644
index f30ff4d..0000000
--- a/core-it-suite/src/test/resources/mng-2883/parent/pom.xml
+++ /dev/null
@@ -1,13 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  
-  <parent>
-    <groupId>org.apache.maven.its.mng2883</groupId>
-    <version>1.0-SNAPSHOT</version>
-    <artifactId>parent</artifactId>
-  </parent>
-  
-  <artifactId>snapshot-offline-parent-legacyRepo</artifactId>
-
-</project>
diff --git a/core-it-suite/src/test/resources/mng-2883/parent/repo/org.apache.maven.its.mng2883/poms/parent-1.0-SNAPSHOT.pom b/core-it-suite/src/test/resources/mng-2883/parent/repo/org.apache.maven.its.mng2883/poms/parent-1.0-SNAPSHOT.pom
deleted file mode 100644
index 0d72387..0000000
--- a/core-it-suite/src/test/resources/mng-2883/parent/repo/org.apache.maven.its.mng2883/poms/parent-1.0-SNAPSHOT.pom
+++ /dev/null
@@ -1,19 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  
-  <groupId>org.apache.maven.its.mng2883</groupId>
-  <version>1.0-SNAPSHOT</version>
-  <artifactId>parent</artifactId>
-  
-  <packaging>pom</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-2883/plugin/repo/org.apache.maven.its.mng2883/maven-plugins/plugin-1.0-SNAPSHOT.jar b/core-it-suite/src/test/resources/mng-2883/plugin/repo/org.apache.maven.its.mng2883/maven-plugins/plugin-1.0-SNAPSHOT.jar
deleted file mode 100644
index 5fd67ff..0000000
Binary files a/core-it-suite/src/test/resources/mng-2883/plugin/repo/org.apache.maven.its.mng2883/maven-plugins/plugin-1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/core-it-suite/src/test/resources/mng-2883/plugin/repo/org.apache.maven.its.mng2883/poms/plugin-1.0-SNAPSHOT.pom b/core-it-suite/src/test/resources/mng-2883/plugin/repo/org.apache.maven.its.mng2883/poms/plugin-1.0-SNAPSHOT.pom
deleted file mode 100644
index 0376a4a..0000000
--- a/core-it-suite/src/test/resources/mng-2883/plugin/repo/org.apache.maven.its.mng2883/poms/plugin-1.0-SNAPSHOT.pom
+++ /dev/null
@@ -1,17 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng2883</groupId>
-  <artifactId>plugin</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-2883/settings-template.xml b/core-it-suite/src/test/resources/mng-2883/settings-template.xml
deleted file mode 100644
index 1355111..0000000
--- a/core-it-suite/src/test/resources/mng-2883/settings-template.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.
--->
-
-<settings>
-  <profiles>
-    <profile>
-      <id>remote-repository</id>
-      <repositories>
-        <repository>
-          <id>testing-repo</id>
-          <url>@baseurl@/repo</url>
-          <layout>legacy</layout>
-          <snapshots>
-            <checksumPolicy>ignore</checksumPolicy>
-            <!-- NOTE: Trigger update regardless of timestamps -->
-            <updatePolicy>always</updatePolicy>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>testing-repo</id>
-          <url>@baseurl@/repo</url>
-          <layout>legacy</layout>
-          <snapshots>
-            <checksumPolicy>ignore</checksumPolicy>
-            <!-- NOTE: Trigger update regardless of timestamps -->
-            <updatePolicy>always</updatePolicy>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
-  <activeProfiles>
-    <activeProfile>remote-repository</activeProfile>
-  </activeProfiles>
-</settings>
diff --git a/core-it-suite/src/test/resources/mng-3052/pom.xml b/core-it-suite/src/test/resources/mng-3052/pom.xml
deleted file mode 100644
index ac6f2c6..0000000
--- a/core-it-suite/src/test/resources/mng-3052/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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3052</groupId>
-  <artifactId>test</artifactId>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: MNG-3052</name> 
-  <description>
-    Test that the artifact collector considers repositories listed in dependency POMs when collecting transitive
-    dependencies, especially snapshot versions.
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its.mng3052</groupId>
-      <artifactId>direct</artifactId>
-      <version>0.1-SNAPSHOT</version>
-    </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/artifacts.txt</compileArtifacts>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3052/repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/direct-0.1-20090517.133956-1.jar b/core-it-suite/src/test/resources/mng-3052/repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/direct-0.1-20090517.133956-1.jar
deleted file mode 100644
index 96c033d..0000000
Binary files a/core-it-suite/src/test/resources/mng-3052/repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/direct-0.1-20090517.133956-1.jar and /dev/null differ
diff --git a/core-it-suite/src/test/resources/mng-3052/repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3052/repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/maven-metadata.xml
deleted file mode 100644
index cbf2cdd..0000000
--- a/core-it-suite/src/test/resources/mng-3052/repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/maven-metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <groupId>org.apache.maven.its.mng3052</groupId>
-  <artifactId>direct</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20090517.133956</timestamp>
-      <buildNumber>1</buildNumber>
-    </snapshot>
-    <lastUpdated>20090517133956</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/core-it-suite/src/test/resources/mng-3052/repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/template.pom b/core-it-suite/src/test/resources/mng-3052/repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/template.pom
deleted file mode 100644
index 4c06f93..0000000
--- a/core-it-suite/src/test/resources/mng-3052/repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/template.pom
+++ /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.mng3052</groupId>
-  <artifactId>direct</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <packaging>jar</packaging>
-
-  <distributionManagement>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-    </repository>
-  </distributionManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its.mng3052</groupId>
-      <artifactId>trans</artifactId>
-      <version>0.1-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
-  <repositories>
-    <repository>
-      <id>maven-core-it-repo-t</id>
-      <url>@baseurl@/repo-t</url>
-      <releases>
-        <checksumPolicy>ignore</checksumPolicy>
-      </releases>
-      <snapshots>
-        <checksumPolicy>ignore</checksumPolicy>
-      </snapshots>
-    </repository>
-  </repositories>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3052/repo-d/org/apache/maven/its/mng3052/direct/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3052/repo-d/org/apache/maven/its/mng3052/direct/maven-metadata.xml
deleted file mode 100644
index ba02595..0000000
--- a/core-it-suite/src/test/resources/mng-3052/repo-d/org/apache/maven/its/mng3052/direct/maven-metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <groupId>org.apache.maven.its.mng3052</groupId>
-  <artifactId>direct</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <versioning>
-    <versions>
-      <version>0.1-SNAPSHOT</version>
-    </versions>
-    <lastUpdated>20090517133956</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/core-it-suite/src/test/resources/mng-3052/repo-t/org/apache/maven/its/mng3052/trans/0.1-SNAPSHOT/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3052/repo-t/org/apache/maven/its/mng3052/trans/0.1-SNAPSHOT/maven-metadata.xml
deleted file mode 100644
index 65fdfba..0000000
--- a/core-it-suite/src/test/resources/mng-3052/repo-t/org/apache/maven/its/mng3052/trans/0.1-SNAPSHOT/maven-metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <groupId>org.apache.maven.its.mng3052</groupId>
-  <artifactId>trans</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <timestamp>20090517.132833</timestamp>
-      <buildNumber>1</buildNumber>
-    </snapshot>
-    <lastUpdated>20090517132833</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/core-it-suite/src/test/resources/mng-3052/repo-t/org/apache/maven/its/mng3052/trans/0.1-SNAPSHOT/trans-0.1-20090517.132833-1.jar b/core-it-suite/src/test/resources/mng-3052/repo-t/org/apache/maven/its/mng3052/trans/0.1-SNAPSHOT/trans-0.1-20090517.132833-1.jar
deleted file mode 100644
index fc3b4af..0000000
Binary files a/core-it-suite/src/test/resources/mng-3052/repo-t/org/apache/maven/its/mng3052/trans/0.1-SNAPSHOT/trans-0.1-20090517.132833-1.jar and /dev/null differ
diff --git a/core-it-suite/src/test/resources/mng-3052/repo-t/org/apache/maven/its/mng3052/trans/0.1-SNAPSHOT/trans-0.1-20090517.132833-1.pom b/core-it-suite/src/test/resources/mng-3052/repo-t/org/apache/maven/its/mng3052/trans/0.1-SNAPSHOT/trans-0.1-20090517.132833-1.pom
deleted file mode 100644
index 88abbe1..0000000
--- a/core-it-suite/src/test/resources/mng-3052/repo-t/org/apache/maven/its/mng3052/trans/0.1-SNAPSHOT/trans-0.1-20090517.132833-1.pom
+++ /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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3052</groupId>
-  <artifactId>trans</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <packaging>jar</packaging>
-
-  <distributionManagement>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-    </repository>
-  </distributionManagement>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3052/repo-t/org/apache/maven/its/mng3052/trans/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3052/repo-t/org/apache/maven/its/mng3052/trans/maven-metadata.xml
deleted file mode 100644
index d34e7be..0000000
--- a/core-it-suite/src/test/resources/mng-3052/repo-t/org/apache/maven/its/mng3052/trans/maven-metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata xsi:schemaLocation="http://maven.apache.org/METADATA/1.0.0 http://maven.apache.org/xsd/metadata-1.0.0.xsd" xmlns="http://maven.apache.org/METADATA/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <groupId>org.apache.maven.its.mng3052</groupId>
-  <artifactId>trans</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <versioning>
-    <versions>
-      <version>0.1-SNAPSHOT</version>
-    </versions>
-    <lastUpdated>20090517132833</lastUpdated>
-  </versioning>
-</metadata>
diff --git a/core-it-suite/src/test/resources/mng-3052/settings-template.xml b/core-it-suite/src/test/resources/mng-3052/settings-template.xml
deleted file mode 100644
index ece41a7..0000000
--- a/core-it-suite/src/test/resources/mng-3052/settings-template.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.
--->
-
-<settings>
-  <profiles>
-    <profile>
-      <id>maven-core-it-repo</id>
-      <repositories>
-        <repository>
-          <id>maven-core-it-repo-d</id>
-          <url>@baseurl@/repo-d</url>
-          <releases>
-            <checksumPolicy>ignore</checksumPolicy>
-          </releases>
-          <snapshots>
-            <checksumPolicy>ignore</checksumPolicy>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-  </profiles>
-  <activeProfiles>
-    <activeProfile>maven-core-it-repo</activeProfile>
-  </activeProfiles>
-</settings>
diff --git a/core-it-suite/src/test/resources/mng-3057/level2/level3/artifact.jar b/core-it-suite/src/test/resources/mng-3057/level2/level3/artifact.jar
deleted file mode 100644
index dca54c8..0000000
Binary files a/core-it-suite/src/test/resources/mng-3057/level2/level3/artifact.jar and /dev/null differ
diff --git a/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml b/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml
deleted file mode 100644
index 0051d3f..0000000
--- a/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven.its.mng3057</groupId>
-    <artifactId>level2</artifactId>
-    <version>${testVersion}</version>
-  </parent>
-
-  <artifactId>level3</artifactId>
-  <version>${testVersion}</version>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-artifact</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <id>package</id>
-            <phase>initialize</phase>
-            <goals>
-              <goal>set</goal>
-              <goal>attach-pom</goal>
-            </goals>
-            <configuration>
-              <mainFile>artifact.jar</mainFile>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3057/level2/pom.xml b/core-it-suite/src/test/resources/mng-3057/level2/pom.xml
deleted file mode 100644
index e9eca2e..0000000
--- a/core-it-suite/src/test/resources/mng-3057/level2/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven.its.mng3057</groupId>
-    <artifactId>mng-3057</artifactId>
-    <version>${testVersion}</version>
-  </parent>
-
-  <artifactId>level2</artifactId>
-  <version>${testVersion}</version>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>level3</module>
-  </modules>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3057/pom.xml b/core-it-suite/src/test/resources/mng-3057/pom.xml
deleted file mode 100644
index 050c2c8..0000000
--- a/core-it-suite/src/test/resources/mng-3057/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3057</groupId>
-  <artifactId>mng-3057</artifactId>
-  <version>${testVersion}</version>
-  <packaging>pom</packaging>
-  
-  <name>Integration Test Project for MNG-3057</name>
-  <description>
-    This project verifies that MNG-3057 is fixed.
-  </description>
-  
-  <distributionManagement>
-    <repository>
-      <id>test-repo</id>
-      <url>@deployTo@</url>
-    </repository>
-  </distributionManagement>
-  
-  <url>https://issues.apache.org/jira/browse/MNG-3057</url>
-  
-  <modules>
-    <module>level2</module>
-  </modules>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-artifact</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <!--
-               This execution is technically INCORRECT, but should have no effect on the result
-               of the build. It is described in MCOMPILER-94, and could interact with the 
-               handling of POMs for install and deploy, when packaging == pom. Adding here
-               to force the issue and make sure the POM transformation still happens correctly.
-            -->
-            <id>mcompiler-94</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>set</goal>
-            </goals>
-            <configuration>
-              <mainFile>target/classes</mainFile>
-            </configuration>
-          </execution>
-          <execution>
-            <id>install</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>install</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>deploy</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>deploy</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3106/pom.xml b/core-it-suite/src/test/resources/mng-3106/pom.xml
deleted file mode 100644
index 20ace19..0000000
--- a/core-it-suite/src/test/resources/mng-3106/pom.xml
+++ /dev/null
@@ -1,81 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3106</groupId>
-  <artifactId>test-artifact</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.its.plugins</groupId>
-          <artifactId>maven-it-plugin-touch</artifactId>
-          <version>2.1-SNAPSHOT</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <profiles>
-    <profile>
-      <id>profile1</id>
-      <activation>
-        <property>
-          <name>profile1.on</name>
-          <value>true</value>
-        </property>
-        <jdk>none</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.its.plugins</groupId>
-            <artifactId>maven-it-plugin-touch</artifactId>
-            <executions>
-              <execution>
-                <id>profile1-touch</id>
-                <phase>validate</phase>
-                <goals>
-                  <goal>touch</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${project.build.directory}/profile1</outputDirectory>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>profile2</id>
-      <activation>
-        <property>
-          <name>profile2.on</name>
-          <value>true</value>
-        </property>
-        <file>
-          <exists>pom.xml</exists>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.its.plugins</groupId>
-            <artifactId>maven-it-plugin-touch</artifactId>
-            <executions>
-              <execution>
-                <id>profile2-touch</id>
-                <phase>validate</phase>
-                <goals>
-                  <goal>touch</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${project.build.directory}/profile2</outputDirectory>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3221/plugin/pom.xml b/core-it-suite/src/test/resources/mng-3221/plugin/pom.xml
deleted file mode 100644
index d905676..0000000
--- a/core-it-suite/src/test/resources/mng-3221/plugin/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: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"
-  xmlns="http://maven.apache.org/POM/4.0.0">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3221</groupId>
-  <artifactId>maven-forking-test-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
-  <version>1</version>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0.4</version>
-    </dependency>
-  </dependencies>
-</project>
-
diff --git a/core-it-suite/src/test/resources/mng-3221/plugin/src/main/java/tests/Test2Mojo.java b/core-it-suite/src/test/resources/mng-3221/plugin/src/main/java/tests/Test2Mojo.java
deleted file mode 100644
index 447e4ba..0000000
--- a/core-it-suite/src/test/resources/mng-3221/plugin/src/main/java/tests/Test2Mojo.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package tests;
-
-import org.apache.maven.plugin.Mojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.logging.Log;
-
-/**
- * @goal test2
- * @execute phase="compile"
- */
-public class Test2Mojo
-    implements Mojo
-{
-
-    private Log log;
-
-    public void execute()
-        throws MojoExecutionException, MojoFailureException
-    {
-        System.out.println( "\n\n\nHI!\n\n" );
-    }
-
-    public Log getLog()
-    {
-        return log;
-    }
-
-    public void setLog( Log log )
-    {
-        this.log = log;
-    }
-
-}
diff --git a/core-it-suite/src/test/resources/mng-3221/plugin/src/main/java/tests/TestMojo.java b/core-it-suite/src/test/resources/mng-3221/plugin/src/main/java/tests/TestMojo.java
deleted file mode 100644
index eb14a9c..0000000
--- a/core-it-suite/src/test/resources/mng-3221/plugin/src/main/java/tests/TestMojo.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package tests;
-
-import org.apache.maven.plugin.Mojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.logging.Log;
-
-/**
- * @goal test
- * @execute phase="compile"
- */
-public class TestMojo
-    implements Mojo
-{
-
-    private Log log;
-
-    public void execute()
-        throws MojoExecutionException, MojoFailureException
-    {
-        System.out.println( "\n\n\nHI!\n\n" );
-    }
-
-    public Log getLog()
-    {
-        return log;
-    }
-
-    public void setLog( Log log )
-    {
-        this.log = log;
-    }
-
-}
diff --git a/core-it-suite/src/test/resources/mng-3221/report/pom.xml b/core-it-suite/src/test/resources/mng-3221/report/pom.xml
deleted file mode 100644
index 820508c..0000000
--- a/core-it-suite/src/test/resources/mng-3221/report/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project xmlns: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"
-  xmlns="http://maven.apache.org/POM/4.0.0">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3221</groupId>
-  <artifactId>maven-forking-report-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
-  <version>1</version>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-api</artifactId>
-      <version>2.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-impl</artifactId>
-      <version>2.0.4.1</version>
-    </dependency>
-  </dependencies>
-</project>
-
diff --git a/core-it-suite/src/test/resources/mng-3221/report/src/main/java/tests/ForkingReport.java b/core-it-suite/src/test/resources/mng-3221/report/src/main/java/tests/ForkingReport.java
deleted file mode 100644
index e96db95..0000000
--- a/core-it-suite/src/test/resources/mng-3221/report/src/main/java/tests/ForkingReport.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package tests;
-
-import org.apache.maven.doxia.siterenderer.DefaultSiteRenderer;
-import org.apache.maven.doxia.siterenderer.Renderer;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.reporting.AbstractMavenReport;
-import org.apache.maven.reporting.MavenReportException;
-
-import java.io.File;
-import java.util.Locale;
-
-/**
- * @goal report
- * @execute phase="site"
- */
-public class ForkingReport
-    extends AbstractMavenReport
-{
-
-    /**
-     * @parameter default-value="${project}"
-     * @required
-     * @readonly
-     */
-    private MavenProject project;
-
-    /**
-     * @parameter default-value="${project.build.directory}"
-     * @required
-     */
-    private File outputDirectory;
-
-    protected void executeReport( Locale locale )
-        throws MavenReportException
-    {
-        System.out.println( "\n\n\nHI!\n\n" );
-    }
-
-    protected String getOutputDirectory()
-    {
-        return outputDirectory.getAbsolutePath();
-    }
-
-    protected MavenProject getProject()
-    {
-        return project;
-    }
-
-    protected Renderer getSiteRenderer()
-    {
-        return new DefaultSiteRenderer();
-    }
-
-    public String getDescription( Locale locale )
-    {
-        return "test";
-    }
-
-    public String getName( Locale locale )
-    {
-        return "test";
-    }
-
-    public String getOutputName()
-    {
-        return "test";
-    }
-
-}
diff --git a/core-it-suite/src/test/resources/mng-3221/user/pom.xml b/core-it-suite/src/test/resources/mng-3221/user/pom.xml
deleted file mode 100644
index d6bb255..0000000
--- a/core-it-suite/src/test/resources/mng-3221/user/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.maven.its.mng3221</groupId>
-  <artifactId>mng-3221-with-forking-report</artifactId>
-  <packaging>jar</packaging>
-  <version>1</version>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  
-  <profiles>
-    <profile>
-      <id>site</id>
-      
-      <reporting>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-project-info-reports-plugin</artifactId>
-            <version>2.0.1</version>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.its.mng3221</groupId>
-            <artifactId>maven-forking-report-plugin</artifactId>
-            <version>1</version>
-          </plugin>
-        </plugins>
-      </reporting>
-    </profile>
-    
-    <profile>
-      <id>plugin</id>
-      
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.its.mng3221</groupId>
-            <artifactId>maven-forking-test-plugin</artifactId>
-            <version>1</version>
-            <executions>
-              <execution>
-                <id>test</id>
-                <phase>validate</phase>
-                <goals>
-                  <goal>test</goal>
-                  <goal>test2</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-  
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3221/user/src/main/java/tests/App.java b/core-it-suite/src/test/resources/mng-3221/user/src/main/java/tests/App.java
deleted file mode 100644
index 53e46ad..0000000
--- a/core-it-suite/src/test/resources/mng-3221/user/src/main/java/tests/App.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package tests;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-3221/user/src/test/java/tests/AppTest.java b/core-it-suite/src/test/resources/mng-3221/user/src/test/java/tests/AppTest.java
deleted file mode 100644
index c378ad2..0000000
--- a/core-it-suite/src/test/resources/mng-3221/user/src/test/java/tests/AppTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-3271/pom.xml b/core-it-suite/src/test/resources/mng-3271/pom.xml
deleted file mode 100644
index 7611095..0000000
--- a/core-it-suite/src/test/resources/mng-3271/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.mng3271</groupId>
-  <artifactId>maven-it-mng3271</artifactId>
-  <version>1.0</version>
-
-  <name>Maven Integration Test :: MNG-3271</name> 
-  <description>
-    Verify that default reports can be suppressed.
-  </description>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-site</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <id>list</id>
-            <phase>validate</phase>
-            <configuration>
-              <reportsFile>target/reports.properties</reportsFile>
-            </configuration>
-            <goals>
-              <goal>list</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <reporting>
-    <excludeDefaults>true</excludeDefaults>
-  </reporting>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3530/build-path/plugin/pom.xml b/core-it-suite/src/test/resources/mng-3530/build-path/plugin/pom.xml
deleted file mode 100644
index 4bb5195..0000000
--- a/core-it-suite/src/test/resources/mng-3530/build-path/plugin/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3530</groupId>
-  <artifactId>build-path-maven-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
-  <version>1</version>
-  <name>plugin Maven Mojo</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>2.0.6</version>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3530/build-path/plugin/src/main/java/mng3530/SetPathMojo.java b/core-it-suite/src/test/resources/mng-3530/build-path/plugin/src/main/java/mng3530/SetPathMojo.java
deleted file mode 100644
index 43a7822..0000000
--- a/core-it-suite/src/test/resources/mng-3530/build-path/plugin/src/main/java/mng3530/SetPathMojo.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package mng3530;
-
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed 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.Mojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.project.MavenProject;
-
-import java.io.File;
-
-/**
- * Modify the build path project.build.directory, contained in the current
- * project instance. This and the corresponding {@link ValidatePathMojo} should
- * prove or disprove the ability to have build-path modifications ripple through
- * the project's values, such as plugin configurations.
- *
- * @goal set
- * @phase compile
- */
-public class SetPathMojo
-    implements Mojo
-{
-    public static final String MODIFIED_BUILD_DIRECTORY_NAME = "target-modified";
-
-    /**
-     * Project instance to modify.
-     *
-     * @parameter default-value="${project}"
-     * @required
-     * @readonly
-     */
-    private MavenProject project;
-
-    private Log log;
-
-    public void execute()
-        throws MojoExecutionException
-    {
-        getLog().info( "Before modification, project.build.directory is: " + project.getBuild().getDirectory() );
-
-        File basedir = project.getBasedir();
-        project.getBuild().setDirectory( new File( basedir, MODIFIED_BUILD_DIRECTORY_NAME ).getAbsolutePath() );
-
-        getLog().info( "After modification, project.build.directory is: " + project.getBuild().getDirectory() );
-        getLog().info( "Modifications complete." );
-    }
-
-    public Log getLog()
-    {
-        return log;
-    }
-
-    public void setLog( Log log )
-    {
-        this.log = log;
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-3530/build-path/plugin/src/main/java/mng3530/ValidatePathMojo.java b/core-it-suite/src/test/resources/mng-3530/build-path/plugin/src/main/java/mng3530/ValidatePathMojo.java
deleted file mode 100644
index 1f6e454..0000000
--- a/core-it-suite/src/test/resources/mng-3530/build-path/plugin/src/main/java/mng3530/ValidatePathMojo.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package mng3530;
-
-import org.apache.maven.plugin.Mojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.project.MavenProject;
-
-import java.io.File;
-
-/**
- * Validate that the project paths have been reset by the {@link SetPathMojo}.
- *
- * @goal validate
- * @phase package
- */
-public class ValidatePathMojo
-    implements Mojo
-{
-
-    /**
-     * @parameter
-     */
-    private File buildDirectory;
-
-    /**
-     * Project instance to validate.
-     *
-     * @parameter expression="${project}"
-     * @required
-     * @readonly
-     */
-    private MavenProject project;
-
-    private Log log;
-
-    public void execute()
-        throws MojoExecutionException, MojoFailureException
-    {
-        getLog().info( "Validating buildDirectory parameter: " + buildDirectory );
-        if ( !project.getBuild().getDirectory().equals( buildDirectory.getAbsolutePath() ) )
-        {
-            throw new MojoExecutionException( "buildDirectory parameter value:\n\n" + buildDirectory
-                                              + "\n\ndoes not match project.build.directory:\n\n"
-                                              + project.getBuild().getDirectory() + "\n" );
-        }
-        else if ( !buildDirectory.getName().equals( SetPathMojo.MODIFIED_BUILD_DIRECTORY_NAME ) )
-        {
-            throw new MojoExecutionException( "buildDirectory parameter value:\n\n" + buildDirectory
-                                              + "\n\ndoes not use modified target dir-name: "
-                                              + SetPathMojo.MODIFIED_BUILD_DIRECTORY_NAME + "\n" );
-        }
-        else
-        {
-            getLog().info( "buildDirectory matches project.build.directory, and points to modified target location." );
-        }
-    }
-
-    public Log getLog()
-    {
-        return log;
-    }
-
-    public void setLog( Log log )
-    {
-        this.log = log;
-    }
-
-}
diff --git a/core-it-suite/src/test/resources/mng-3530/build-path/project/pom.xml b/core-it-suite/src/test/resources/mng-3530/build-path/project/pom.xml
deleted file mode 100644
index e9d3e5d..0000000
--- a/core-it-suite/src/test/resources/mng-3530/build-path/project/pom.xml
+++ /dev/null
@@ -1,45 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3530</groupId>
-  <artifactId>build-path-project</artifactId>
-  <packaging>jar</packaging>
-  <version>1</version>
-  <name>project</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.mng3530</groupId>
-        <artifactId>build-path-maven-plugin</artifactId>
-        <version>1</version>
-        <executions>
-          <execution>
-            <id>set</id>
-            <goals>
-              <goal>set</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>validate</id>
-            <goals>
-              <goal>validate</goal>
-            </goals>
-            <configuration>
-              <buildDirectory>${project.build.directory}</buildDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3530/build-path/project/src/main/java/tests/App.java b/core-it-suite/src/test/resources/mng-3530/build-path/project/src/main/java/tests/App.java
deleted file mode 100644
index 53e46ad..0000000
--- a/core-it-suite/src/test/resources/mng-3530/build-path/project/src/main/java/tests/App.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package tests;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-3530/build-path/project/src/test/java/tests/AppTest.java b/core-it-suite/src/test/resources/mng-3530/build-path/project/src/test/java/tests/AppTest.java
deleted file mode 100644
index c378ad2..0000000
--- a/core-it-suite/src/test/resources/mng-3530/build-path/project/src/test/java/tests/AppTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-3530/pom-property/plugin/pom.xml b/core-it-suite/src/test/resources/mng-3530/pom-property/plugin/pom.xml
deleted file mode 100644
index 032a725..0000000
--- a/core-it-suite/src/test/resources/mng-3530/pom-property/plugin/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3530</groupId>
-  <artifactId>pom-property-maven-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
-  <version>1</version>
-  <name>plugin Maven Mojo</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>2.0.6</version>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3530/pom-property/plugin/src/main/java/mng3530/SetPropertyMojo.java b/core-it-suite/src/test/resources/mng-3530/pom-property/plugin/src/main/java/mng3530/SetPropertyMojo.java
deleted file mode 100644
index dc68f17..0000000
--- a/core-it-suite/src/test/resources/mng-3530/pom-property/plugin/src/main/java/mng3530/SetPropertyMojo.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package mng3530;
-
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed 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.Mojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.project.MavenProject;
-
-/**
- * Modify the POM property myDirectory, contained in the current
- * project instance. This and the corresponding {@link ValidatePropertyMojo} should
- * prove or disprove the ability to have POM-property modifications ripple through
- * the project's values, such as plugin configurations.
- *
- * @goal set
- * @phase compile
- */
-public class SetPropertyMojo
-    implements Mojo
-{
-    public static final String MODIFIED_PROPERTY_VALUE = "modified";
-
-    /**
-     * Project instance to modify.
-     *
-     * @parameter default-value="${project}"
-     * @required
-     * @readonly
-     */
-    private MavenProject project;
-
-    private Log log;
-
-    public void execute()
-        throws MojoExecutionException
-    {
-        getLog().info( "Before modification, myDirectory is: " + project.getProperties().getProperty( "myDirectory" ) );
-
-        project.getProperties().setProperty( "myDirectory", MODIFIED_PROPERTY_VALUE );
-
-        getLog().info( "After modification, myDirectory is: " + project.getProperties().getProperty( "myDirectory" ) );
-        getLog().info( "Modifications complete." );
-    }
-
-    public Log getLog()
-    {
-        return log;
-    }
-
-    public void setLog( Log log )
-    {
-        this.log = log;
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-3530/pom-property/plugin/src/main/java/mng3530/ValidatePropertyMojo.java b/core-it-suite/src/test/resources/mng-3530/pom-property/plugin/src/main/java/mng3530/ValidatePropertyMojo.java
deleted file mode 100644
index e11533c..0000000
--- a/core-it-suite/src/test/resources/mng-3530/pom-property/plugin/src/main/java/mng3530/ValidatePropertyMojo.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package mng3530;
-
-import org.apache.maven.plugin.Mojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.project.MavenProject;
-
-/**
- * Validate that the POM property has been reset by the {@link SetPropertyMojo}.
- *
- * @goal validate
- * @phase package
- */
-public class ValidatePropertyMojo
-    implements Mojo
-{
-
-    /**
-     * @parameter
-     */
-    private String buildDirectory;
-
-    /**
-     * Project instance to validate.
-     *
-     * @parameter expression="${project}"
-     * @required
-     * @readonly
-     */
-    private MavenProject project;
-
-    private Log log;
-
-    public void execute()
-        throws MojoExecutionException, MojoFailureException
-    {
-        getLog().info( "Validating buildDirectory parameter: " + buildDirectory );
-        String apiValue = project.getProperties().getProperty( "myDirectory" );
-
-        if ( !apiValue.equals( buildDirectory ) )
-        {
-            throw new MojoExecutionException( "buildDirectory parameter value:\n\n" + buildDirectory
-                                              + "\n\ndoes not match ${myDirectory} from project:\n\n"
-                                              + apiValue + "\n" );
-        }
-        else
-        {
-            getLog().info( "buildDirectory matches ${myDirectory} in the current POM instance." );
-        }
-    }
-
-    public Log getLog()
-    {
-        return log;
-    }
-
-    public void setLog( Log log )
-    {
-        this.log = log;
-    }
-
-}
diff --git a/core-it-suite/src/test/resources/mng-3530/pom-property/project/pom.xml b/core-it-suite/src/test/resources/mng-3530/pom-property/project/pom.xml
deleted file mode 100644
index 7bb29c4..0000000
--- a/core-it-suite/src/test/resources/mng-3530/pom-property/project/pom.xml
+++ /dev/null
@@ -1,49 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3530</groupId>
-  <artifactId>pom-property-project</artifactId>
-  <packaging>jar</packaging>
-  <version>1</version>
-  <name>project</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  
-  <properties>
-    <myDirectory>something</myDirectory>
-  </properties>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.mng3530</groupId>
-        <artifactId>pom-property-maven-plugin</artifactId>
-        <version>1</version>
-        <executions>
-          <execution>
-            <id>set</id>
-            <goals>
-              <goal>set</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>validate</id>
-            <goals>
-              <goal>validate</goal>
-            </goals>
-            <configuration>
-              <buildDirectory>${myDirectory}</buildDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3530/pom-property/project/src/main/java/tests/App.java b/core-it-suite/src/test/resources/mng-3530/pom-property/project/src/main/java/tests/App.java
deleted file mode 100644
index 53e46ad..0000000
--- a/core-it-suite/src/test/resources/mng-3530/pom-property/project/src/main/java/tests/App.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package tests;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-3530/pom-property/project/src/test/java/tests/AppTest.java b/core-it-suite/src/test/resources/mng-3530/pom-property/project/src/test/java/tests/AppTest.java
deleted file mode 100644
index c378ad2..0000000
--- a/core-it-suite/src/test/resources/mng-3530/pom-property/project/src/test/java/tests/AppTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-3530/resource-object/plugin/pom.xml b/core-it-suite/src/test/resources/mng-3530/resource-object/plugin/pom.xml
deleted file mode 100644
index 33dd704..0000000
--- a/core-it-suite/src/test/resources/mng-3530/resource-object/plugin/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3530</groupId>
-  <artifactId>resource-object-maven-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
-  <version>1</version>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>2.0.6</version>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3530/resource-object/plugin/src/main/java/mng3530/ValidatePropertyMojo.java b/core-it-suite/src/test/resources/mng-3530/resource-object/plugin/src/main/java/mng3530/ValidatePropertyMojo.java
deleted file mode 100644
index e9c727d..0000000
--- a/core-it-suite/src/test/resources/mng-3530/resource-object/plugin/src/main/java/mng3530/ValidatePropertyMojo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package mng3530;
-
-import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.Mojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.logging.Log;
-
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Validate that the current project's {@link Resource} instances don't contain
- * uninterpolated expressions.
- *
- * @goal validate
- * @phase package
- */
-public class ValidatePropertyMojo
-    implements Mojo
-{
-
-    /**
-     * @parameter default-value="${project.resources}"
-     * @readonly
-     */
-    private List resources;
-
-    private Log log;
-
-    public void execute()
-        throws MojoExecutionException, MojoFailureException
-    {
-        for ( Iterator it = resources.iterator(); it.hasNext(); )
-        {
-            Resource resource = (Resource) it.next();
-
-            if ( resource.getDirectory().indexOf( "${project.build.directory}" ) > -1 )
-            {
-                throw new MojoExecutionException( "Project resource-directory was not interpolated.\n\nFull directory is: " + resource.getDirectory() );
-            }
-        }
-
-        getLog().info( "Resource directory has been interpolated." );
-    }
-
-    public Log getLog()
-    {
-        return log;
-    }
-
-    public void setLog( Log log )
-    {
-        this.log = log;
-    }
-
-}
diff --git a/core-it-suite/src/test/resources/mng-3530/resource-object/project/pom.xml b/core-it-suite/src/test/resources/mng-3530/resource-object/project/pom.xml
deleted file mode 100644
index 29da137..0000000
--- a/core-it-suite/src/test/resources/mng-3530/resource-object/project/pom.xml
+++ /dev/null
@@ -1,45 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3530</groupId>
-  <artifactId>resource-object-project</artifactId>
-  <packaging>jar</packaging>
-  <version>1</version>
-  <name>project</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  
-  <properties>
-    <myDirectory>something</myDirectory>
-  </properties>
-  
-  <build>
-    <resources>
-      <resource>
-        <directory>${project.build.directory}/myResources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.mng3530</groupId>
-        <artifactId>resource-object-maven-plugin</artifactId>
-        <version>1</version>
-        <executions>
-          <execution>
-            <id>validate</id>
-            <goals>
-              <goal>validate</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3530/resource-object/project/src/main/java/tests/App.java b/core-it-suite/src/test/resources/mng-3530/resource-object/project/src/main/java/tests/App.java
deleted file mode 100644
index 53e46ad..0000000
--- a/core-it-suite/src/test/resources/mng-3530/resource-object/project/src/main/java/tests/App.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package tests;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-3530/resource-object/project/src/test/java/tests/AppTest.java b/core-it-suite/src/test/resources/mng-3530/resource-object/project/src/test/java/tests/AppTest.java
deleted file mode 100644
index c378ad2..0000000
--- a/core-it-suite/src/test/resources/mng-3530/resource-object/project/src/test/java/tests/AppTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-3599/pom.xml b/core-it-suite/src/test/resources/mng-3599/pom.xml
deleted file mode 100644
index 779cbc8..0000000
--- a/core-it-suite/src/test/resources/mng-3599/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3599</groupId>
-  <artifactId>test</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>test-dependency</artifactId>
-      <version>1.0</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-webdav-jackrabbit</artifactId>
-        <version>2.0</version>
-      </extension>
-    </extensions>
-  </build>
-</project>
-
diff --git a/core-it-suite/src/test/resources/mng-3599/settings-template.xml b/core-it-suite/src/test/resources/mng-3599/settings-template.xml
deleted file mode 100644
index 0652b2c..0000000
--- a/core-it-suite/src/test/resources/mng-3599/settings-template.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<settings>
-  <mirrors>
-    <mirror>
-      <id>test-mirror</id>
-      <url>@protocol@://www.example.com/</url>
-      <mirrorOf>*</mirrorOf>
-    </mirror>
-  </mirrors>
-  <proxies>
-    <proxy>
-      <id>http-proxy</id>
-      <protocol>http</protocol>
-      <host>localhost</host>
-      <port>@port@</port>
-    </proxy>
-  </proxies>
-</settings>
-
diff --git a/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-check-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-check-plugin/pom.xml
deleted file mode 100644
index 55a616b..0000000
--- a/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-check-plugin/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <parent>
-    <artifactId>plugins</artifactId>
-    <groupId>org.apache.maven.its.mng3743</groupId>
-    <version>1</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3743</groupId>
-  <artifactId>mavenit-mng3743-check-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
-  <name>maven-mng3743-check-plugin Maven Mojo</name>
-  <version>1</version>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-check-plugin/src/main/java/jar/CheckMojo.java b/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-check-plugin/src/main/java/jar/CheckMojo.java
deleted file mode 100644
index c73630f..0000000
--- a/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-check-plugin/src/main/java/jar/CheckMojo.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package jar;
-
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed 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;
-
-/**
- * @goal check
- */
-public class CheckMojo
-    extends AbstractMojo
-{
-    
-    /**
-     * @parameter default-value="false"
-     */
-    private boolean skipError;
-    
-    public void execute()
-        throws MojoExecutionException
-    {
-        if ( !skipError )
-        {
-            throw new MojoExecutionException( "Error should have been skipped using configuration from pluginManagement." );
-        }
-        else
-        {
-            getLog().info( "MNG-3743 check succeeded." );
-        }
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/pom.xml b/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/pom.xml
deleted file mode 100644
index 6de740d..0000000
--- a/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <parent>
-    <artifactId>plugins</artifactId>
-    <groupId>org.apache.maven.its.mng3743</groupId>
-    <version>1</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3743</groupId>
-  <artifactId>mavenit-mng3743-report-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
-  <name>maven-mng3743-report-plugin Maven Mojo</name>
-  <version>1</version>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-    	<groupId>org.apache.maven.reporting</groupId>
-    	<artifactId>maven-reporting-impl</artifactId>
-    	<version>2.0.4.1</version>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/src/main/java/jar/ForkingReport.java b/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/src/main/java/jar/ForkingReport.java
deleted file mode 100644
index b679586..0000000
--- a/core-it-suite/src/test/resources/mng-3743/plugins/maven-mng3743-report-plugin/src/main/java/jar/ForkingReport.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package jar;
-
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed 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.Locale;
-
-import org.apache.maven.doxia.siterenderer.DefaultSiteRenderer;
-import org.apache.maven.doxia.siterenderer.Renderer;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.reporting.AbstractMavenReport;
-import org.apache.maven.reporting.MavenReportException;
-
-/**
- * Goal which touches a timestamp file.
- *
- * @goal report
- * @execute phase="initialize"
- */
-public class ForkingReport
-    extends AbstractMavenReport
-{
-    
-    /**
-     * @parameter default-value="${project.build.directory}/report"
-     * @readonly
-     */
-    private File outputDirectory;
-    
-    /**
-     * @parameter default-value="${project}"
-     * @readonly
-     */
-    private MavenProject project;
-
-    protected void executeReport( Locale locale )
-        throws MavenReportException
-    {
-        getLog().info( "MNG-3743 report executed." );
-    }
-
-    protected String getOutputDirectory()
-    {
-        return outputDirectory.getAbsolutePath();
-    }
-
-    protected MavenProject getProject()
-    {
-        return project;
-    }
-
-    protected Renderer getSiteRenderer()
-    {
-        return new DefaultSiteRenderer();
-    }
-
-    public String getDescription( Locale locale )
-    {
-        return "mng3743";
-    }
-
-    public String getName( Locale locale )
-    {
-        return "mng3743";
-    }
-
-    public String getOutputName()
-    {
-        return "mng3743";
-    }
-}
diff --git a/core-it-suite/src/test/resources/mng-3743/plugins/mng3743-lifecycle/pom.xml b/core-it-suite/src/test/resources/mng-3743/plugins/mng3743-lifecycle/pom.xml
deleted file mode 100644
index 7bcf519..0000000
--- a/core-it-suite/src/test/resources/mng-3743/plugins/mng3743-lifecycle/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <parent>
-    <artifactId>plugins</artifactId>
-    <groupId>org.apache.maven.its.mng3743</groupId>
-    <version>1</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3743</groupId>
-  <artifactId>mng3743-lifecycle</artifactId>
-  <name>mng3743-lifecycle</name>
-  <version>1</version>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3743/plugins/mng3743-lifecycle/src/main/resources/META-INF/plexus/components.xml b/core-it-suite/src/test/resources/mng-3743/plugins/mng3743-lifecycle/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index b69aaa4..0000000
--- a/core-it-suite/src/test/resources/mng-3743/plugins/mng3743-lifecycle/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-      <role-hint>mng3743</role-hint>
-      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
-      <configuration>
-        <lifecycles>
-          <lifecycle>
-            <id>default</id>
-            <phases>
-              <initialize>org.apache.maven.its.mng3743:mavenit-mng3743-check-plugin:check</initialize>
-            </phases>
-          </lifecycle>
-        </lifecycles>
-      </configuration>
-    </component>
-  </components>
-</component-set>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3743/plugins/pom.xml b/core-it-suite/src/test/resources/mng-3743/plugins/pom.xml
deleted file mode 100644
index 1d6c07d..0000000
--- a/core-it-suite/src/test/resources/mng-3743/plugins/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3743</groupId>
-  <artifactId>plugins</artifactId>
-  <version>1</version>
-  <packaging>pom</packaging>
-  <modules>
-  	<module>maven-mng3743-check-plugin</module>
-  	<module>maven-mng3743-report-plugin</module>
-  	<module>mng3743-lifecycle</module>
-  </modules>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3743/pom.xml b/core-it-suite/src/test/resources/mng-3743/pom.xml
deleted file mode 100644
index 362296e..0000000
--- a/core-it-suite/src/test/resources/mng-3743/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3743</groupId>
-  <artifactId>mng-3743-forkWithPluginManagement</artifactId>
-  <packaging>pom</packaging>
-  <name/>
-  <version>1</version>
-  <description/>
-  <modules>
-    <module>plugins</module>
-  </modules>
-</project>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3743/project/pom.xml b/core-it-suite/src/test/resources/mng-3743/project/pom.xml
deleted file mode 100644
index c69f3e9..0000000
--- a/core-it-suite/src/test/resources/mng-3743/project/pom.xml
+++ /dev/null
@@ -1,51 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.mng3743</groupId>
-  <artifactId>mng-3743-forkWithPluginManagement</artifactId>
-  <version>1</version>
-  <packaging>mng3743</packaging>
-  
-  <name>Integration Test Project for MNG-3743</name>
-  <description>
-    This project verifies that MNG-3743 is fixed. It is controlled by a JUnit test called org.apache.maven.integrationtests.MNG3743Test
-  </description>
-  
-  <url>https://issues.apache.org/jira/browse/MNG-3743</url>
-  
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.its.mng3743</groupId>
-        <artifactId>mng3743-lifecycle</artifactId>
-        <version>1</version>
-      </extension>
-    </extensions>
-    
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.its.mng3743</groupId>
-          <artifactId>mavenit-mng3743-check-plugin</artifactId>
-          <configuration>
-            <skipError>true</skipError>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  
-  <reporting>
-    <excludeDefaults>true</excludeDefaults>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.mng3743</groupId>
-        <artifactId>mavenit-mng3743-report-plugin</artifactId>
-        <version>1</version>
-      </plugin>
-    </plugins>
-  </reporting>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3743/project/readme.txt b/core-it-suite/src/test/resources/mng-3743/project/readme.txt
deleted file mode 100644
index 48501d1..0000000
--- a/core-it-suite/src/test/resources/mng-3743/project/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-The problem here is that a plugin that's executed from a forked lifecycle doesn't get the pluginManagement information injected into its configuration. The reason is the lifecycle executor doesn't use the executionProject (the forked lifecycle's version of the project instance) when it verifies the plugin in the plugin manager. This means the pluginManagement information is never injected into the executionProject, but ONLY into the main project instance (for a given POM, I know it's con [...]
-
-This is a particular problem when reports like the javadoc:test-aggregate report runs. This report forks the lifecycle up to the generate-test-sources phase, which includes compile. When the project sources use 1.5 syntax, such as generics, the 1.5 source/target configuration for the compiler plugin isn't injected into the forked lifecycle, and the compile phase fails.
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3760/pom.xml b/core-it-suite/src/test/resources/mng-3760/pom.xml
deleted file mode 100644
index 6adb554..0000000
--- a/core-it-suite/src/test/resources/mng-3760/pom.xml
+++ /dev/null
@@ -1,62 +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.mng3760</groupId>
-  <artifactId>child</artifactId>
-  <version>0.1</version>
-
-  <name>Maven Integration Test :: MNG-3760</name> 
-  <description>
-    Test project.baseUri property.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-expression</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>eval</goal>
-            </goals>
-            <configuration>
-              <outputFile>target/profile.properties</outputFile>
-              <expressions>
-                <expression>project/properties</expression>
-              </expressions>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <properties>
-    <pomProperty>${project.baseUri}</pomProperty>
-    <baseUriProperty>${baseUri}</baseUriProperty>
-  </properties>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3885/pom-template.xml b/core-it-suite/src/test/resources/mng-3885/pom-template.xml
deleted file mode 100644
index 94fa261..0000000
--- a/core-it-suite/src/test/resources/mng-3885/pom-template.xml
+++ /dev/null
@@ -1,62 +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.mng3885</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.1-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <name>Maven Integration Test :: MNG-3885</name> 
-  <description>
-    Test that uniqueVersion defined by a parent profile is effective for child modules when building
-    from the parent.
-  </description>
-
-  <modules>
-    <module>sub</module>
-  </modules>
-
-  <profiles>
-    <profile>
-      <id>non-unique-version</id>
-      <distributionManagement>
-        <snapshotRepository>
-          <id>maven-core-it</id>
-          <url>@baseurl@/repo-f</url>
-          <uniqueVersion>false</uniqueVersion>
-        </snapshotRepository>
-      </distributionManagement>
-    </profile>
-    <profile>
-      <id>unique-version</id>
-      <distributionManagement>
-        <snapshotRepository>
-          <id>maven-core-it</id>
-          <url>@baseurl@/repo-t</url>
-          <uniqueVersion>true</uniqueVersion>
-        </snapshotRepository>
-      </distributionManagement>
-    </profile>
-  </profiles>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3885/sub/main.jar b/core-it-suite/src/test/resources/mng-3885/sub/main.jar
deleted file mode 100644
index bb3ddb5..0000000
Binary files a/core-it-suite/src/test/resources/mng-3885/sub/main.jar and /dev/null differ
diff --git a/core-it-suite/src/test/resources/mng-3885/sub/pom.xml b/core-it-suite/src/test/resources/mng-3885/sub/pom.xml
deleted file mode 100644
index fa5677a..0000000
--- a/core-it-suite/src/test/resources/mng-3885/sub/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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven.its.mng3885</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>sub</artifactId>
-  <version>0.2-SNAPSHOT</version>
-
-  <name>Maven Integration Test :: MNG-3885 :: Child</name> 
-  <description>
-    Test that uniqueVersion defined by a parent profile is effective for child modules when building
-    from the parent.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-artifact</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <configuration>
-          <mainFile>main.jar</mainFile>
-        </configuration>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>set</goal>
-              <goal>install</goal>
-              <goal>deploy</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3933/pom.xml b/core-it-suite/src/test/resources/mng-3933/pom.xml
deleted file mode 100644
index e6734d5..0000000
--- a/core-it-suite/src/test/resources/mng-3933/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.mng3933</groupId>
-  <artifactId>test1</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <name>Maven Integration Test :: MNG-3933</name>
-  <description>
-    Test that OS-triggered profiles from an external profiles.xml are activated.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-expression</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>eval</goal>
-            </goals>
-            <configuration>
-              <outputFile>target/profile.properties</outputFile>
-              <expressions>
-                <expression>project/properties</expression>
-              </expressions>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3933/profiles.xml b/core-it-suite/src/test/resources/mng-3933/profiles.xml
deleted file mode 100644
index e575080..0000000
--- a/core-it-suite/src/test/resources/mng-3933/profiles.xml
+++ /dev/null
@@ -1,173 +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.
--->
-
-<profilesXml>
-  <activeProfiles>
-    <activeProfile>profile-default</activeProfile>
-  </activeProfiles>
-  <profiles>
-    <!-- check activation by default -->
-    <profile>
-      <id>profile-default</id>
-      <properties>
-        <defaultProperty>DEFAULT-ACTIVATION</defaultProperty>
-      </properties>
-    </profile>
-
-    <!-- check activation by OS family -->
-    <profile>
-      <id>profile-os-a</id>
-      <activation>
-        <os>
-          <family>winDOWS</family>
-        </os>
-      </activation>
-      <properties>
-        <osFamilyProperty>OS-FAMILY-ACTIVATION</osFamilyProperty>
-      </properties>
-    </profile>
-    <profile>
-      <id>profile-os-b</id>
-      <activation>
-        <os>
-          <family>unIX</family>
-        </os>
-      </activation>
-      <properties>
-        <osFamilyProperty>OS-FAMILY-ACTIVATION</osFamilyProperty>
-      </properties>
-    </profile>
-    <profile>
-      <id>profile-os-c</id>
-      <activation>
-        <os>
-          <family>mAC</family>
-        </os>
-      </activation>
-      <properties>
-        <osFamilyProperty>OS-FAMILY-ACTIVATION</osFamilyProperty>
-      </properties>
-    </profile>
-
-    <!-- check activation by JDK version -->
-    <profile>
-      <id>profile-jdk</id>
-      <activation>
-        <jdk>!1.0</jdk>
-      </activation>
-      <properties>
-        <jdkProperty>JDK-ACTIVATION</jdkProperty>
-      </properties>
-    </profile>
-
-    <!-- check non-activation by JDK version -->
-    <profile>
-      <id>profile-jdk-inactive</id>
-      <activation>
-        <jdk>1.0.0.0</jdk>
-      </activation>
-      <properties>
-        <jdkPropertyMissing>JDK-ACTIVATION</jdkPropertyMissing>
-      </properties>
-    </profile>
-
-    <!-- check activation by ordinary system property -->
-    <profile>
-      <id>profile-sys-prop</id>
-      <activation>
-        <property>
-          <name>maven.profile.activator</name>
-          <value>test</value>
-        </property>
-      </activation>
-      <properties>
-        <sysProperty>SYS-PROP-ACTIVATION</sysProperty>
-      </properties>
-    </profile>
-
-    <!-- check non-activation by absent system property -->
-    <profile>
-      <id>profile-sys-prop-inactive</id>
-      <activation>
-        <property>
-          <name>maven.profile.inactive</name>
-        </property>
-      </activation>
-      <properties>
-        <sysPropertyMissing>SYS-PROP-ACTIVATION</sysPropertyMissing>
-      </properties>
-    </profile>
-
-    <!-- check activation by environment variable -->
-    <profile>
-      <id>profile-env-prop</id>
-      <activation>
-        <property>
-          <name>env.MAVEN_PROFILE</name>
-          <value>test</value>
-        </property>
-      </activation>
-      <properties>
-        <envProperty>ENV-PROP-ACTIVATION</envProperty>
-      </properties>
-    </profile>
-
-    <!-- check non-activation by environment variable -->
-    <profile>
-      <id>profile-env-prop-inactive</id>
-      <activation>
-        <property>
-          <name>env.MAVEN_CORE_IT</name>
-          <value>missing</value>
-        </property>
-      </activation>
-      <properties>
-        <envPropertyMissing>ENV-PROP-ACTIVATION</envPropertyMissing>
-      </properties>
-    </profile>
-
-    <!-- check activation by missing file -->
-    <profile>
-      <id>profile-file-missing</id>
-      <activation>
-        <file>
-          <missing>a-funky-file-name-that-most-likely-does-not-exist-on-an-ordinary-box</missing>
-        </file>
-      </activation>
-      <properties>
-        <fileProperty>MISSING-FILE-ACTIVATION</fileProperty>
-      </properties>
-    </profile>
-
-    <!-- check non-activation by missing file -->
-    <profile>
-      <id>profile-file-missing-inactive</id>
-      <activation>
-        <file>
-          <exists>a-funky-file-name-that-most-likely-does-not-exist-on-an-ordinary-box</exists>
-        </file>
-      </activation>
-      <properties>
-        <filePropertyMissing>MISSING-FILE-ACTIVATION</filePropertyMissing>
-      </properties>
-    </profile>
-  </profiles>
-</profilesXml>
diff --git a/core-it-suite/src/test/resources/mng-3948/test-1/pom.xml b/core-it-suite/src/test/resources/mng-3948/test-1/pom.xml
deleted file mode 100644
index 21dd270..0000000
--- a/core-it-suite/src/test/resources/mng-3948/test-1/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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.maven.its.mng3948</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.1</version>
-  </parent>
-
-  <artifactId>test</artifactId>
-
-  <name>Maven Integration Test :: MNG-3948</name> 
-  <description>
-    Test that parent POMs can be resolved from remote repositories defined by (active) profiles in profiles.xml.
-  </description>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3948/test-1/profiles.xml b/core-it-suite/src/test/resources/mng-3948/test-1/profiles.xml
deleted file mode 100644
index cd133cb..0000000
--- a/core-it-suite/src/test/resources/mng-3948/test-1/profiles.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.
--->
-
-<profilesXml>
-  <activeProfiles>
-    <activeProfile>mng-3948</activeProfile>
-  </activeProfiles>
-  <profiles>
-    <profile>
-      <id>mng-3948</id>
-      <repositories>
-        <repository>
-          <id>maven-core-it</id>
-          <url>@baseurl@/repo</url>
-          <releases>
-            <checksumPolicy>ignore</checksumPolicy>
-          </releases>
-          <snapshots>
-            <checksumPolicy>ignore</checksumPolicy>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-  </profiles>
-</profilesXml>
diff --git a/core-it-suite/src/test/resources/mng-3948/test-1/repo/org/apache/maven/its/mng3948/parent/0.1/parent-0.1.pom b/core-it-suite/src/test/resources/mng-3948/test-1/repo/org/apache/maven/its/mng3948/parent/0.1/parent-0.1.pom
deleted file mode 100644
index 26fa786..0000000
--- a/core-it-suite/src/test/resources/mng-3948/test-1/repo/org/apache/maven/its/mng3948/parent/0.1/parent-0.1.pom
+++ /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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3948</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.1</version>
-  <packaging>pom</packaging>
-
-  <distributionManagement>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-    </repository>
-  </distributionManagement>
-
-  <properties>
-    <parentProperty>PASSED</parentProperty>
-  </properties>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3948/test-1/repo/org/apache/maven/its/mng3948/parent/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3948/test-1/repo/org/apache/maven/its/mng3948/parent/maven-metadata.xml
deleted file mode 100644
index 42b9240..0000000
--- a/core-it-suite/src/test/resources/mng-3948/test-1/repo/org/apache/maven/its/mng3948/parent/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-  <groupId>org.apache.maven.its.mng3948</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.1</version>
-  <versioning>
-    <release>0.1</release>
-    <versions>
-      <version>0.1</version>
-    </versions>
-    <lastUpdated>20081231182545</lastUpdated>
-  </versioning>
-</metadata>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3948/test-2/pom.xml b/core-it-suite/src/test/resources/mng-3948/test-2/pom.xml
deleted file mode 100644
index 6c2471d..0000000
--- a/core-it-suite/src/test/resources/mng-3948/test-2/pom.xml
+++ /dev/null
@@ -1,58 +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.mng3948</groupId>
-    <artifactId>parent</artifactId>
-    <version>0.2</version>
-  </parent>
-
-  <artifactId>test</artifactId>
-
-  <name>Maven Integration Test :: MNG-3948</name> 
-  <description>
-    Test that parent POMs can be resolved from remote repositories defined by (active) profiles in the POM.
-  </description>
-
-  <profiles>
-    <profile>
-      <id>mng-3948</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <repositories>
-        <repository>
-          <id>maven-core-it</id>
-          <url>@baseurl@/repo</url>
-          <releases>
-            <checksumPolicy>ignore</checksumPolicy>
-          </releases>
-          <snapshots>
-            <checksumPolicy>ignore</checksumPolicy>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-  </profiles>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3948/test-2/repo/org/apache/maven/its/mng3948/parent/0.2/parent-0.2.pom b/core-it-suite/src/test/resources/mng-3948/test-2/repo/org/apache/maven/its/mng3948/parent/0.2/parent-0.2.pom
deleted file mode 100644
index e70a632..0000000
--- a/core-it-suite/src/test/resources/mng-3948/test-2/repo/org/apache/maven/its/mng3948/parent/0.2/parent-0.2.pom
+++ /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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3948</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.2</version>
-  <packaging>pom</packaging>
-
-  <distributionManagement>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-    </repository>
-  </distributionManagement>
-
-  <properties>
-    <parentProperty>PASSED</parentProperty>
-  </properties>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3948/test-2/repo/org/apache/maven/its/mng3948/parent/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3948/test-2/repo/org/apache/maven/its/mng3948/parent/maven-metadata.xml
deleted file mode 100644
index d84db72..0000000
--- a/core-it-suite/src/test/resources/mng-3948/test-2/repo/org/apache/maven/its/mng3948/parent/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-  <groupId>org.apache.maven.its.mng3948</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.2</version>
-  <versioning>
-    <release>0.2</release>
-    <versions>
-      <version>0.2</version>
-    </versions>
-    <lastUpdated>20081231182545</lastUpdated>
-  </versioning>
-</metadata>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3970/test-1/pom.xml b/core-it-suite/src/test/resources/mng-3970/test-1/pom.xml
deleted file mode 100644
index feeb80f..0000000
--- a/core-it-suite/src/test/resources/mng-3970/test-1/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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3970</groupId>
-  <artifactId>test</artifactId>
-  <version>0.1</version>
-
-  <name>Maven Integration Test :: MNG-3970</name> 
-  <description>
-    Test that dependencies can be resolved from remote repositories defined by (active) profiles in profiles.xml.
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its.mng3970</groupId>
-      <artifactId>a</artifactId>
-      <version>0.1</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-dependency-resolution</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <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-3970/test-1/profiles.xml b/core-it-suite/src/test/resources/mng-3970/test-1/profiles.xml
deleted file mode 100644
index 70ffcaf..0000000
--- a/core-it-suite/src/test/resources/mng-3970/test-1/profiles.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.
--->
-
-<profilesXml>
-  <activeProfiles>
-    <activeProfile>mng-3970</activeProfile>
-  </activeProfiles>
-  <profiles>
-    <profile>
-      <id>mng-3970</id>
-      <repositories>
-        <repository>
-          <id>maven-core-it</id>
-          <url>@baseurl@/repo</url>
-          <releases>
-            <checksumPolicy>ignore</checksumPolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-  </profiles>
-</profilesXml>
diff --git a/core-it-suite/src/test/resources/mng-3970/test-1/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.jar b/core-it-suite/src/test/resources/mng-3970/test-1/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.jar
deleted file mode 100644
index 33468cb..0000000
Binary files a/core-it-suite/src/test/resources/mng-3970/test-1/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.jar and /dev/null differ
diff --git a/core-it-suite/src/test/resources/mng-3970/test-1/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.pom b/core-it-suite/src/test/resources/mng-3970/test-1/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.pom
deleted file mode 100644
index e82a011..0000000
--- a/core-it-suite/src/test/resources/mng-3970/test-1/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.pom
+++ /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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3970</groupId>
-  <artifactId>a</artifactId>
-  <version>0.1</version>
-  <packaging>jar</packaging>
-
-  <distributionManagement>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-    </repository>
-  </distributionManagement>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3970/test-1/repo/org/apache/maven/its/mng3970/a/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3970/test-1/repo/org/apache/maven/its/mng3970/a/maven-metadata.xml
deleted file mode 100644
index f7b82c6..0000000
--- a/core-it-suite/src/test/resources/mng-3970/test-1/repo/org/apache/maven/its/mng3970/a/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-  <groupId>org.apache.maven.its.mng3970</groupId>
-  <artifactId>a</artifactId>
-  <version>0.1</version>
-  <versioning>
-    <release>0.1</release>
-    <versions>
-      <version>0.1</version>
-    </versions>
-    <lastUpdated>20090106134643</lastUpdated>
-  </versioning>
-</metadata>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3970/test-2/pom.xml b/core-it-suite/src/test/resources/mng-3970/test-2/pom.xml
deleted file mode 100644
index abc8d58..0000000
--- a/core-it-suite/src/test/resources/mng-3970/test-2/pom.xml
+++ /dev/null
@@ -1,81 +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.mng3970</groupId>
-  <artifactId>test</artifactId>
-  <version>0.2</version>
-
-  <name>Maven Integration Test :: MNG-3970</name> 
-  <description>
-    Test that dependencies can be resolved from remote repositories defined by (active) profiles in the POM.
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its.mng3970</groupId>
-      <artifactId>a</artifactId>
-      <version>0.1</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-dependency-resolution</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>mng-3970</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <repositories>
-        <repository>
-          <id>maven-core-it</id>
-          <url>@baseurl@/repo</url>
-          <releases>
-            <checksumPolicy>ignore</checksumPolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-  </profiles>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3970/test-2/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.jar b/core-it-suite/src/test/resources/mng-3970/test-2/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.jar
deleted file mode 100644
index 33468cb..0000000
Binary files a/core-it-suite/src/test/resources/mng-3970/test-2/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.jar and /dev/null differ
diff --git a/core-it-suite/src/test/resources/mng-3970/test-2/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.pom b/core-it-suite/src/test/resources/mng-3970/test-2/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.pom
deleted file mode 100644
index e82a011..0000000
--- a/core-it-suite/src/test/resources/mng-3970/test-2/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.pom
+++ /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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3970</groupId>
-  <artifactId>a</artifactId>
-  <version>0.1</version>
-  <packaging>jar</packaging>
-
-  <distributionManagement>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-    </repository>
-  </distributionManagement>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3970/test-2/repo/org/apache/maven/its/mng3970/a/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3970/test-2/repo/org/apache/maven/its/mng3970/a/maven-metadata.xml
deleted file mode 100644
index f7b82c6..0000000
--- a/core-it-suite/src/test/resources/mng-3970/test-2/repo/org/apache/maven/its/mng3970/a/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-  <groupId>org.apache.maven.its.mng3970</groupId>
-  <artifactId>a</artifactId>
-  <version>0.1</version>
-  <versioning>
-    <release>0.1</release>
-    <versions>
-      <version>0.1</version>
-    </versions>
-    <lastUpdated>20090106134643</lastUpdated>
-  </versioning>
-</metadata>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3970/test-3/pom.xml b/core-it-suite/src/test/resources/mng-3970/test-3/pom.xml
deleted file mode 100644
index d9da0fc..0000000
--- a/core-it-suite/src/test/resources/mng-3970/test-3/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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3970</groupId>
-  <artifactId>test</artifactId>
-  <version>0.3</version>
-
-  <name>Maven Integration Test :: MNG-3970</name> 
-  <description>
-    Test that dependencies can be resolved from remote repositories defined by (active) profiles in settings.xml.
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.its.mng3970</groupId>
-      <artifactId>a</artifactId>
-      <version>0.1</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.plugins</groupId>
-        <artifactId>maven-it-plugin-dependency-resolution</artifactId>
-        <version>2.1-SNAPSHOT</version>
-        <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-3970/test-3/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.jar b/core-it-suite/src/test/resources/mng-3970/test-3/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.jar
deleted file mode 100644
index 33468cb..0000000
Binary files a/core-it-suite/src/test/resources/mng-3970/test-3/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.jar and /dev/null differ
diff --git a/core-it-suite/src/test/resources/mng-3970/test-3/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.pom b/core-it-suite/src/test/resources/mng-3970/test-3/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.pom
deleted file mode 100644
index e82a011..0000000
--- a/core-it-suite/src/test/resources/mng-3970/test-3/repo/org/apache/maven/its/mng3970/a/0.1/a-0.1.pom
+++ /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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3970</groupId>
-  <artifactId>a</artifactId>
-  <version>0.1</version>
-  <packaging>jar</packaging>
-
-  <distributionManagement>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-    </repository>
-  </distributionManagement>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3970/test-3/repo/org/apache/maven/its/mng3970/a/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3970/test-3/repo/org/apache/maven/its/mng3970/a/maven-metadata.xml
deleted file mode 100644
index f7b82c6..0000000
--- a/core-it-suite/src/test/resources/mng-3970/test-3/repo/org/apache/maven/its/mng3970/a/maven-metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-  <groupId>org.apache.maven.its.mng3970</groupId>
-  <artifactId>a</artifactId>
-  <version>0.1</version>
-  <versioning>
-    <release>0.1</release>
-    <versions>
-      <version>0.1</version>
-    </versions>
-    <lastUpdated>20090106134643</lastUpdated>
-  </versioning>
-</metadata>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3970/test-3/settings.xml b/core-it-suite/src/test/resources/mng-3970/test-3/settings.xml
deleted file mode 100644
index 28be5a9..0000000
--- a/core-it-suite/src/test/resources/mng-3970/test-3/settings.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.
--->
-
-<settings>
-  <activeProfiles>
-    <activeProfile>mng-3970</activeProfile>
-  </activeProfiles>
-  <profiles>
-    <profile>
-      <id>mng-3970</id>
-      <repositories>
-        <repository>
-          <id>maven-core-it</id>
-          <url>@baseurl@/repo</url>
-          <releases>
-            <checksumPolicy>ignore</checksumPolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-  </profiles>
-</settings>
diff --git a/core-it-suite/src/test/resources/mng-3983/test-1/pom.xml b/core-it-suite/src/test/resources/mng-3983/test-1/pom.xml
deleted file mode 100644
index 09c1020..0000000
--- a/core-it-suite/src/test/resources/mng-3983/test-1/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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3983</groupId>
-  <artifactId>test</artifactId>
-  <version>0.1</version>
-
-  <name>Maven Integration Test :: MNG-3983</name> 
-  <description>
-    Test that plugins can be resolved from remote plugin repositories defined by (active) profiles in the POM.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.mng3983</groupId>
-        <artifactId>p</artifactId>
-        <version>0.1</version>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>touch</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>mng-3983</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>maven-core-it</id>
-          <url>@baseurl@/repo</url>
-          <releases>
-            <checksumPolicy>ignore</checksumPolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3983/test-1/repo/org/apache/maven/its/mng3983/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3983/test-1/repo/org/apache/maven/its/mng3983/maven-metadata.xml
deleted file mode 100644
index 613d2e7..0000000
--- a/core-it-suite/src/test/resources/mng-3983/test-1/repo/org/apache/maven/its/mng3983/maven-metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-  <plugins>
-    <plugin>
-      <name>Unnamed - org.apache.maven.its.mng3983:p:maven-plugin:0.1</name>
-      <prefix>p</prefix>
-      <artifactId>p</artifactId>
-    </plugin>
-  </plugins>
-</metadata>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3983/test-1/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.jar b/core-it-suite/src/test/resources/mng-3983/test-1/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.jar
deleted file mode 100644
index 5ce86f5..0000000
Binary files a/core-it-suite/src/test/resources/mng-3983/test-1/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.jar and /dev/null differ
diff --git a/core-it-suite/src/test/resources/mng-3983/test-1/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.pom b/core-it-suite/src/test/resources/mng-3983/test-1/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.pom
deleted file mode 100644
index 7b25b5f..0000000
--- a/core-it-suite/src/test/resources/mng-3983/test-1/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.pom
+++ /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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3983</groupId>
-  <artifactId>p</artifactId>
-  <version>0.1</version>
-  <packaging>maven-plugin</packaging>
-
-  <distributionManagement>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-      <uniqueVersion>false</uniqueVersion>
-    </repository>
-  </distributionManagement>
-
-  <properties>
-    <maven.test.skip>true</maven.test.skip>
-    <updateReleaseInfo>true</updateReleaseInfo>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>.</directory>
-        <includes>
-          <include>pom.xml</include>
-          <include>src/**</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3983/test-1/repo/org/apache/maven/its/mng3983/p/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3983/test-1/repo/org/apache/maven/its/mng3983/p/maven-metadata.xml
deleted file mode 100644
index 80f6e07..0000000
--- a/core-it-suite/src/test/resources/mng-3983/test-1/repo/org/apache/maven/its/mng3983/p/maven-metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-  <groupId>org.apache.maven.its.mng3983</groupId>
-  <artifactId>p</artifactId>
-  <version>0.1</version>
-  <versioning>
-    <latest>0.1</latest>
-    <release>0.1</release>
-    <versions>
-      <version>0.1</version>
-    </versions>
-    <lastUpdated>20090113112629</lastUpdated>
-  </versioning>
-</metadata>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3983/test-2/pom.xml b/core-it-suite/src/test/resources/mng-3983/test-2/pom.xml
deleted file mode 100644
index c770269..0000000
--- a/core-it-suite/src/test/resources/mng-3983/test-2/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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3983</groupId>
-  <artifactId>test</artifactId>
-  <version>0.2</version>
-
-  <name>Maven Integration Test :: MNG-3983</name> 
-  <description>
-    Test that plugins can be resolved from remote plugin repositories defined by (active) profiles in profiles.xml.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.mng3983</groupId>
-        <artifactId>p</artifactId>
-        <version>0.1</version>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>touch</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3983/test-2/profiles.xml b/core-it-suite/src/test/resources/mng-3983/test-2/profiles.xml
deleted file mode 100644
index 2730ec0..0000000
--- a/core-it-suite/src/test/resources/mng-3983/test-2/profiles.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.
--->
-
-<profilesXml>
-  <activeProfiles>
-    <activeProfile>mng-3983</activeProfile>
-  </activeProfiles>
-  <profiles>
-    <profile>
-      <id>mng-3983</id>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>maven-core-it</id>
-          <url>@baseurl@/repo</url>
-          <releases>
-            <checksumPolicy>ignore</checksumPolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
-</profilesXml>
diff --git a/core-it-suite/src/test/resources/mng-3983/test-2/repo/org/apache/maven/its/mng3983/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3983/test-2/repo/org/apache/maven/its/mng3983/maven-metadata.xml
deleted file mode 100644
index 613d2e7..0000000
--- a/core-it-suite/src/test/resources/mng-3983/test-2/repo/org/apache/maven/its/mng3983/maven-metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-  <plugins>
-    <plugin>
-      <name>Unnamed - org.apache.maven.its.mng3983:p:maven-plugin:0.1</name>
-      <prefix>p</prefix>
-      <artifactId>p</artifactId>
-    </plugin>
-  </plugins>
-</metadata>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3983/test-2/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.jar b/core-it-suite/src/test/resources/mng-3983/test-2/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.jar
deleted file mode 100644
index 5ce86f5..0000000
Binary files a/core-it-suite/src/test/resources/mng-3983/test-2/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.jar and /dev/null differ
diff --git a/core-it-suite/src/test/resources/mng-3983/test-2/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.pom b/core-it-suite/src/test/resources/mng-3983/test-2/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.pom
deleted file mode 100644
index 7b25b5f..0000000
--- a/core-it-suite/src/test/resources/mng-3983/test-2/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.pom
+++ /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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3983</groupId>
-  <artifactId>p</artifactId>
-  <version>0.1</version>
-  <packaging>maven-plugin</packaging>
-
-  <distributionManagement>
-    <repository>
-      <id>maven-core-it</id>
-      <url>file:///${basedir}/repo</url>
-      <uniqueVersion>false</uniqueVersion>
-    </repository>
-  </distributionManagement>
-
-  <properties>
-    <maven.test.skip>true</maven.test.skip>
-    <updateReleaseInfo>true</updateReleaseInfo>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>.</directory>
-        <includes>
-          <include>pom.xml</include>
-          <include>src/**</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3983/test-2/repo/org/apache/maven/its/mng3983/p/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3983/test-2/repo/org/apache/maven/its/mng3983/p/maven-metadata.xml
deleted file mode 100644
index 80f6e07..0000000
--- a/core-it-suite/src/test/resources/mng-3983/test-2/repo/org/apache/maven/its/mng3983/p/maven-metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-  <groupId>org.apache.maven.its.mng3983</groupId>
-  <artifactId>p</artifactId>
-  <version>0.1</version>
-  <versioning>
-    <latest>0.1</latest>
-    <release>0.1</release>
-    <versions>
-      <version>0.1</version>
-    </versions>
-    <lastUpdated>20090113112629</lastUpdated>
-  </versioning>
-</metadata>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3983/test-3/pom.xml b/core-it-suite/src/test/resources/mng-3983/test-3/pom.xml
deleted file mode 100644
index e811b1e..0000000
--- a/core-it-suite/src/test/resources/mng-3983/test-3/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>
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.maven.its.mng3983</groupId>
-  <artifactId>test</artifactId>
-  <version>0.3</version>
-
-  <name>Maven Integration Test :: MNG-3983</name> 
-  <description>
-    Test that plugins can be resolved from remote plugin repositories defined by (active) profiles in settings.xml.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.its.mng3983</groupId>
-        <artifactId>p</artifactId>
-        <version>0.1</version>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>touch</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/core-it-suite/src/test/resources/mng-3983/test-3/repo/org/apache/maven/its/mng3983/maven-metadata.xml b/core-it-suite/src/test/resources/mng-3983/test-3/repo/org/apache/maven/its/mng3983/maven-metadata.xml
deleted file mode 100644
index 613d2e7..0000000
--- a/core-it-suite/src/test/resources/mng-3983/test-3/repo/org/apache/maven/its/mng3983/maven-metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-  <plugins>
-    <plugin>
-      <name>Unnamed - org.apache.maven.its.mng3983:p:maven-plugin:0.1</name>
-      <prefix>p</prefix>
-      <artifactId>p</artifactId>
-    </plugin>
-  </plugins>
-</metadata>
\ No newline at end of file
diff --git a/core-it-suite/src/test/resources/mng-3983/test-3/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.jar b/core-it-suite/src/test/resources/mng-3983/test-3/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.jar
deleted file mode 100644
index 5ce86f5..0000000
Binary files a/core-it-suite/src/test/resources/mng-3983/test-3/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.jar and /dev/null differ
diff --git a/core-it-suite/src/test/resources/mng-3983/test-3/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.pom b/core-it-suite/src/test/resources/mng-3983/test-3/repo/org/apache/maven/its/mng3983/p/0.1/p-0.1.pom
deleted file mode 100644
index 7b25b5f..0000000
... 1923 lines suppressed ...