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 8ad4399172..6f3cbe722e 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
@@ -210,7 +210,14 @@ public class IntegrationTestSuite
suite.addTestSuite( MavenITmng1412DependenciesOrderTest.class );
suite.addTestSuite( MavenITmng1323AntrunDependenciesTest.class );
suite.addTestSuite( MavenITmng0836PluginParentResolutionTest.class );
+ suite.addTestSuite( MavenITmng0522PluginMgmtConfigTest.class );
+ suite.addTestSuite( MavenITmng0507ArtifactRelocationTest.class );
+ suite.addTestSuite( MavenITmng0505VersionRangeTest.class );
+ suite.addTestSuite( MavenITmng0496IgnoreUnknownPluginParametersTest.class );
+ suite.addTestSuite( MavenITmng0471CustomLifecycleTest.class );
suite.addTestSuite( MavenITmng0469ReportConfigTest.class );
+ suite.addTestSuite( MavenITmng0377PluginLookupFromPrefixTest.class );
+ suite.addTestSuite( MavenITmng0294MergeGlobalAndUserSettingsTest.class );
suite.addTestSuite( MavenIT0142DirectDependencyScopesTest.class );
suite.addTestSuite( MavenIT0140Test.class );
suite.addTestSuite( MavenIT0139Test.class );
@@ -275,15 +282,8 @@ public class IntegrationTestSuite
suite.addTestSuite( MavenIT0038Test.class );
suite.addTestSuite( MavenIT0037Test.class );
suite.addTestSuite( MavenIT0036Test.class );
- suite.addTestSuite( MavenIT0035Test.class );
- suite.addTestSuite( MavenIT0034Test.class );
suite.addTestSuite( MavenIT0032Test.class );
- suite.addTestSuite( MavenIT0031Test.class );
suite.addTestSuite( MavenIT0030Test.class );
- suite.addTestSuite( MavenIT0029Test.class );
- suite.addTestSuite( MavenIT0028Test.class );
- suite.addTestSuite( MavenIT0027Test.class );
- suite.addTestSuite( MavenIT0026Test.class );
suite.addTestSuite( MavenIT0025Test.class );
suite.addTestSuite( MavenIT0024Test.class );
suite.addTestSuite( MavenIT0023Test.class );
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024Test.java
index 30fbd09ded..b14b570a2e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024Test.java
@@ -24,6 +24,12 @@ import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+/**
+ * This is a test set for MNG-172.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
public class MavenIT0024Test
extends AbstractMavenIntegrationTestCase
{
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025Test.java
index 94d58725df..685b94616b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025Test.java
@@ -24,6 +24,12 @@ import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+/**
+ * This is a test set for MNG-172.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
public class MavenIT0025Test
extends AbstractMavenIntegrationTestCase
{
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036Test.java
index fa53d2fd5d..15c5b3143b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036Test.java
@@ -24,6 +24,12 @@ import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+/**
+ * This is a test set for MNG-607.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
public class MavenIT0036Test
extends AbstractMavenIntegrationTestCase
{
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037Test.java
index 21a0e93703..b3d2c8e4a3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037Test.java
@@ -26,6 +26,12 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
+/**
+ * This is a test set for MNG-607.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
public class MavenIT0037Test
extends AbstractMavenIntegrationTestCase
{
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038Test.java
index 3da136cf49..3e10522cb1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038Test.java
@@ -26,6 +26,12 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
+/**
+ * This is a test set for MNG-607.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
public class MavenIT0038Test
extends AbstractMavenIntegrationTestCase
{
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039Test.java
index c75524a3e1..36eedc026b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039Test.java
@@ -26,6 +26,12 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
+/**
+ * This is a test set for MNG-607.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
public class MavenIT0039Test
extends AbstractMavenIntegrationTestCase
{
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0026Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
similarity index 85%
rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0026Test.java
rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
index ff45a7ac73..5a8d384be3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0026Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
@@ -25,10 +25,16 @@ import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.Properties;
-public class MavenIT0026Test
+/**
+ * This is a test set for MNG-294.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng0294MergeGlobalAndUserSettingsTest
extends AbstractMavenIntegrationTestCase
{
- public MavenIT0026Test()
+ public MavenITmng0294MergeGlobalAndUserSettingsTest()
{
super( "[,2.99.99)" );
}
@@ -36,10 +42,10 @@ public class MavenIT0026Test
/**
* Test merging of global- and user-level settings.xml files.
*/
- public void testit0026()
+ public void testitMNG294()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0026" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0294" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
Properties systemProperties = new Properties();
systemProperties.put( "org.apache.maven.user-settings", "user-settings.xml" );
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0031Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
similarity index 86%
rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0031Test.java
rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
index 85cec23d54..e9eed1c51a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0031Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
@@ -27,10 +27,16 @@ import java.util.Properties;
import java.util.List;
import java.util.ArrayList;
-public class MavenIT0031Test
+/**
+ * This is a test set for MNG-377.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng0377PluginLookupFromPrefixTest
extends AbstractMavenIntegrationTestCase
{
- public MavenIT0031Test()
+ public MavenITmng0377PluginLookupFromPrefixTest()
{
}
@@ -38,10 +44,10 @@ public class MavenIT0031Test
* Test usage of plugins.xml mapping file on the repository to resolve plugin artifactId from it's prefix using the
* pluginGroups in the provided settings.xml.
*/
- public void testit0031()
+ public void testitMNG377()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0031" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0377" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0027Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
similarity index 87%
rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0027Test.java
rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
index 37dc822afd..ab76b2db5e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0027Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
@@ -26,17 +26,23 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-public class MavenIT0027Test
+/**
+ * This is a test set for MNG-471.
+ *
+ * @author Brett Porter
+ * @version $Id$
+ */
+public class MavenITmng0471CustomLifecycleTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test @execute with a custom lifecycle, including configuration
*/
- public void testit0027()
+ public void testitMNG471()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0027" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0471" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List goals = Arrays.asList( new String[]{"org.apache.maven.its.plugins:maven-it-plugin-fork:fork",
"org.apache.maven.its.plugins:maven-it-plugin-fork:fork-goal"} );
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0028Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
similarity index 85%
rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0028Test.java
rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
index 5ce991c113..80ace08858 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0028Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
@@ -24,7 +24,13 @@ import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-public class MavenIT0028Test
+/**
+ * This is a test set for MNG-496.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng0496IgnoreUnknownPluginParametersTest
extends AbstractMavenIntegrationTestCase
{
@@ -32,10 +38,10 @@ public class MavenIT0028Test
* Test that unused configuration parameters from the POM don't cause the
* mojo to fail...they will show up as warnings in the -X output instead.
*/
- public void testit0028()
+ public void testitMNG496()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0028" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0496" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-file:2.1-SNAPSHOT:file" );
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0034Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
similarity index 87%
rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0034Test.java
rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
index 62cec6b8e2..bc5ce9d708 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0034Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
@@ -24,17 +24,23 @@ import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-public class MavenIT0034Test
+/**
+ * This is a test set for MNG-505.
+ *
+ * @author Brett Porter
+ * @version $Id$
+ */
+public class MavenITmng0505VersionRangeTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test version range junit [3.7,) resolves to 3.8.1
*/
- public void testit0034()
+ public void testitMNG505()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0034" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0505" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.4", "jar" );
verifier.deleteArtifact( "junit", "junit", "3.8", "jar" );
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0035Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
similarity index 88%
rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0035Test.java
rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
index 16e5dff8ef..f10917a723 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0035Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
@@ -24,17 +24,23 @@ import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-public class MavenIT0035Test
+/**
+ * This is a test set for MNG-507.
+ *
+ * @author Brett Porter
+ * @version $Id$
+ */
+public class MavenITmng0507ArtifactRelocationTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test artifact relocation.
*/
- public void testit0035()
+ public void testitMNG507()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0035" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0507" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.1", "jar" );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.1", "pom" );
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0029Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522PluginMgmtConfigTest.java
similarity index 87%
rename from its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0029Test.java
rename to its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522PluginMgmtConfigTest.java
index b2670fa81f..f46eaf66f5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0029Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522PluginMgmtConfigTest.java
@@ -24,17 +24,23 @@ import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-public class MavenIT0029Test
+/**
+ * This is a test set for MNG-522.
+ *
+ * @author John Casey
+ * @version $Id$
+ */
+public class MavenITmng0522PluginMgmtConfigTest
extends AbstractMavenIntegrationTestCase
{
/**
* Test for pluginManagement injection of plugin configuration.
*/
- public void testit0029()
+ public void testitMNG522()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0029" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0522" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0029", "1.0-SNAPSHOT", "jar" );
diff --git a/its/core-it-suite/src/test/resources/it0026/global-settings.xml b/its/core-it-suite/src/test/resources/mng-0294/global-settings.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/it0026/global-settings.xml
rename to its/core-it-suite/src/test/resources/mng-0294/global-settings.xml
diff --git a/its/core-it-suite/src/test/resources/it0026/pom.xml b/its/core-it-suite/src/test/resources/mng-0294/pom.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/it0026/pom.xml
rename to its/core-it-suite/src/test/resources/mng-0294/pom.xml
diff --git a/its/core-it-suite/src/test/resources/it0026/src/main/java/org/apache/maven/it0026/Person.java b/its/core-it-suite/src/test/resources/mng-0294/src/main/java/org/apache/maven/it0026/Person.java
similarity index 100%
rename from its/core-it-suite/src/test/resources/it0026/src/main/java/org/apache/maven/it0026/Person.java
rename to its/core-it-suite/src/test/resources/mng-0294/src/main/java/org/apache/maven/it0026/Person.java
diff --git a/its/core-it-suite/src/test/resources/it0026/user-settings.xml b/its/core-it-suite/src/test/resources/mng-0294/user-settings.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/it0026/user-settings.xml
rename to its/core-it-suite/src/test/resources/mng-0294/user-settings.xml
diff --git a/its/core-it-suite/src/test/resources/it0031/pom.xml b/its/core-it-suite/src/test/resources/mng-0377/pom.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/it0031/pom.xml
rename to its/core-it-suite/src/test/resources/mng-0377/pom.xml
diff --git a/its/core-it-suite/src/test/resources/it0031/settings.xml b/its/core-it-suite/src/test/resources/mng-0377/settings.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/it0031/settings.xml
rename to its/core-it-suite/src/test/resources/mng-0377/settings.xml
diff --git a/its/core-it-suite/src/test/resources/it0031/src/main/mdo/test.mdo b/its/core-it-suite/src/test/resources/mng-0377/src/main/mdo/test.mdo
similarity index 100%
rename from its/core-it-suite/src/test/resources/it0031/src/main/mdo/test.mdo
rename to its/core-it-suite/src/test/resources/mng-0377/src/main/mdo/test.mdo
diff --git a/its/core-it-suite/src/test/resources/it0027/pom.xml b/its/core-it-suite/src/test/resources/mng-0471/pom.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/it0027/pom.xml
rename to its/core-it-suite/src/test/resources/mng-0471/pom.xml
diff --git a/its/core-it-suite/src/test/resources/it0028/pom.xml b/its/core-it-suite/src/test/resources/mng-0496/pom.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/it0028/pom.xml
rename to its/core-it-suite/src/test/resources/mng-0496/pom.xml
diff --git a/its/core-it-suite/src/test/resources/it0034/pom.xml b/its/core-it-suite/src/test/resources/mng-0505/pom.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/it0034/pom.xml
rename to its/core-it-suite/src/test/resources/mng-0505/pom.xml
diff --git a/its/core-it-suite/src/test/resources/it0035/pom.xml b/its/core-it-suite/src/test/resources/mng-0507/pom.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/it0035/pom.xml
rename to its/core-it-suite/src/test/resources/mng-0507/pom.xml
diff --git a/its/core-it-suite/src/test/resources/it0029/child-project/pom.xml b/its/core-it-suite/src/test/resources/mng-0522/child-project/pom.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/it0029/child-project/pom.xml
rename to its/core-it-suite/src/test/resources/mng-0522/child-project/pom.xml
diff --git a/its/core-it-suite/src/test/resources/it0029/pom.xml b/its/core-it-suite/src/test/resources/mng-0522/pom.xml
similarity index 100%
rename from its/core-it-suite/src/test/resources/it0029/pom.xml
rename to its/core-it-suite/src/test/resources/mng-0522/pom.xml