diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java index d9c388201f..83bc133318 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java @@ -52,7 +52,7 @@ protected void setUp() { super.setUp(); - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0108-snapshotUpdate" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0108" ); verifier = new Verifier( testDir.getAbsolutePath() ); localRepoFile = getLocalRepoFile( verifier ); deleteLocalArtifact( verifier, localRepoFile ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0109ReleaseUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0109ReleaseUpdateTest.java index de9d156d52..c5acfc5e3d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0109ReleaseUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0109ReleaseUpdateTest.java @@ -49,7 +49,7 @@ public class MavenIT0109ReleaseUpdateTest public void testReleaseUpdated() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0109-releaseUpdate" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0109" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.deleteArtifact( GROUPID, ARTIFACTID, OLD_VERSION, TYPE ); verifier.deleteArtifact( GROUPID, ARTIFACTID, OLD_VERSION, POM_TYPE ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java index 6a854ac8aa..d5bfaaa30b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java @@ -32,7 +32,7 @@ public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest public void testit0113() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0113-serverAuthzAvailableToWagonMgrInPlugin" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0113" ); Verifier verifier; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java index b8cc0394d9..15eabfd3d9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest.java @@ -37,7 +37,7 @@ public MavenIT0115CustomArtifactHandlerAndCustomLifecycleTest() { public void testit0115() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0115-customArtifactHandlerAndCustomLifecycle" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0115" ); Verifier verifier; diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0129ResourceProvidedToAPluginAsAPluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0129ResourceProvidedToAPluginAsAPluginDependencyTest.java index 7b8397b552..7db8254a01 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0129ResourceProvidedToAPluginAsAPluginDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0129ResourceProvidedToAPluginAsAPluginDependencyTest.java @@ -33,7 +33,7 @@ public void testit0129() throws Exception { File testDir = - ResourceExtractor.simpleExtractResources( getClass(), "/it0129-resourcesForAPluginProvidedAsAPluginDependency" ); + ResourceExtractor.simpleExtractResources( getClass(), "/it0129" ); Verifier verifier; @@ -50,7 +50,7 @@ public void testit0129() verifier.resetStreams(); //now run the test - testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-project" ); + testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0129/test-project" ); verifier = new Verifier( testDir.getAbsolutePath() ); cliOptions = new ArrayList(); verifier.executeGoal( "verify" ); diff --git a/its/core-it-suite/src/test/resources/it0108-snapshotUpdate/pom.xml b/its/core-it-suite/src/test/resources/it0108/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0108-snapshotUpdate/pom.xml rename to its/core-it-suite/src/test/resources/it0108/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0109-releaseUpdate/pom.xml b/its/core-it-suite/src/test/resources/it0109/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0109-releaseUpdate/pom.xml rename to its/core-it-suite/src/test/resources/it0109/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0109-releaseUpdate/repository/org/apache/maven/it/maven-it-release-update/1.0/maven-it-release-update-1.0.jar b/its/core-it-suite/src/test/resources/it0109/repository/org/apache/maven/it/maven-it-release-update/1.0/maven-it-release-update-1.0.jar similarity index 100% rename from its/core-it-suite/src/test/resources/it0109-releaseUpdate/repository/org/apache/maven/it/maven-it-release-update/1.0/maven-it-release-update-1.0.jar rename to its/core-it-suite/src/test/resources/it0109/repository/org/apache/maven/it/maven-it-release-update/1.0/maven-it-release-update-1.0.jar diff --git a/its/core-it-suite/src/test/resources/it0109-releaseUpdate/repository/org/apache/maven/it/maven-it-release-update/1.1/maven-it-release-update-1.1.jar b/its/core-it-suite/src/test/resources/it0109/repository/org/apache/maven/it/maven-it-release-update/1.1/maven-it-release-update-1.1.jar similarity index 100% rename from its/core-it-suite/src/test/resources/it0109-releaseUpdate/repository/org/apache/maven/it/maven-it-release-update/1.1/maven-it-release-update-1.1.jar rename to its/core-it-suite/src/test/resources/it0109/repository/org/apache/maven/it/maven-it-release-update/1.1/maven-it-release-update-1.1.jar diff --git a/its/core-it-suite/src/test/resources/it0113-serverAuthzAvailableToWagonMgrInPlugin/maven-it0113-plugin/pom.xml b/its/core-it-suite/src/test/resources/it0113/maven-it0113-plugin/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0113-serverAuthzAvailableToWagonMgrInPlugin/maven-it0113-plugin/pom.xml rename to its/core-it-suite/src/test/resources/it0113/maven-it0113-plugin/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0113-serverAuthzAvailableToWagonMgrInPlugin/maven-it0113-plugin/src/main/java/org/apache/maven/plugins/MyMojo.java b/its/core-it-suite/src/test/resources/it0113/maven-it0113-plugin/src/main/java/org/apache/maven/plugins/MyMojo.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0113-serverAuthzAvailableToWagonMgrInPlugin/maven-it0113-plugin/src/main/java/org/apache/maven/plugins/MyMojo.java rename to its/core-it-suite/src/test/resources/it0113/maven-it0113-plugin/src/main/java/org/apache/maven/plugins/MyMojo.java diff --git a/its/core-it-suite/src/test/resources/it0113-serverAuthzAvailableToWagonMgrInPlugin/test-project/pom.xml b/its/core-it-suite/src/test/resources/it0113/test-project/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0113-serverAuthzAvailableToWagonMgrInPlugin/test-project/pom.xml rename to its/core-it-suite/src/test/resources/it0113/test-project/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0113-serverAuthzAvailableToWagonMgrInPlugin/test-project/settings.xml b/its/core-it-suite/src/test/resources/it0113/test-project/settings.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0113-serverAuthzAvailableToWagonMgrInPlugin/test-project/settings.xml rename to its/core-it-suite/src/test/resources/it0113/test-project/settings.xml diff --git a/its/core-it-suite/src/test/resources/it0113-serverAuthzAvailableToWagonMgrInPlugin/test-project/src/main/java/org/apache/maven/it/App.java b/its/core-it-suite/src/test/resources/it0113/test-project/src/main/java/org/apache/maven/it/App.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0113-serverAuthzAvailableToWagonMgrInPlugin/test-project/src/main/java/org/apache/maven/it/App.java rename to its/core-it-suite/src/test/resources/it0113/test-project/src/main/java/org/apache/maven/it/App.java diff --git a/its/core-it-suite/src/test/resources/it0113-serverAuthzAvailableToWagonMgrInPlugin/test-project/src/test/java/org/apache/maven/it/AppTest.java b/its/core-it-suite/src/test/resources/it0113/test-project/src/test/java/org/apache/maven/it/AppTest.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0113-serverAuthzAvailableToWagonMgrInPlugin/test-project/src/test/java/org/apache/maven/it/AppTest.java rename to its/core-it-suite/src/test/resources/it0113/test-project/src/test/java/org/apache/maven/it/AppTest.java diff --git a/its/core-it-suite/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-extension/pom.xml b/its/core-it-suite/src/test/resources/it0115/test-extension/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-extension/pom.xml rename to its/core-it-suite/src/test/resources/it0115/test-extension/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-extension/src/main/java/org/apache/maven/its/it0115/XarMojo.java b/its/core-it-suite/src/test/resources/it0115/test-extension/src/main/java/org/apache/maven/its/it0115/XarMojo.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-extension/src/main/java/org/apache/maven/its/it0115/XarMojo.java rename to its/core-it-suite/src/test/resources/it0115/test-extension/src/main/java/org/apache/maven/its/it0115/XarMojo.java diff --git a/its/core-it-suite/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-extension/src/main/resources/META-INF/plexus/components.xml b/its/core-it-suite/src/test/resources/it0115/test-extension/src/main/resources/META-INF/plexus/components.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-extension/src/main/resources/META-INF/plexus/components.xml rename to its/core-it-suite/src/test/resources/it0115/test-extension/src/main/resources/META-INF/plexus/components.xml diff --git a/its/core-it-suite/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-project/pom.xml b/its/core-it-suite/src/test/resources/it0115/test-project/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-project/pom.xml rename to its/core-it-suite/src/test/resources/it0115/test-project/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-project/src/main/resources/package.xml b/its/core-it-suite/src/test/resources/it0115/test-project/src/main/resources/package.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-project/src/main/resources/package.xml rename to its/core-it-suite/src/test/resources/it0115/test-project/src/main/resources/package.xml diff --git a/its/core-it-suite/src/test/resources/it0116-verifyCorrectOsProfileActivation/pom.xml b/its/core-it-suite/src/test/resources/it0116/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0116-verifyCorrectOsProfileActivation/pom.xml rename to its/core-it-suite/src/test/resources/it0116/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/Readme.txt b/its/core-it-suite/src/test/resources/it0129/Readme.txt similarity index 100% rename from its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/Readme.txt rename to its/core-it-suite/src/test/resources/it0129/Readme.txt diff --git a/its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/extension/it0129_rule_set.xml b/its/core-it-suite/src/test/resources/it0129/extension/it0129_rule_set.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/extension/it0129_rule_set.xml rename to its/core-it-suite/src/test/resources/it0129/extension/it0129_rule_set.xml diff --git a/its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/extension/pom.xml b/its/core-it-suite/src/test/resources/it0129/extension/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/extension/pom.xml rename to its/core-it-suite/src/test/resources/it0129/extension/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/extension/src/assembly/assembly.xml b/its/core-it-suite/src/test/resources/it0129/extension/src/assembly/assembly.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/extension/src/assembly/assembly.xml rename to its/core-it-suite/src/test/resources/it0129/extension/src/assembly/assembly.xml diff --git a/its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/pom.xml b/its/core-it-suite/src/test/resources/it0129/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/pom.xml rename to its/core-it-suite/src/test/resources/it0129/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-plugin/pom.xml b/its/core-it-suite/src/test/resources/it0129/test-plugin/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-plugin/pom.xml rename to its/core-it-suite/src/test/resources/it0129/test-plugin/pom.xml diff --git a/its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-plugin/src/main/java/org/apache/maven/plugin/It0129Mojo.java b/its/core-it-suite/src/test/resources/it0129/test-plugin/src/main/java/org/apache/maven/plugin/It0129Mojo.java similarity index 100% rename from its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-plugin/src/main/java/org/apache/maven/plugin/It0129Mojo.java rename to its/core-it-suite/src/test/resources/it0129/test-plugin/src/main/java/org/apache/maven/plugin/It0129Mojo.java diff --git a/its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-project/pom.xml b/its/core-it-suite/src/test/resources/it0129/test-project/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/it0129-resourcesForAPluginProvidedAsAPluginDependency/test-project/pom.xml rename to its/core-it-suite/src/test/resources/it0129/test-project/pom.xml