diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 6d4014c6ea..8ef8f317aa 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -72,8 +72,8 @@ public class IntegrationTestSuite /* Tests to be added MavenIT0109ReleaseUpdateTest -MavenIT0125NewestConflictResolverTest -MavenIT0128DistMgmtSiteUrlParentCalculationTest +MavenITmng0612NewestConflictResolverTest +MavenITmng3134DistMgmtSiteUrlParentCalculationTest MavenITmng2883LegacyRepoOfflineTest MavenITmng3259DepsDroppedInMultiModuleBuild MavenITmng3415JunkRepositoryMetadataTest @@ -131,6 +131,7 @@ MavenITmng3645POMSyntaxErrorTest suite.addTestSuite( MavenITmng3052DepRepoAggregationTest.class ); suite.addTestSuite( MavenITmng3012Test.class ); suite.addTestSuite( MavenITmng2972OverridePluginDependency.class ); + suite.addTestSuite( MavenITmng2926PluginPrefixOrder.class ); suite.addTestSuite( MavenITmng2921Test.class ); suite.addTestSuite( MavenITmng2892Test.class ); suite.addTestSuite( MavenITmng2878Test.class ); @@ -155,6 +156,7 @@ MavenITmng3645POMSyntaxErrorTest suite.addTestSuite( MavenITmng1493NonStandardModulePomNames.class ); suite.addTestSuite( MavenITmng1491ReactorArtifactIdCollision.class ); suite.addTestSuite( MavenITmng1412DependenciesOrderTest.class ); + suite.addTestSuite( MavenITmng1323AntrunDependencies.class ); suite.addTestSuite( MavenITmng0469Test.class ); suite.addTestSuite( MavenIT0141Test.class ); suite.addTestSuite( MavenIT0140Test.class ); @@ -169,8 +171,6 @@ MavenITmng3645POMSyntaxErrorTest suite.addTestSuite( MavenIT0131SiteLifecycleTest.class ); suite.addTestSuite( MavenIT0130CleanLifecycleTest.class ); suite.addTestSuite( MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.class ); - suite.addTestSuite( MavenIT0127AntrunDependencies.class ); - suite.addTestSuite( MavenIT0119PluginPrefixOrder.class ); suite.addTestSuite( MavenIT0118AttachedArtifactsInReactor.class ); suite.addTestSuite( MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.class ); suite.addTestSuite( MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin.class ); @@ -282,10 +282,10 @@ MavenITmng3645POMSyntaxErrorTest // suite.addTestSuite( MavenITmng3530DynamicPOMInterpolationTest.class ); // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 - // suite.addTestSuite( MavenIT0121TransitiveDepManVersion.class ); -- MNG-3038 - // suite.addTestSuite( MavenIT0122ReactorDependencyResolutionTest.class ); -- MNG-3023 - // suite.addTestSuite( MavenIT0123SnapshotRangeRepositoryTest.class ); -- MNG-2994 - // suite.addTestSuite( MavenIT0124PomExtensionComponentOverrideTest.class ); -- MNG-2771 + // suite.addTestSuite( MavenITmng3038TransitiveDepManVersion.class ); -- MNG-3038 + // suite.addTestSuite( MavenITmng3023ReactorDependencyResolutionTest.class ); -- MNG-3023 + // suite.addTestSuite( MavenITmng2994SnapshotRangeRepositoryTest.class ); -- MNG-2994 + // suite.addTestSuite( MavenITmng2771PomExtensionComponentOverrideTest.class ); -- MNG-2771 return suite; } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0125NewestConflictResolverTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java similarity index 83% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0125NewestConflictResolverTest.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java index 6930942ca4..1173bf91a4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0125NewestConflictResolverTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java @@ -24,30 +24,34 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -public class MavenIT0125NewestConflictResolverTest +/** + * This is a test set for MNG-612. + * + * @author Mark Hobson + * @version $Id$ + */ +public class MavenITmng0612NewestConflictResolverTest extends AbstractMavenIntegrationTestCase { /** * Test that ensures the newest-wins conflict resolver is used. - * - * @throws Exception - * @see MNG-612 */ - public void testit0125() throws Exception + public void testitMNG612() + throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0125-newestConflictResolver/dependency" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/dependency" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0125-newestConflictResolver/plugin" ); + testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/plugin" ); verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0125-newestConflictResolver/project" ); + testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0612/project" ); verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0127AntrunDependencies.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependencies.java similarity index 95% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0127AntrunDependencies.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependencies.java index 36c4c5c198..0b2822f7ab 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0127AntrunDependencies.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependencies.java @@ -31,11 +31,11 @@ import org.apache.maven.it.util.ResourceExtractor; * @author Benjamin Bentmann * @version $Id$ */ -public class MavenIT0127AntrunDependencies +public class MavenITmng1323AntrunDependencies extends AbstractMavenIntegrationTestCase { - public MavenIT0127AntrunDependencies() + public MavenITmng1323AntrunDependencies() { super( "(2.999,)" ); } @@ -47,7 +47,7 @@ public class MavenIT0127AntrunDependencies public void testitMNG1323() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0127-antrunDependencies" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1323" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0124PomExtensionComponentOverrideTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java similarity index 82% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0124PomExtensionComponentOverrideTest.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java index 34bbe0bad3..ad5441ed24 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0124PomExtensionComponentOverrideTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java @@ -24,30 +24,34 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -public class MavenIT0124PomExtensionComponentOverrideTest +/** + * This is a test set for MNG-2771 + * + * @author Mark Hobson + * @version $Id$ + */ +public class MavenITmng2771PomExtensionComponentOverrideTest extends AbstractMavenIntegrationTestCase { /** * Test that ensures the POM extensions can override default component implementations. - * - * @throws Exception - * @see MNG-2771 */ - public void testit0124() throws Exception + public void testitMNG2771() + throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0124-pomExtensionComponentOverride/extension" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2771/extension" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0124-pomExtensionComponentOverride/plugin" ); + testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2771/plugin" ); verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0124-pomExtensionComponentOverride/project" ); + testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2771/project" ); verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "verify" ); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0119PluginPrefixOrder.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrder.java similarity index 89% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0119PluginPrefixOrder.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrder.java index b3b6e5cf94..adc29ed684 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0119PluginPrefixOrder.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrder.java @@ -25,13 +25,19 @@ import java.util.ArrayList; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; -public class MavenIT0119PluginPrefixOrder +/** + * This is a test set for MNG-2926 + * + * @author Brian Fox + * @version $Id$ + */ +public class MavenITmng2926PluginPrefixOrder extends AbstractMavenIntegrationTestCase { - public void testit0119() + public void testitMNG2926() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0119-pluginprefixorder" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2926" ); Verifier verifier; //use my custom settings upon invocation. @@ -48,7 +54,7 @@ public class MavenIT0119PluginPrefixOrder // default order will be changed. Artificially make currently set groups disappear // now run the test. Since we have apache and codehaus, i should get the apache one first - testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0119-pluginprefixorder/test-project" ); + testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2926/test-project" ); cli.add("-s '" +testDir.getAbsolutePath()+"/settings-apache.xml'"); verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setCliOptions( cli ); @@ -57,7 +63,7 @@ public class MavenIT0119PluginPrefixOrder cli.clear(); // now run the test. Since we have apache and codehaus and a prefix in my settings, i should get the custom one first - testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0119-pluginprefixorder/test-project" ); + testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2926/test-project" ); verifier = new Verifier( testDir.getAbsolutePath() ); cli.add("-s '" +testDir.getAbsolutePath()+"/settings.xml'"); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0123SnapshotRangeRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java similarity index 82% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0123SnapshotRangeRepositoryTest.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java index b982da9945..00eb5b76c9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0123SnapshotRangeRepositoryTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java @@ -24,18 +24,22 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -public class MavenIT0123SnapshotRangeRepositoryTest +/** + * This is a test set for MNG-2994 + * + * @author Mark Hobson + * @version $Id$ + */ +public class MavenITmng2994SnapshotRangeRepositoryTest extends AbstractMavenIntegrationTestCase { /** * Test that snapshot repositories are checked for ranges with snapshot boundaries. - * - * @throws Exception - * @see MNG-2994 */ - public void testit0123() throws Exception + public void testitMNG2994() + throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0123-snapshotRangeRepository" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2994" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "compile" ); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0122ReactorDependencyResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java similarity index 83% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0122ReactorDependencyResolutionTest.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java index e08f0518d5..8fcd044e01 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0122ReactorDependencyResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java @@ -24,23 +24,28 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -public class MavenIT0122ReactorDependencyResolutionTest +/** + * This is a test set for MNG-3023 + * + * @author Mark Hobson + * @version $Id$ + */ +public class MavenITmng3023ReactorDependencyResolutionTest extends AbstractMavenIntegrationTestCase { /** * Test that reactor projects are included in dependency resolution. - * - * @throws Exception */ - public void testit0122() throws Exception + public void testitMNG3023() + throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0122-reactorDependencyResolution/plugin" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3023/plugin" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0122-reactorDependencyResolution/project" ); + testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3023/project" ); verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "org.apache.maven.its.it0122:maven-it-it0122-plugin:1.0:test" ); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0121TransitiveDepManVersion.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersion.java similarity index 91% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0121TransitiveDepManVersion.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersion.java index d8a25cf777..2932d51aba 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0121TransitiveDepManVersion.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersion.java @@ -26,13 +26,19 @@ import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; -public class MavenIT0121TransitiveDepManVersion +/** + * This is a test set for MNG-3038 + * + * @author Joakim Erdfelt + * @version $Id$ + */ +public class MavenITmng3038TransitiveDepManVersion extends AbstractMavenIntegrationTestCase { - public void testit0121() + public void testitMNG3038() throws Exception { - File testDirBase = ResourceExtractor.simpleExtractResources( getClass(), "/it0121-transitiveDepManVersion" ); + File testDirBase = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3038" ); compileDDep( testDirBase, "D1", "1.0" ); compileDDep( testDirBase, "D2", "2.0" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java similarity index 82% rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java index 1a501ccbd6..daf3dd6486 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0128DistMgmtSiteUrlParentCalculationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java @@ -24,17 +24,23 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -public class MavenIT0128DistMgmtSiteUrlParentCalculationTest +/** + * This is a test set for MNG-3134. + * + * @author John Casey + * @version $Id$ + */ +public class MavenITmng3134DistMgmtSiteUrlParentCalculationTest extends AbstractMavenIntegrationTestCase { /** - * Test DistributionManagement Site-URL calculation when modules are in sibling dirs of parent. (MNG-3134) + * Test DistributionManagement Site-URL calculation when modules are in sibling dirs of parent. */ - public void testit0128() + public void testitMNG3134() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0128-distMgmtSiteUrlParentCalc" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3134" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.executeGoal( "integration-test" ); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/resources/it0125-newestConflictResolver/dependency/pom.xml b/its/core-it-suite/src/test/resources/mng-0612/dependency/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0125-newestConflictResolver/dependency/pom.xml rename to its/core-it-suite/src/test/resources/mng-0612/dependency/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0125-newestConflictResolver/plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-0612/plugin/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0125-newestConflictResolver/plugin/pom.xml rename to its/core-it-suite/src/test/resources/mng-0612/plugin/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0125-newestConflictResolver/plugin/src/main/java/org/apache/maven/its/it0125/DependenciesMojo.java b/its/core-it-suite/src/test/resources/mng-0612/plugin/src/main/java/org/apache/maven/its/it0125/DependenciesMojo.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0125-newestConflictResolver/plugin/src/main/java/org/apache/maven/its/it0125/DependenciesMojo.java rename to its/core-it-suite/src/test/resources/mng-0612/plugin/src/main/java/org/apache/maven/its/it0125/DependenciesMojo.java diff --git a/its/core-it-suite/src/test/resources/it0125-newestConflictResolver/project/pom.xml b/its/core-it-suite/src/test/resources/mng-0612/project/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0125-newestConflictResolver/project/pom.xml rename to its/core-it-suite/src/test/resources/mng-0612/project/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0125-newestConflictResolver/project/src/test/verifier/verifications-test.xml b/its/core-it-suite/src/test/resources/mng-0612/project/src/test/verifier/verifications-test.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0125-newestConflictResolver/project/src/test/verifier/verifications-test.xml rename to its/core-it-suite/src/test/resources/mng-0612/project/src/test/verifier/verifications-test.xml diff --git a/its/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/extension/pom.xml b/its/core-it-suite/src/test/resources/mng-2771/extension/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/extension/pom.xml rename to its/core-it-suite/src/test/resources/mng-2771/extension/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/extension/src/main/java/org/apache/maven/its/it0124/CustomArtifactFactory.java b/its/core-it-suite/src/test/resources/mng-2771/extension/src/main/java/org/apache/maven/its/it0124/CustomArtifactFactory.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/extension/src/main/java/org/apache/maven/its/it0124/CustomArtifactFactory.java rename to its/core-it-suite/src/test/resources/mng-2771/extension/src/main/java/org/apache/maven/its/it0124/CustomArtifactFactory.java diff --git a/its/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/extension/src/main/resources/META-INF/plexus/components.xml b/its/core-it-suite/src/test/resources/mng-2771/extension/src/main/resources/META-INF/plexus/components.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/extension/src/main/resources/META-INF/plexus/components.xml rename to its/core-it-suite/src/test/resources/mng-2771/extension/src/main/resources/META-INF/plexus/components.xml diff --git a/its/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-2771/plugin/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/plugin/pom.xml rename to its/core-it-suite/src/test/resources/mng-2771/plugin/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/plugin/src/main/java/org/apache/maven/its/it0124/LookupMojo.java b/its/core-it-suite/src/test/resources/mng-2771/plugin/src/main/java/org/apache/maven/its/it0124/LookupMojo.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/plugin/src/main/java/org/apache/maven/its/it0124/LookupMojo.java rename to its/core-it-suite/src/test/resources/mng-2771/plugin/src/main/java/org/apache/maven/its/it0124/LookupMojo.java diff --git a/its/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/project/pom.xml b/its/core-it-suite/src/test/resources/mng-2771/project/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/project/pom.xml rename to its/core-it-suite/src/test/resources/mng-2771/project/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/project/src/test/verifier/verifications-test.xml b/its/core-it-suite/src/test/resources/mng-2771/project/src/test/verifier/verifications-test.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0124-pomExtensionComponentOverride/project/src/test/verifier/verifications-test.xml rename to its/core-it-suite/src/test/resources/mng-2771/project/src/test/verifier/verifications-test.xml diff --git a/its/core-it-suite/src/test/resources/it0119-pluginprefixorder/Readme.txt b/its/core-it-suite/src/test/resources/mng-2926/Readme.txt similarity index 100% rename from its/core-it-suite/src/test/resources/it0119-pluginprefixorder/Readme.txt rename to its/core-it-suite/src/test/resources/mng-2926/Readme.txt diff --git a/its/core-it-suite/src/test/resources/it0119-pluginprefixorder/pom.xml b/its/core-it-suite/src/test/resources/mng-2926/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0119-pluginprefixorder/pom.xml rename to its/core-it-suite/src/test/resources/mng-2926/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/pom.xml b/its/core-it-suite/src/test/resources/mng-2926/test-plugin-apache/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/pom.xml rename to its/core-it-suite/src/test/resources/mng-2926/test-plugin-apache/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/ApacheMojo.java b/its/core-it-suite/src/test/resources/mng-2926/test-plugin-apache/src/main/java/org/apache/maven/plugin/ApacheMojo.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/ApacheMojo.java rename to its/core-it-suite/src/test/resources/mng-2926/test-plugin-apache/src/main/java/org/apache/maven/plugin/ApacheMojo.java diff --git a/its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/IDMojo.java b/its/core-it-suite/src/test/resources/mng-2926/test-plugin-apache/src/main/java/org/apache/maven/plugin/IDMojo.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/IDMojo.java rename to its/core-it-suite/src/test/resources/mng-2926/test-plugin-apache/src/main/java/org/apache/maven/plugin/IDMojo.java diff --git a/its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/pom.xml b/its/core-it-suite/src/test/resources/mng-2926/test-plugin-codehaus/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/pom.xml rename to its/core-it-suite/src/test/resources/mng-2926/test-plugin-codehaus/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/CodehausMojo.java b/its/core-it-suite/src/test/resources/mng-2926/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/CodehausMojo.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/CodehausMojo.java rename to its/core-it-suite/src/test/resources/mng-2926/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/CodehausMojo.java diff --git a/its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/IDMojo.java b/its/core-it-suite/src/test/resources/mng-2926/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/IDMojo.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/IDMojo.java rename to its/core-it-suite/src/test/resources/mng-2926/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/IDMojo.java diff --git a/its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/pom.xml b/its/core-it-suite/src/test/resources/mng-2926/test-plugin-custom/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/pom.xml rename to its/core-it-suite/src/test/resources/mng-2926/test-plugin-custom/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/CustomMojo.java b/its/core-it-suite/src/test/resources/mng-2926/test-plugin-custom/src/main/java/org/apache/maven/plugin/CustomMojo.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/CustomMojo.java rename to its/core-it-suite/src/test/resources/mng-2926/test-plugin-custom/src/main/java/org/apache/maven/plugin/CustomMojo.java diff --git a/its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/IDMojo.java b/its/core-it-suite/src/test/resources/mng-2926/test-plugin-custom/src/main/java/org/apache/maven/plugin/IDMojo.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/IDMojo.java rename to its/core-it-suite/src/test/resources/mng-2926/test-plugin-custom/src/main/java/org/apache/maven/plugin/IDMojo.java diff --git a/its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml b/its/core-it-suite/src/test/resources/mng-2926/test-project/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml rename to its/core-it-suite/src/test/resources/mng-2926/test-project/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-project/settings-apache.xml b/its/core-it-suite/src/test/resources/mng-2926/test-project/settings-apache.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-project/settings-apache.xml rename to its/core-it-suite/src/test/resources/mng-2926/test-project/settings-apache.xml diff --git a/its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-project/settings.xml b/its/core-it-suite/src/test/resources/mng-2926/test-project/settings.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0119-pluginprefixorder/test-project/settings.xml rename to its/core-it-suite/src/test/resources/mng-2926/test-project/settings.xml diff --git a/its/core-it-suite/src/test/resources/it0123-snapshotRangeRepository/pom.xml b/its/core-it-suite/src/test/resources/mng-2994/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0123-snapshotRangeRepository/pom.xml rename to its/core-it-suite/src/test/resources/mng-2994/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0123-snapshotRangeRepository/repository/org/apache/maven/its/it0123/maven-it-it0123-dependency/1.0-SNAPSHOT/maven-it-it0123-dependency-1.0-SNAPSHOT.jar b/its/core-it-suite/src/test/resources/mng-2994/repository/org/apache/maven/its/it0123/maven-it-it0123-dependency/1.0-SNAPSHOT/maven-it-it0123-dependency-1.0-SNAPSHOT.jar similarity index 100% rename from its/core-it-suite/src/test/resources/it0123-snapshotRangeRepository/repository/org/apache/maven/its/it0123/maven-it-it0123-dependency/1.0-SNAPSHOT/maven-it-it0123-dependency-1.0-SNAPSHOT.jar rename to its/core-it-suite/src/test/resources/mng-2994/repository/org/apache/maven/its/it0123/maven-it-it0123-dependency/1.0-SNAPSHOT/maven-it-it0123-dependency-1.0-SNAPSHOT.jar diff --git a/its/core-it-suite/src/test/resources/it0123-snapshotRangeRepository/repository/org/apache/maven/its/it0123/maven-it-it0123-dependency/1.0-SNAPSHOT/maven-it-it0123-dependency-1.0-SNAPSHOT.pom b/its/core-it-suite/src/test/resources/mng-2994/repository/org/apache/maven/its/it0123/maven-it-it0123-dependency/1.0-SNAPSHOT/maven-it-it0123-dependency-1.0-SNAPSHOT.pom similarity index 100% rename from its/core-it-suite/src/test/resources/it0123-snapshotRangeRepository/repository/org/apache/maven/its/it0123/maven-it-it0123-dependency/1.0-SNAPSHOT/maven-it-it0123-dependency-1.0-SNAPSHOT.pom rename to its/core-it-suite/src/test/resources/mng-2994/repository/org/apache/maven/its/it0123/maven-it-it0123-dependency/1.0-SNAPSHOT/maven-it-it0123-dependency-1.0-SNAPSHOT.pom diff --git a/its/core-it-suite/src/test/resources/it0123-snapshotRangeRepository/repository/org/apache/maven/its/it0123/maven-it-it0123-dependency/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-2994/repository/org/apache/maven/its/it0123/maven-it-it0123-dependency/maven-metadata.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0123-snapshotRangeRepository/repository/org/apache/maven/its/it0123/maven-it-it0123-dependency/maven-metadata.xml rename to its/core-it-suite/src/test/resources/mng-2994/repository/org/apache/maven/its/it0123/maven-it-it0123-dependency/maven-metadata.xml diff --git a/its/core-it-suite/src/test/resources/it0122-reactorDependencyResolution/plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-3023/plugin/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0122-reactorDependencyResolution/plugin/pom.xml rename to its/core-it-suite/src/test/resources/mng-3023/plugin/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0122-reactorDependencyResolution/plugin/src/main/java/org/apache/maven/its/it0122/TestMojo.java b/its/core-it-suite/src/test/resources/mng-3023/plugin/src/main/java/org/apache/maven/its/it0122/TestMojo.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0122-reactorDependencyResolution/plugin/src/main/java/org/apache/maven/its/it0122/TestMojo.java rename to its/core-it-suite/src/test/resources/mng-3023/plugin/src/main/java/org/apache/maven/its/it0122/TestMojo.java diff --git a/its/core-it-suite/src/test/resources/it0122-reactorDependencyResolution/project/dependency/pom.xml b/its/core-it-suite/src/test/resources/mng-3023/project/dependency/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0122-reactorDependencyResolution/project/dependency/pom.xml rename to its/core-it-suite/src/test/resources/mng-3023/project/dependency/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0122-reactorDependencyResolution/project/main/pom.xml b/its/core-it-suite/src/test/resources/mng-3023/project/main/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0122-reactorDependencyResolution/project/main/pom.xml rename to its/core-it-suite/src/test/resources/mng-3023/project/main/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0122-reactorDependencyResolution/project/pom.xml b/its/core-it-suite/src/test/resources/mng-3023/project/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0122-reactorDependencyResolution/project/pom.xml rename to its/core-it-suite/src/test/resources/mng-3023/project/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/pom.xml b/its/core-it-suite/src/test/resources/mng-3038/test-other-deps/D1/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/pom.xml rename to its/core-it-suite/src/test/resources/mng-3038/test-other-deps/D1/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/apache/maven/its/it0121/D/Foo.java b/its/core-it-suite/src/test/resources/mng-3038/test-other-deps/D1/src/main/java/org/apache/maven/its/it0121/D/Foo.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D1/src/main/java/org/apache/maven/its/it0121/D/Foo.java rename to its/core-it-suite/src/test/resources/mng-3038/test-other-deps/D1/src/main/java/org/apache/maven/its/it0121/D/Foo.java diff --git a/its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/pom.xml b/its/core-it-suite/src/test/resources/mng-3038/test-other-deps/D2/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/pom.xml rename to its/core-it-suite/src/test/resources/mng-3038/test-other-deps/D2/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/apache/maven/its/it0121/D/Foo.java b/its/core-it-suite/src/test/resources/mng-3038/test-other-deps/D2/src/main/java/org/apache/maven/its/it0121/D/Foo.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-other-deps/D2/src/main/java/org/apache/maven/its/it0121/D/Foo.java rename to its/core-it-suite/src/test/resources/mng-3038/test-other-deps/D2/src/main/java/org/apache/maven/its/it0121/D/Foo.java diff --git a/its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-project/A/pom.xml b/its/core-it-suite/src/test/resources/mng-3038/test-project/A/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-project/A/pom.xml rename to its/core-it-suite/src/test/resources/mng-3038/test-project/A/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/apache/maven/its/it0121/A/App.java b/its/core-it-suite/src/test/resources/mng-3038/test-project/A/src/main/java/org/apache/maven/its/it0121/A/App.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/main/java/org/apache/maven/its/it0121/A/App.java rename to its/core-it-suite/src/test/resources/mng-3038/test-project/A/src/main/java/org/apache/maven/its/it0121/A/App.java diff --git a/its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java b/its/core-it-suite/src/test/resources/mng-3038/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java rename to its/core-it-suite/src/test/resources/mng-3038/test-project/A/src/test/java/org/apache/maven/its/it0121/A/AppTest.java diff --git a/its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-project/B/pom.xml b/its/core-it-suite/src/test/resources/mng-3038/test-project/B/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-project/B/pom.xml rename to its/core-it-suite/src/test/resources/mng-3038/test-project/B/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/apache/maven/its/it0121/B/Out.java b/its/core-it-suite/src/test/resources/mng-3038/test-project/B/src/main/java/org/apache/maven/its/it0121/B/Out.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-project/B/src/main/java/org/apache/maven/its/it0121/B/Out.java rename to its/core-it-suite/src/test/resources/mng-3038/test-project/B/src/main/java/org/apache/maven/its/it0121/B/Out.java diff --git a/its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-project/C/pom.xml b/its/core-it-suite/src/test/resources/mng-3038/test-project/C/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-project/C/pom.xml rename to its/core-it-suite/src/test/resources/mng-3038/test-project/C/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-project/pom.xml b/its/core-it-suite/src/test/resources/mng-3038/test-project/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0121-transitiveDepManVersion/test-project/pom.xml rename to its/core-it-suite/src/test/resources/mng-3038/test-project/pom.xml