This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-apache-resources.git
The following commit(s) were added to refs/heads/master by this push: new d7405ca [MASFRES-71] Move IT/Verifier resources to dedicated directory and ignore with m-surefire/failsafe-p d7405ca is described below commit d7405ca8c56704deddadbc134e732b42e3c6ab78 Author: Konrad Windszus <k...@apache.org> AuthorDate: Fri Jul 19 14:28:22 2024 +0200 [MASFRES-71] Move IT/Verifier resources to dedicated directory and ignore with m-surefire/failsafe-p --- source-release/pom.xml | 9 +++++++++ source-release/src/test/java/org/apache/its/util/TestUtils.java | 2 +- .../resources/{ => maven-projects}/basics/basics-child1/pom.xml | 0 .../basics-child1/src/main/java/org/apache/assembly/it/App.java | 0 .../src/main/resources/META-INF/plexus/components.xml | 0 .../src/test/java/org/apache/assembly/it/AppTest.java | 0 .../resources/{ => maven-projects}/basics/basics-child2/pom.xml | 0 .../basics-child2/src/main/java/org/apache/assembly/it/App.java | 0 .../src/test/java/org/apache/assembly/it/AppTest.java | 0 .../src/test/resources/{ => maven-projects}/basics/pom.xml | 0 .../build-output-dir/build-output-dir-child1/.gitignore | 0 .../build-output-dir/build-output-dir-child1/pom.xml | 0 .../src/main/java/org/apache/assembly/it/App.java | 0 .../src/test/java/org/apache/assembly/it/AppTest.java | 0 .../build-output-dir/build-output-dir-child1/target/dummy.txt | 0 .../build-output-dir/build-output-dir-child2/pom.xml | 0 .../src/main/java/org/apache/assembly/it/App.java | 0 .../src/test/java/org/apache/assembly/it/AppTest.java | 0 .../test/resources/{ => maven-projects}/build-output-dir/pom.xml | 0 .../test/resources/{ => maven-projects}/ci-excludes/.asf.yaml | 0 .../ci-excludes/.github/pull_request_template.md | 0 .../test/resources/{ => maven-projects}/ci-excludes/.travis.yml | 0 .../resources/{ => maven-projects}/ci-excludes/deploySite.sh | 0 .../src/test/resources/{ => maven-projects}/ci-excludes/pom.xml | 0 .../test/resources/{ => maven-projects}/ide-excludes/.classpath | 0 .../ide-excludes/.deployables/org.eclipse.jdt.core.prefs | 0 .../ide-excludes/.deployables/org.maven.ide.eclipse.prefs | 0 .../.externalToolBuilders/org.eclipse.jdt.core.prefs | 0 .../.externalToolBuilders/org.maven.ide.eclipse.prefs | 0 .../src/test/resources/maven-projects/ide-excludes/.gitignore | 4 ++++ .../test/resources/{ => maven-projects}/ide-excludes/.project | 0 .../ide-excludes/.settings/org.eclipse.jdt.core.prefs | 0 .../ide-excludes/.settings/org.maven.ide.eclipse.prefs | 0 .../ide-excludes/.wtpmodules/org.eclipse.jdt.core.prefs | 0 .../ide-excludes/.wtpmodules/org.maven.ide.eclipse.prefs | 0 .../ide-excludes/ide-excludes-child1/.classpath | 0 .../ide-excludes-child1/.deployables/org.eclipse.jdt.core.prefs | 0 .../ide-excludes-child1/.deployables/org.maven.ide.eclipse.prefs | 0 .../.externalToolBuilders/org.eclipse.jdt.core.prefs | 0 .../.externalToolBuilders/org.maven.ide.eclipse.prefs | 0 .../ide-excludes/ide-excludes-child1/.project | 0 .../ide-excludes-child1/.settings/org.eclipse.jdt.core.prefs | 0 .../ide-excludes-child1/.settings/org.maven.ide.eclipse.prefs | 0 .../ide-excludes-child1/.wtpmodules/org.eclipse.jdt.core.prefs | 0 .../ide-excludes-child1/.wtpmodules/org.maven.ide.eclipse.prefs | 0 .../ide-excludes/ide-excludes-child1/maven-eclipse.xml | 0 .../ide-excludes/ide-excludes-child1/pom.xml | 0 .../src/main/java/org/apache/assembly/it/App.java | 0 .../src/main/resources/META-INF/plexus/components.xml | 0 .../src/test/java/org/apache/assembly/it/AppTest.java | 0 .../ide-excludes/ide-excludes-child2/ide-excludes-child2.iml | 0 .../ide-excludes/ide-excludes-child2/ide-excludes-child2.ipr | 0 .../ide-excludes/ide-excludes-child2/ide-excludes-child2.iws | 0 .../ide-excludes/ide-excludes-child2/pom.xml | 0 .../src/main/java/org/apache/assembly/it/App.java | 0 .../src/test/java/org/apache/assembly/it/AppTest.java | 0 .../resources/{ => maven-projects}/ide-excludes/ide-excludes.iml | 0 .../resources/{ => maven-projects}/ide-excludes/ide-excludes.ipr | 0 .../resources/{ => maven-projects}/ide-excludes/ide-excludes.iws | 0 .../{ => maven-projects}/ide-excludes/maven-eclipse.xml | 0 .../src/test/resources/{ => maven-projects}/ide-excludes/pom.xml | 0 .../{ => maven-projects}/misc-excludes/.flattened-pom.xml | 0 .../resources/{ => maven-projects}/misc-excludes/cobertura.ser | 0 .../test/resources/{ => maven-projects}/misc-excludes/debug.log | 0 .../misc-excludes/dependency-reduced-pom.xml | 0 .../misc-excludes/misc-excludes-child1/pom.xml | 0 .../src/main/java/org/apache/assembly/it/App.java | 0 .../src/main/resources/META-INF/plexus/components.xml | 0 .../src/test/java/org/apache/assembly/it/AppTest.java | 0 .../misc-excludes/misc-excludes-child2/cobertura.ser | 0 .../misc-excludes/misc-excludes-child2/pom.xml | 0 .../src/main/java/org/apache/assembly/it/App.java | 0 .../src/test/java/org/apache/assembly/it/AppTest.java | 0 .../test/resources/{ => maven-projects}/misc-excludes/pom.xml | 0 .../{ => maven-projects}/misc-excludes/pom.xml.releaseBackup | 0 .../{ => maven-projects}/misc-excludes/release.properties | 0 .../resources/{ => maven-projects}/misc-excludes/some-target.txt | 0 .../output-dir-contains-src-name-child1/pom.xml | 0 .../test/resources/project/src/main/resources/test.properties | 0 .../output-dir-contains-src-name-child2/pom.xml | 0 .../test/resources/project/src/main/resources/test.properties | 0 .../{ => maven-projects}/output-dir-contains-src-name/pom.xml | 0 .../test/resources/project/src/main/resources/test.properties | 0 .../test/resources/{ => maven-projects}/shared-resources/pom.xml | 0 .../shared-resources/shared-resources-child1/pom.xml | 0 .../src/main/java/org/apache/assembly/it/App.java | 0 .../src/test/java/org/apache/assembly/it/AppTest.java | 0 .../shared-resources/shared-resources-child2/pom.xml | 0 .../src/main/java/org/apache/assembly/it/App.java | 0 .../src/test/java/org/apache/assembly/it/AppTest.java | 0 .../test/resources/{ => maven-projects}/single-module/pom.xml | 0 .../single-module/src/main/java/org/apache/assembly/it/App.java | 0 .../src/main/resources/META-INF/plexus/components.xml | 0 .../src/test/java/org/apache/assembly/it/AppTest.java | 0 .../resources/maven-projects/src-contains-ide-files/.gitignore | 3 +++ .../{ => maven-projects}/src-contains-ide-files/pom.xml | 0 .../src-contains-ide-files/src-contains-ide-files-child1/pom.xml | 0 .../src-contains-ide-files-child1/src/test/resources/.classpath | 0 .../src/test/resources/.deployables/org.eclipse.jdt.core.prefs | 0 .../src/test/resources/.deployables/org.maven.ide.eclipse.prefs | 0 .../resources/.externalToolBuilders/org.eclipse.jdt.core.prefs | 0 .../resources/.externalToolBuilders/org.maven.ide.eclipse.prefs | 0 .../src-contains-ide-files-child1/src/test/resources/.project | 0 .../src/test/resources/.settings/org.eclipse.jdt.core.prefs | 0 .../src/test/resources/.settings/org.maven.ide.eclipse.prefs | 0 .../src/test/resources/.wtpmodules/org.eclipse.jdt.core.prefs | 0 .../src/test/resources/.wtpmodules/org.maven.ide.eclipse.prefs | 0 .../src/test/resources/cobertura.ser | 0 .../src/test/resources/ide-excludes.iml | 0 .../src/test/resources/ide-excludes.ipr | 0 .../src/test/resources/ide-excludes.iws | 0 .../src/test/resources/maven-eclipse.xml | 0 .../src/test/resources/pom.xml.releaseBackup | 0 .../src/test/resources/release.properties | 0 .../src-contains-ide-files/src/test/resources/.classpath | 0 .../src/test/resources/.deployables/org.eclipse.jdt.core.prefs | 0 .../src/test/resources/.deployables/org.maven.ide.eclipse.prefs | 0 .../resources/.externalToolBuilders/org.eclipse.jdt.core.prefs | 0 .../resources/.externalToolBuilders/org.maven.ide.eclipse.prefs | 0 .../src-contains-ide-files/src/test/resources/.project | 0 .../src/test/resources/.settings/org.eclipse.jdt.core.prefs | 0 .../src/test/resources/.settings/org.maven.ide.eclipse.prefs | 0 .../src/test/resources/.wtpmodules/org.eclipse.jdt.core.prefs | 0 .../src/test/resources/.wtpmodules/org.maven.ide.eclipse.prefs | 0 .../src-contains-ide-files/src/test/resources/cobertura.ser | 0 .../src-contains-ide-files/src/test/resources/ide-excludes.iml | 0 .../src-contains-ide-files/src/test/resources/ide-excludes.ipr | 0 .../src-contains-ide-files/src/test/resources/ide-excludes.iws | 0 .../src-contains-ide-files/src/test/resources/maven-eclipse.xml | 0 .../src/test/resources/pom.xml.releaseBackup | 0 .../src-contains-ide-files/src/test/resources/release.properties | 0 .../{ => maven-projects}/src-contains-output-dir-name/pom.xml | 0 .../src-contains-output-dir-name-child1/pom.xml | 0 .../src/main/java/target/App.java | 0 .../src-contains-output-dir-name-child2/pom.xml | 0 .../src/main/java/target/App.java | 0 .../src/main/resources/target/test.txt | 0 .../src/test/resources/{ => maven-projects}/zip-and-tar/pom.xml | 0 .../{ => maven-projects}/zip-and-tar/zip-and-tar-child1/pom.xml | 0 .../src/main/java/org/apache/assembly/it/App.java | 0 .../src/main/resources/META-INF/plexus/components.xml | 0 .../src/test/java/org/apache/assembly/it/AppTest.java | 0 .../{ => maven-projects}/zip-and-tar/zip-and-tar-child2/pom.xml | 0 .../src/main/java/org/apache/assembly/it/App.java | 0 .../src/test/java/org/apache/assembly/it/AppTest.java | 0 145 files changed, 17 insertions(+), 1 deletion(-) diff --git a/source-release/pom.xml b/source-release/pom.xml index 79df747..ce20ee7 100644 --- a/source-release/pom.xml +++ b/source-release/pom.xml @@ -101,6 +101,14 @@ under the License. </excludes> </configuration> </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/maven-projects/**</exclude> + </excludes> + </configuration> + </plugin> </plugins> </pluginManagement> </build> @@ -124,6 +132,7 @@ under the License. </includes> <excludes> <exclude>**/util/*</exclude> + <exclude>**/maven-projects/**</exclude> </excludes> <forkCount>0</forkCount> <systemProperties> diff --git a/source-release/src/test/java/org/apache/its/util/TestUtils.java b/source-release/src/test/java/org/apache/its/util/TestUtils.java index fb21014..a388913 100644 --- a/source-release/src/test/java/org/apache/its/util/TestUtils.java +++ b/source-release/src/test/java/org/apache/its/util/TestUtils.java @@ -165,7 +165,7 @@ public class TestUtils { public static File getTestDir(String name) throws IOException, URISyntaxException { ClassLoader cloader = Thread.currentThread().getContextClassLoader(); - URL resource = cloader.getResource(name); + URL resource = cloader.getResource("maven-projects/" + name); if (resource == null) { throw new IOException("Cannot find test directory: " + name); diff --git a/source-release/src/test/resources/basics/basics-child1/pom.xml b/source-release/src/test/resources/maven-projects/basics/basics-child1/pom.xml similarity index 100% rename from source-release/src/test/resources/basics/basics-child1/pom.xml rename to source-release/src/test/resources/maven-projects/basics/basics-child1/pom.xml diff --git a/source-release/src/test/resources/basics/basics-child1/src/main/java/org/apache/assembly/it/App.java b/source-release/src/test/resources/maven-projects/basics/basics-child1/src/main/java/org/apache/assembly/it/App.java similarity index 100% rename from source-release/src/test/resources/basics/basics-child1/src/main/java/org/apache/assembly/it/App.java rename to source-release/src/test/resources/maven-projects/basics/basics-child1/src/main/java/org/apache/assembly/it/App.java diff --git a/source-release/src/test/resources/basics/basics-child1/src/main/resources/META-INF/plexus/components.xml b/source-release/src/test/resources/maven-projects/basics/basics-child1/src/main/resources/META-INF/plexus/components.xml similarity index 100% rename from source-release/src/test/resources/basics/basics-child1/src/main/resources/META-INF/plexus/components.xml rename to source-release/src/test/resources/maven-projects/basics/basics-child1/src/main/resources/META-INF/plexus/components.xml diff --git a/source-release/src/test/resources/basics/basics-child1/src/test/java/org/apache/assembly/it/AppTest.java b/source-release/src/test/resources/maven-projects/basics/basics-child1/src/test/java/org/apache/assembly/it/AppTest.java similarity index 100% rename from source-release/src/test/resources/basics/basics-child1/src/test/java/org/apache/assembly/it/AppTest.java rename to source-release/src/test/resources/maven-projects/basics/basics-child1/src/test/java/org/apache/assembly/it/AppTest.java diff --git a/source-release/src/test/resources/basics/basics-child2/pom.xml b/source-release/src/test/resources/maven-projects/basics/basics-child2/pom.xml similarity index 100% rename from source-release/src/test/resources/basics/basics-child2/pom.xml rename to source-release/src/test/resources/maven-projects/basics/basics-child2/pom.xml diff --git a/source-release/src/test/resources/basics/basics-child2/src/main/java/org/apache/assembly/it/App.java b/source-release/src/test/resources/maven-projects/basics/basics-child2/src/main/java/org/apache/assembly/it/App.java similarity index 100% rename from source-release/src/test/resources/basics/basics-child2/src/main/java/org/apache/assembly/it/App.java rename to source-release/src/test/resources/maven-projects/basics/basics-child2/src/main/java/org/apache/assembly/it/App.java diff --git a/source-release/src/test/resources/basics/basics-child2/src/test/java/org/apache/assembly/it/AppTest.java b/source-release/src/test/resources/maven-projects/basics/basics-child2/src/test/java/org/apache/assembly/it/AppTest.java similarity index 100% rename from source-release/src/test/resources/basics/basics-child2/src/test/java/org/apache/assembly/it/AppTest.java rename to source-release/src/test/resources/maven-projects/basics/basics-child2/src/test/java/org/apache/assembly/it/AppTest.java diff --git a/source-release/src/test/resources/basics/pom.xml b/source-release/src/test/resources/maven-projects/basics/pom.xml similarity index 100% rename from source-release/src/test/resources/basics/pom.xml rename to source-release/src/test/resources/maven-projects/basics/pom.xml diff --git a/source-release/src/test/resources/build-output-dir/build-output-dir-child1/.gitignore b/source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child1/.gitignore similarity index 100% rename from source-release/src/test/resources/build-output-dir/build-output-dir-child1/.gitignore rename to source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child1/.gitignore diff --git a/source-release/src/test/resources/build-output-dir/build-output-dir-child1/pom.xml b/source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child1/pom.xml similarity index 100% rename from source-release/src/test/resources/build-output-dir/build-output-dir-child1/pom.xml rename to source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child1/pom.xml diff --git a/source-release/src/test/resources/build-output-dir/build-output-dir-child1/src/main/java/org/apache/assembly/it/App.java b/source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child1/src/main/java/org/apache/assembly/it/App.java similarity index 100% rename from source-release/src/test/resources/build-output-dir/build-output-dir-child1/src/main/java/org/apache/assembly/it/App.java rename to source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child1/src/main/java/org/apache/assembly/it/App.java diff --git a/source-release/src/test/resources/build-output-dir/build-output-dir-child1/src/test/java/org/apache/assembly/it/AppTest.java b/source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child1/src/test/java/org/apache/assembly/it/AppTest.java similarity index 100% rename from source-release/src/test/resources/build-output-dir/build-output-dir-child1/src/test/java/org/apache/assembly/it/AppTest.java rename to source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child1/src/test/java/org/apache/assembly/it/AppTest.java diff --git a/source-release/src/test/resources/build-output-dir/build-output-dir-child1/target/dummy.txt b/source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child1/target/dummy.txt similarity index 100% rename from source-release/src/test/resources/build-output-dir/build-output-dir-child1/target/dummy.txt rename to source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child1/target/dummy.txt diff --git a/source-release/src/test/resources/build-output-dir/build-output-dir-child2/pom.xml b/source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child2/pom.xml similarity index 100% rename from source-release/src/test/resources/build-output-dir/build-output-dir-child2/pom.xml rename to source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child2/pom.xml diff --git a/source-release/src/test/resources/build-output-dir/build-output-dir-child2/src/main/java/org/apache/assembly/it/App.java b/source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child2/src/main/java/org/apache/assembly/it/App.java similarity index 100% rename from source-release/src/test/resources/build-output-dir/build-output-dir-child2/src/main/java/org/apache/assembly/it/App.java rename to source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child2/src/main/java/org/apache/assembly/it/App.java diff --git a/source-release/src/test/resources/build-output-dir/build-output-dir-child2/src/test/java/org/apache/assembly/it/AppTest.java b/source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child2/src/test/java/org/apache/assembly/it/AppTest.java similarity index 100% rename from source-release/src/test/resources/build-output-dir/build-output-dir-child2/src/test/java/org/apache/assembly/it/AppTest.java rename to source-release/src/test/resources/maven-projects/build-output-dir/build-output-dir-child2/src/test/java/org/apache/assembly/it/AppTest.java diff --git a/source-release/src/test/resources/build-output-dir/pom.xml b/source-release/src/test/resources/maven-projects/build-output-dir/pom.xml similarity index 100% rename from source-release/src/test/resources/build-output-dir/pom.xml rename to source-release/src/test/resources/maven-projects/build-output-dir/pom.xml diff --git a/source-release/src/test/resources/ci-excludes/.asf.yaml b/source-release/src/test/resources/maven-projects/ci-excludes/.asf.yaml similarity index 100% rename from source-release/src/test/resources/ci-excludes/.asf.yaml rename to source-release/src/test/resources/maven-projects/ci-excludes/.asf.yaml diff --git a/source-release/src/test/resources/ci-excludes/.github/pull_request_template.md b/source-release/src/test/resources/maven-projects/ci-excludes/.github/pull_request_template.md similarity index 100% rename from source-release/src/test/resources/ci-excludes/.github/pull_request_template.md rename to source-release/src/test/resources/maven-projects/ci-excludes/.github/pull_request_template.md diff --git a/source-release/src/test/resources/ci-excludes/.travis.yml b/source-release/src/test/resources/maven-projects/ci-excludes/.travis.yml similarity index 100% rename from source-release/src/test/resources/ci-excludes/.travis.yml rename to source-release/src/test/resources/maven-projects/ci-excludes/.travis.yml diff --git a/source-release/src/test/resources/ci-excludes/deploySite.sh b/source-release/src/test/resources/maven-projects/ci-excludes/deploySite.sh similarity index 100% rename from source-release/src/test/resources/ci-excludes/deploySite.sh rename to source-release/src/test/resources/maven-projects/ci-excludes/deploySite.sh diff --git a/source-release/src/test/resources/ci-excludes/pom.xml b/source-release/src/test/resources/maven-projects/ci-excludes/pom.xml similarity index 100% rename from source-release/src/test/resources/ci-excludes/pom.xml rename to source-release/src/test/resources/maven-projects/ci-excludes/pom.xml diff --git a/source-release/src/test/resources/ide-excludes/.classpath b/source-release/src/test/resources/maven-projects/ide-excludes/.classpath similarity index 100% rename from source-release/src/test/resources/ide-excludes/.classpath rename to source-release/src/test/resources/maven-projects/ide-excludes/.classpath diff --git a/source-release/src/test/resources/ide-excludes/.deployables/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/.deployables/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/.deployables/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/.deployables/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/ide-excludes/.deployables/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/.deployables/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/.deployables/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/.deployables/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/ide-excludes/.externalToolBuilders/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/.externalToolBuilders/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/.externalToolBuilders/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/.externalToolBuilders/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/ide-excludes/.externalToolBuilders/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/.externalToolBuilders/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/.externalToolBuilders/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/.externalToolBuilders/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/maven-projects/ide-excludes/.gitignore b/source-release/src/test/resources/maven-projects/ide-excludes/.gitignore new file mode 100644 index 0000000..3f8e14a --- /dev/null +++ b/source-release/src/test/resources/maven-projects/ide-excludes/.gitignore @@ -0,0 +1,4 @@ +!* +target/ +.settings/ +.DS_Store \ No newline at end of file diff --git a/source-release/src/test/resources/ide-excludes/.project b/source-release/src/test/resources/maven-projects/ide-excludes/.project similarity index 100% rename from source-release/src/test/resources/ide-excludes/.project rename to source-release/src/test/resources/maven-projects/ide-excludes/.project diff --git a/source-release/src/test/resources/ide-excludes/.settings/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/.settings/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/.settings/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/ide-excludes/.settings/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/.settings/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/.settings/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/.settings/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/ide-excludes/.wtpmodules/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/.wtpmodules/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/.wtpmodules/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/.wtpmodules/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/ide-excludes/.wtpmodules/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/.wtpmodules/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/.wtpmodules/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/.wtpmodules/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.classpath b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.classpath similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child1/.classpath rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.classpath diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.deployables/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.deployables/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child1/.deployables/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.deployables/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.deployables/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.deployables/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child1/.deployables/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.deployables/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.externalToolBuilders/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.externalToolBuilders/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child1/.externalToolBuilders/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.externalToolBuilders/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.externalToolBuilders/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.externalToolBuilders/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child1/.externalToolBuilders/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.externalToolBuilders/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.project b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.project similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child1/.project rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.project diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.settings/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child1/.settings/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.settings/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.settings/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.settings/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child1/.settings/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.settings/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.wtpmodules/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.wtpmodules/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child1/.wtpmodules/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.wtpmodules/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.wtpmodules/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.wtpmodules/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child1/.wtpmodules/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/.wtpmodules/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/maven-eclipse.xml b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/maven-eclipse.xml similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child1/maven-eclipse.xml rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/maven-eclipse.xml diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/pom.xml b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/pom.xml similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child1/pom.xml rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/pom.xml diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/src/main/java/org/apache/assembly/it/App.java b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/src/main/java/org/apache/assembly/it/App.java similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child1/src/main/java/org/apache/assembly/it/App.java rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/src/main/java/org/apache/assembly/it/App.java diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/src/main/resources/META-INF/plexus/components.xml b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/src/main/resources/META-INF/plexus/components.xml similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child1/src/main/resources/META-INF/plexus/components.xml rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/src/main/resources/META-INF/plexus/components.xml diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/src/test/java/org/apache/assembly/it/AppTest.java b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/src/test/java/org/apache/assembly/it/AppTest.java similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child1/src/test/java/org/apache/assembly/it/AppTest.java rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child1/src/test/java/org/apache/assembly/it/AppTest.java diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child2/ide-excludes-child2.iml b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child2/ide-excludes-child2.iml similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child2/ide-excludes-child2.iml rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child2/ide-excludes-child2.iml diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child2/ide-excludes-child2.ipr b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child2/ide-excludes-child2.ipr similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child2/ide-excludes-child2.ipr rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child2/ide-excludes-child2.ipr diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child2/ide-excludes-child2.iws b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child2/ide-excludes-child2.iws similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child2/ide-excludes-child2.iws rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child2/ide-excludes-child2.iws diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child2/pom.xml b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child2/pom.xml similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child2/pom.xml rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child2/pom.xml diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child2/src/main/java/org/apache/assembly/it/App.java b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child2/src/main/java/org/apache/assembly/it/App.java similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child2/src/main/java/org/apache/assembly/it/App.java rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child2/src/main/java/org/apache/assembly/it/App.java diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child2/src/test/java/org/apache/assembly/it/AppTest.java b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child2/src/test/java/org/apache/assembly/it/AppTest.java similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes-child2/src/test/java/org/apache/assembly/it/AppTest.java rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes-child2/src/test/java/org/apache/assembly/it/AppTest.java diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes.iml b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes.iml similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes.iml rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes.iml diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes.ipr b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes.ipr similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes.ipr rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes.ipr diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes.iws b/source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes.iws similarity index 100% rename from source-release/src/test/resources/ide-excludes/ide-excludes.iws rename to source-release/src/test/resources/maven-projects/ide-excludes/ide-excludes.iws diff --git a/source-release/src/test/resources/ide-excludes/maven-eclipse.xml b/source-release/src/test/resources/maven-projects/ide-excludes/maven-eclipse.xml similarity index 100% rename from source-release/src/test/resources/ide-excludes/maven-eclipse.xml rename to source-release/src/test/resources/maven-projects/ide-excludes/maven-eclipse.xml diff --git a/source-release/src/test/resources/ide-excludes/pom.xml b/source-release/src/test/resources/maven-projects/ide-excludes/pom.xml similarity index 100% rename from source-release/src/test/resources/ide-excludes/pom.xml rename to source-release/src/test/resources/maven-projects/ide-excludes/pom.xml diff --git a/source-release/src/test/resources/misc-excludes/.flattened-pom.xml b/source-release/src/test/resources/maven-projects/misc-excludes/.flattened-pom.xml similarity index 100% rename from source-release/src/test/resources/misc-excludes/.flattened-pom.xml rename to source-release/src/test/resources/maven-projects/misc-excludes/.flattened-pom.xml diff --git a/source-release/src/test/resources/misc-excludes/cobertura.ser b/source-release/src/test/resources/maven-projects/misc-excludes/cobertura.ser similarity index 100% rename from source-release/src/test/resources/misc-excludes/cobertura.ser rename to source-release/src/test/resources/maven-projects/misc-excludes/cobertura.ser diff --git a/source-release/src/test/resources/misc-excludes/debug.log b/source-release/src/test/resources/maven-projects/misc-excludes/debug.log similarity index 100% rename from source-release/src/test/resources/misc-excludes/debug.log rename to source-release/src/test/resources/maven-projects/misc-excludes/debug.log diff --git a/source-release/src/test/resources/misc-excludes/dependency-reduced-pom.xml b/source-release/src/test/resources/maven-projects/misc-excludes/dependency-reduced-pom.xml similarity index 100% rename from source-release/src/test/resources/misc-excludes/dependency-reduced-pom.xml rename to source-release/src/test/resources/maven-projects/misc-excludes/dependency-reduced-pom.xml diff --git a/source-release/src/test/resources/misc-excludes/misc-excludes-child1/pom.xml b/source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child1/pom.xml similarity index 100% rename from source-release/src/test/resources/misc-excludes/misc-excludes-child1/pom.xml rename to source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child1/pom.xml diff --git a/source-release/src/test/resources/misc-excludes/misc-excludes-child1/src/main/java/org/apache/assembly/it/App.java b/source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child1/src/main/java/org/apache/assembly/it/App.java similarity index 100% rename from source-release/src/test/resources/misc-excludes/misc-excludes-child1/src/main/java/org/apache/assembly/it/App.java rename to source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child1/src/main/java/org/apache/assembly/it/App.java diff --git a/source-release/src/test/resources/misc-excludes/misc-excludes-child1/src/main/resources/META-INF/plexus/components.xml b/source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child1/src/main/resources/META-INF/plexus/components.xml similarity index 100% rename from source-release/src/test/resources/misc-excludes/misc-excludes-child1/src/main/resources/META-INF/plexus/components.xml rename to source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child1/src/main/resources/META-INF/plexus/components.xml diff --git a/source-release/src/test/resources/misc-excludes/misc-excludes-child1/src/test/java/org/apache/assembly/it/AppTest.java b/source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child1/src/test/java/org/apache/assembly/it/AppTest.java similarity index 100% rename from source-release/src/test/resources/misc-excludes/misc-excludes-child1/src/test/java/org/apache/assembly/it/AppTest.java rename to source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child1/src/test/java/org/apache/assembly/it/AppTest.java diff --git a/source-release/src/test/resources/misc-excludes/misc-excludes-child2/cobertura.ser b/source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child2/cobertura.ser similarity index 100% rename from source-release/src/test/resources/misc-excludes/misc-excludes-child2/cobertura.ser rename to source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child2/cobertura.ser diff --git a/source-release/src/test/resources/misc-excludes/misc-excludes-child2/pom.xml b/source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child2/pom.xml similarity index 100% rename from source-release/src/test/resources/misc-excludes/misc-excludes-child2/pom.xml rename to source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child2/pom.xml diff --git a/source-release/src/test/resources/misc-excludes/misc-excludes-child2/src/main/java/org/apache/assembly/it/App.java b/source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child2/src/main/java/org/apache/assembly/it/App.java similarity index 100% rename from source-release/src/test/resources/misc-excludes/misc-excludes-child2/src/main/java/org/apache/assembly/it/App.java rename to source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child2/src/main/java/org/apache/assembly/it/App.java diff --git a/source-release/src/test/resources/misc-excludes/misc-excludes-child2/src/test/java/org/apache/assembly/it/AppTest.java b/source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child2/src/test/java/org/apache/assembly/it/AppTest.java similarity index 100% rename from source-release/src/test/resources/misc-excludes/misc-excludes-child2/src/test/java/org/apache/assembly/it/AppTest.java rename to source-release/src/test/resources/maven-projects/misc-excludes/misc-excludes-child2/src/test/java/org/apache/assembly/it/AppTest.java diff --git a/source-release/src/test/resources/misc-excludes/pom.xml b/source-release/src/test/resources/maven-projects/misc-excludes/pom.xml similarity index 100% rename from source-release/src/test/resources/misc-excludes/pom.xml rename to source-release/src/test/resources/maven-projects/misc-excludes/pom.xml diff --git a/source-release/src/test/resources/misc-excludes/pom.xml.releaseBackup b/source-release/src/test/resources/maven-projects/misc-excludes/pom.xml.releaseBackup similarity index 100% rename from source-release/src/test/resources/misc-excludes/pom.xml.releaseBackup rename to source-release/src/test/resources/maven-projects/misc-excludes/pom.xml.releaseBackup diff --git a/source-release/src/test/resources/misc-excludes/release.properties b/source-release/src/test/resources/maven-projects/misc-excludes/release.properties similarity index 100% rename from source-release/src/test/resources/misc-excludes/release.properties rename to source-release/src/test/resources/maven-projects/misc-excludes/release.properties diff --git a/source-release/src/test/resources/misc-excludes/some-target.txt b/source-release/src/test/resources/maven-projects/misc-excludes/some-target.txt similarity index 100% rename from source-release/src/test/resources/misc-excludes/some-target.txt rename to source-release/src/test/resources/maven-projects/misc-excludes/some-target.txt diff --git a/source-release/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/pom.xml b/source-release/src/test/resources/maven-projects/output-dir-contains-src-name/output-dir-contains-src-name-child1/pom.xml similarity index 100% rename from source-release/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/pom.xml rename to source-release/src/test/resources/maven-projects/output-dir-contains-src-name/output-dir-contains-src-name-child1/pom.xml diff --git a/source-release/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/project/src/main/resources/test.properties b/source-release/src/test/resources/maven-projects/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/project/src/main/resources/test.properties similarity index 100% rename from source-release/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/project/src/main/resources/test.properties rename to source-release/src/test/resources/maven-projects/output-dir-contains-src-name/output-dir-contains-src-name-child1/src/test/resources/project/src/main/resources/test.properties diff --git a/source-release/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/pom.xml b/source-release/src/test/resources/maven-projects/output-dir-contains-src-name/output-dir-contains-src-name-child2/pom.xml similarity index 100% rename from source-release/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/pom.xml rename to source-release/src/test/resources/maven-projects/output-dir-contains-src-name/output-dir-contains-src-name-child2/pom.xml diff --git a/source-release/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/project/src/main/resources/test.properties b/source-release/src/test/resources/maven-projects/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/project/src/main/resources/test.properties similarity index 100% rename from source-release/src/test/resources/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/project/src/main/resources/test.properties rename to source-release/src/test/resources/maven-projects/output-dir-contains-src-name/output-dir-contains-src-name-child2/src/test/resources/project/src/main/resources/test.properties diff --git a/source-release/src/test/resources/output-dir-contains-src-name/pom.xml b/source-release/src/test/resources/maven-projects/output-dir-contains-src-name/pom.xml similarity index 100% rename from source-release/src/test/resources/output-dir-contains-src-name/pom.xml rename to source-release/src/test/resources/maven-projects/output-dir-contains-src-name/pom.xml diff --git a/source-release/src/test/resources/output-dir-contains-src-name/src/test/resources/project/src/main/resources/test.properties b/source-release/src/test/resources/maven-projects/output-dir-contains-src-name/src/test/resources/project/src/main/resources/test.properties similarity index 100% rename from source-release/src/test/resources/output-dir-contains-src-name/src/test/resources/project/src/main/resources/test.properties rename to source-release/src/test/resources/maven-projects/output-dir-contains-src-name/src/test/resources/project/src/main/resources/test.properties diff --git a/source-release/src/test/resources/shared-resources/pom.xml b/source-release/src/test/resources/maven-projects/shared-resources/pom.xml similarity index 100% rename from source-release/src/test/resources/shared-resources/pom.xml rename to source-release/src/test/resources/maven-projects/shared-resources/pom.xml diff --git a/source-release/src/test/resources/shared-resources/shared-resources-child1/pom.xml b/source-release/src/test/resources/maven-projects/shared-resources/shared-resources-child1/pom.xml similarity index 100% rename from source-release/src/test/resources/shared-resources/shared-resources-child1/pom.xml rename to source-release/src/test/resources/maven-projects/shared-resources/shared-resources-child1/pom.xml diff --git a/source-release/src/test/resources/shared-resources/shared-resources-child1/src/main/java/org/apache/assembly/it/App.java b/source-release/src/test/resources/maven-projects/shared-resources/shared-resources-child1/src/main/java/org/apache/assembly/it/App.java similarity index 100% rename from source-release/src/test/resources/shared-resources/shared-resources-child1/src/main/java/org/apache/assembly/it/App.java rename to source-release/src/test/resources/maven-projects/shared-resources/shared-resources-child1/src/main/java/org/apache/assembly/it/App.java diff --git a/source-release/src/test/resources/shared-resources/shared-resources-child1/src/test/java/org/apache/assembly/it/AppTest.java b/source-release/src/test/resources/maven-projects/shared-resources/shared-resources-child1/src/test/java/org/apache/assembly/it/AppTest.java similarity index 100% rename from source-release/src/test/resources/shared-resources/shared-resources-child1/src/test/java/org/apache/assembly/it/AppTest.java rename to source-release/src/test/resources/maven-projects/shared-resources/shared-resources-child1/src/test/java/org/apache/assembly/it/AppTest.java diff --git a/source-release/src/test/resources/shared-resources/shared-resources-child2/pom.xml b/source-release/src/test/resources/maven-projects/shared-resources/shared-resources-child2/pom.xml similarity index 100% rename from source-release/src/test/resources/shared-resources/shared-resources-child2/pom.xml rename to source-release/src/test/resources/maven-projects/shared-resources/shared-resources-child2/pom.xml diff --git a/source-release/src/test/resources/shared-resources/shared-resources-child2/src/main/java/org/apache/assembly/it/App.java b/source-release/src/test/resources/maven-projects/shared-resources/shared-resources-child2/src/main/java/org/apache/assembly/it/App.java similarity index 100% rename from source-release/src/test/resources/shared-resources/shared-resources-child2/src/main/java/org/apache/assembly/it/App.java rename to source-release/src/test/resources/maven-projects/shared-resources/shared-resources-child2/src/main/java/org/apache/assembly/it/App.java diff --git a/source-release/src/test/resources/shared-resources/shared-resources-child2/src/test/java/org/apache/assembly/it/AppTest.java b/source-release/src/test/resources/maven-projects/shared-resources/shared-resources-child2/src/test/java/org/apache/assembly/it/AppTest.java similarity index 100% rename from source-release/src/test/resources/shared-resources/shared-resources-child2/src/test/java/org/apache/assembly/it/AppTest.java rename to source-release/src/test/resources/maven-projects/shared-resources/shared-resources-child2/src/test/java/org/apache/assembly/it/AppTest.java diff --git a/source-release/src/test/resources/single-module/pom.xml b/source-release/src/test/resources/maven-projects/single-module/pom.xml similarity index 100% rename from source-release/src/test/resources/single-module/pom.xml rename to source-release/src/test/resources/maven-projects/single-module/pom.xml diff --git a/source-release/src/test/resources/single-module/src/main/java/org/apache/assembly/it/App.java b/source-release/src/test/resources/maven-projects/single-module/src/main/java/org/apache/assembly/it/App.java similarity index 100% rename from source-release/src/test/resources/single-module/src/main/java/org/apache/assembly/it/App.java rename to source-release/src/test/resources/maven-projects/single-module/src/main/java/org/apache/assembly/it/App.java diff --git a/source-release/src/test/resources/single-module/src/main/resources/META-INF/plexus/components.xml b/source-release/src/test/resources/maven-projects/single-module/src/main/resources/META-INF/plexus/components.xml similarity index 100% rename from source-release/src/test/resources/single-module/src/main/resources/META-INF/plexus/components.xml rename to source-release/src/test/resources/maven-projects/single-module/src/main/resources/META-INF/plexus/components.xml diff --git a/source-release/src/test/resources/single-module/src/test/java/org/apache/assembly/it/AppTest.java b/source-release/src/test/resources/maven-projects/single-module/src/test/java/org/apache/assembly/it/AppTest.java similarity index 100% rename from source-release/src/test/resources/single-module/src/test/java/org/apache/assembly/it/AppTest.java rename to source-release/src/test/resources/maven-projects/single-module/src/test/java/org/apache/assembly/it/AppTest.java diff --git a/source-release/src/test/resources/maven-projects/src-contains-ide-files/.gitignore b/source-release/src/test/resources/maven-projects/src-contains-ide-files/.gitignore new file mode 100644 index 0000000..1924f62 --- /dev/null +++ b/source-release/src/test/resources/maven-projects/src-contains-ide-files/.gitignore @@ -0,0 +1,3 @@ +!* +target/ +.DS_Store \ No newline at end of file diff --git a/source-release/src/test/resources/src-contains-ide-files/pom.xml b/source-release/src/test/resources/maven-projects/src-contains-ide-files/pom.xml similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/pom.xml rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/pom.xml diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/pom.xml b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/pom.xml similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/pom.xml rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/pom.xml diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.classpath b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.classpath similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.classpath rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.classpath diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.deployables/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.deployables/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.deployables/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.deployables/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.deployables/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.deployables/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.deployables/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.deployables/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.externalToolBuilders/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.externalToolBuilders/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.externalToolBuilders/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.externalToolBuilders/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.externalToolBuilders/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.externalToolBuilders/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.externalToolBuilders/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.externalToolBuilders/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.project b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.project similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.project rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.project diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.settings/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.settings/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.settings/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.settings/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.settings/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.settings/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.settings/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.wtpmodules/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.wtpmodules/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.wtpmodules/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.wtpmodules/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.wtpmodules/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.wtpmodules/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.wtpmodules/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/.wtpmodules/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/cobertura.ser b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/cobertura.ser similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/cobertura.ser rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/cobertura.ser diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/ide-excludes.iml b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/ide-excludes.iml similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/ide-excludes.iml rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/ide-excludes.iml diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/ide-excludes.ipr b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/ide-excludes.ipr similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/ide-excludes.ipr rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/ide-excludes.ipr diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/ide-excludes.iws b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/ide-excludes.iws similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/ide-excludes.iws rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/ide-excludes.iws diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/maven-eclipse.xml b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/maven-eclipse.xml similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/maven-eclipse.xml rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/maven-eclipse.xml diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/pom.xml.releaseBackup b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/pom.xml.releaseBackup similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/pom.xml.releaseBackup rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/pom.xml.releaseBackup diff --git a/source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/release.properties b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/release.properties similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/release.properties rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src-contains-ide-files-child1/src/test/resources/release.properties diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/.classpath b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.classpath similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/.classpath rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.classpath diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/.deployables/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.deployables/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/.deployables/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.deployables/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/.deployables/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.deployables/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/.deployables/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.deployables/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/.externalToolBuilders/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.externalToolBuilders/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/.externalToolBuilders/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.externalToolBuilders/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/.externalToolBuilders/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.externalToolBuilders/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/.externalToolBuilders/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.externalToolBuilders/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/.project b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.project similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/.project rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.project diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/.settings/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/.settings/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.settings/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/.settings/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.settings/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/.settings/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.settings/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/.wtpmodules/org.eclipse.jdt.core.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.wtpmodules/org.eclipse.jdt.core.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/.wtpmodules/org.eclipse.jdt.core.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.wtpmodules/org.eclipse.jdt.core.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/.wtpmodules/org.maven.ide.eclipse.prefs b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.wtpmodules/org.maven.ide.eclipse.prefs similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/.wtpmodules/org.maven.ide.eclipse.prefs rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/.wtpmodules/org.maven.ide.eclipse.prefs diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/cobertura.ser b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/cobertura.ser similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/cobertura.ser rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/cobertura.ser diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/ide-excludes.iml b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/ide-excludes.iml similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/ide-excludes.iml rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/ide-excludes.iml diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/ide-excludes.ipr b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/ide-excludes.ipr similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/ide-excludes.ipr rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/ide-excludes.ipr diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/ide-excludes.iws b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/ide-excludes.iws similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/ide-excludes.iws rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/ide-excludes.iws diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/maven-eclipse.xml b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/maven-eclipse.xml similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/maven-eclipse.xml rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/maven-eclipse.xml diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/pom.xml.releaseBackup b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/pom.xml.releaseBackup similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/pom.xml.releaseBackup rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/pom.xml.releaseBackup diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/release.properties b/source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/release.properties similarity index 100% rename from source-release/src/test/resources/src-contains-ide-files/src/test/resources/release.properties rename to source-release/src/test/resources/maven-projects/src-contains-ide-files/src/test/resources/release.properties diff --git a/source-release/src/test/resources/src-contains-output-dir-name/pom.xml b/source-release/src/test/resources/maven-projects/src-contains-output-dir-name/pom.xml similarity index 100% rename from source-release/src/test/resources/src-contains-output-dir-name/pom.xml rename to source-release/src/test/resources/maven-projects/src-contains-output-dir-name/pom.xml diff --git a/source-release/src/test/resources/src-contains-output-dir-name/src-contains-output-dir-name-child1/pom.xml b/source-release/src/test/resources/maven-projects/src-contains-output-dir-name/src-contains-output-dir-name-child1/pom.xml similarity index 100% rename from source-release/src/test/resources/src-contains-output-dir-name/src-contains-output-dir-name-child1/pom.xml rename to source-release/src/test/resources/maven-projects/src-contains-output-dir-name/src-contains-output-dir-name-child1/pom.xml diff --git a/source-release/src/test/resources/src-contains-output-dir-name/src-contains-output-dir-name-child1/src/main/java/target/App.java b/source-release/src/test/resources/maven-projects/src-contains-output-dir-name/src-contains-output-dir-name-child1/src/main/java/target/App.java similarity index 100% rename from source-release/src/test/resources/src-contains-output-dir-name/src-contains-output-dir-name-child1/src/main/java/target/App.java rename to source-release/src/test/resources/maven-projects/src-contains-output-dir-name/src-contains-output-dir-name-child1/src/main/java/target/App.java diff --git a/source-release/src/test/resources/src-contains-output-dir-name/src-contains-output-dir-name-child2/pom.xml b/source-release/src/test/resources/maven-projects/src-contains-output-dir-name/src-contains-output-dir-name-child2/pom.xml similarity index 100% rename from source-release/src/test/resources/src-contains-output-dir-name/src-contains-output-dir-name-child2/pom.xml rename to source-release/src/test/resources/maven-projects/src-contains-output-dir-name/src-contains-output-dir-name-child2/pom.xml diff --git a/source-release/src/test/resources/src-contains-output-dir-name/src-contains-output-dir-name-child2/src/main/java/target/App.java b/source-release/src/test/resources/maven-projects/src-contains-output-dir-name/src-contains-output-dir-name-child2/src/main/java/target/App.java similarity index 100% rename from source-release/src/test/resources/src-contains-output-dir-name/src-contains-output-dir-name-child2/src/main/java/target/App.java rename to source-release/src/test/resources/maven-projects/src-contains-output-dir-name/src-contains-output-dir-name-child2/src/main/java/target/App.java diff --git a/source-release/src/test/resources/src-contains-output-dir-name/src/main/resources/target/test.txt b/source-release/src/test/resources/maven-projects/src-contains-output-dir-name/src/main/resources/target/test.txt similarity index 100% rename from source-release/src/test/resources/src-contains-output-dir-name/src/main/resources/target/test.txt rename to source-release/src/test/resources/maven-projects/src-contains-output-dir-name/src/main/resources/target/test.txt diff --git a/source-release/src/test/resources/zip-and-tar/pom.xml b/source-release/src/test/resources/maven-projects/zip-and-tar/pom.xml similarity index 100% rename from source-release/src/test/resources/zip-and-tar/pom.xml rename to source-release/src/test/resources/maven-projects/zip-and-tar/pom.xml diff --git a/source-release/src/test/resources/zip-and-tar/zip-and-tar-child1/pom.xml b/source-release/src/test/resources/maven-projects/zip-and-tar/zip-and-tar-child1/pom.xml similarity index 100% rename from source-release/src/test/resources/zip-and-tar/zip-and-tar-child1/pom.xml rename to source-release/src/test/resources/maven-projects/zip-and-tar/zip-and-tar-child1/pom.xml diff --git a/source-release/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/java/org/apache/assembly/it/App.java b/source-release/src/test/resources/maven-projects/zip-and-tar/zip-and-tar-child1/src/main/java/org/apache/assembly/it/App.java similarity index 100% rename from source-release/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/java/org/apache/assembly/it/App.java rename to source-release/src/test/resources/maven-projects/zip-and-tar/zip-and-tar-child1/src/main/java/org/apache/assembly/it/App.java diff --git a/source-release/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/resources/META-INF/plexus/components.xml b/source-release/src/test/resources/maven-projects/zip-and-tar/zip-and-tar-child1/src/main/resources/META-INF/plexus/components.xml similarity index 100% rename from source-release/src/test/resources/zip-and-tar/zip-and-tar-child1/src/main/resources/META-INF/plexus/components.xml rename to source-release/src/test/resources/maven-projects/zip-and-tar/zip-and-tar-child1/src/main/resources/META-INF/plexus/components.xml diff --git a/source-release/src/test/resources/zip-and-tar/zip-and-tar-child1/src/test/java/org/apache/assembly/it/AppTest.java b/source-release/src/test/resources/maven-projects/zip-and-tar/zip-and-tar-child1/src/test/java/org/apache/assembly/it/AppTest.java similarity index 100% rename from source-release/src/test/resources/zip-and-tar/zip-and-tar-child1/src/test/java/org/apache/assembly/it/AppTest.java rename to source-release/src/test/resources/maven-projects/zip-and-tar/zip-and-tar-child1/src/test/java/org/apache/assembly/it/AppTest.java diff --git a/source-release/src/test/resources/zip-and-tar/zip-and-tar-child2/pom.xml b/source-release/src/test/resources/maven-projects/zip-and-tar/zip-and-tar-child2/pom.xml similarity index 100% rename from source-release/src/test/resources/zip-and-tar/zip-and-tar-child2/pom.xml rename to source-release/src/test/resources/maven-projects/zip-and-tar/zip-and-tar-child2/pom.xml diff --git a/source-release/src/test/resources/zip-and-tar/zip-and-tar-child2/src/main/java/org/apache/assembly/it/App.java b/source-release/src/test/resources/maven-projects/zip-and-tar/zip-and-tar-child2/src/main/java/org/apache/assembly/it/App.java similarity index 100% rename from source-release/src/test/resources/zip-and-tar/zip-and-tar-child2/src/main/java/org/apache/assembly/it/App.java rename to source-release/src/test/resources/maven-projects/zip-and-tar/zip-and-tar-child2/src/main/java/org/apache/assembly/it/App.java diff --git a/source-release/src/test/resources/zip-and-tar/zip-and-tar-child2/src/test/java/org/apache/assembly/it/AppTest.java b/source-release/src/test/resources/maven-projects/zip-and-tar/zip-and-tar-child2/src/test/java/org/apache/assembly/it/AppTest.java similarity index 100% rename from source-release/src/test/resources/zip-and-tar/zip-and-tar-child2/src/test/java/org/apache/assembly/it/AppTest.java rename to source-release/src/test/resources/maven-projects/zip-and-tar/zip-and-tar-child2/src/test/java/org/apache/assembly/it/AppTest.java