You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kw...@apache.org on 2024/07/19 12:28:31 UTC
(maven-apache-resources) 01/01: [MASFRES-71] Move IT/Verifier resources to dedicated directory and ignore with m-surefire/failsafe-p
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch bugfix/move-it-resources
in repository https://gitbox.apache.org/repos/asf/maven-apache-resources.git
commit d07f43bff938f744fa9b3c207648a52ce0f5270d
Author: Konrad Windszus <kw...@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
---
incubator-disclaimer/.checkstyle | 13 ++++++++++++
jar-txt/.checkstyle | 13 ++++++++++++
jar/.checkstyle | 13 ++++++++++++
license-header/.checkstyle | 13 ++++++++++++
resources-bundles-sample/.checkstyle | 13 ++++++++++++
source-release/.checkstyle | 13 ++++++++++++
source-release/pom.xml | 9 +++++++++
.../test/java/org/apache/its/util/TestUtils.java | 2 +-
.../src/test/resources/ide-excludes/.classpath | 9 ---------
.../src/test/resources/ide-excludes/.project | 23 ----------------------
.../ide-excludes/ide-excludes-child1/.classpath | 9 ---------
.../ide-excludes/ide-excludes-child1/.project | 23 ----------------------
.../ide-excludes-child2/ide-excludes-child2.iml | 9 ---------
.../ide-excludes-child2/ide-excludes-child2.ipr | 9 ---------
.../basics/basics-child1/pom.xml | 0
.../src/main/java/org/apache/assembly/it/App.java | 0
.../main/resources/META-INF/plexus/components.xml | 0
.../test/java/org/apache/assembly/it/AppTest.java | 0
.../basics/basics-child2/pom.xml | 0
.../src/main/java/org/apache/assembly/it/App.java | 0
.../test/java/org/apache/assembly/it/AppTest.java | 0
.../resources/{ => maven-projects}/basics/pom.xml | 0
.../build-output-dir-child1/pom.xml | 0
.../src/main/java/org/apache/assembly/it/App.java | 0
.../test/java/org/apache/assembly/it/AppTest.java | 0
.../build-output-dir-child2/pom.xml | 0
.../src/main/java/org/apache/assembly/it/App.java | 0
.../test/java/org/apache/assembly/it/AppTest.java | 0
.../{ => maven-projects}/build-output-dir/pom.xml | 0
.../{ => maven-projects}/ci-excludes/.asf.yaml | 0
.../ci-excludes/.github/pull_request_template.md | 0
.../{ => maven-projects}/ci-excludes/.travis.yml | 0
.../{ => maven-projects}/ci-excludes/deploySite.sh | 0
.../{ => maven-projects}/ci-excludes/pom.xml | 0
.../.deployables/org.eclipse.jdt.core.prefs | 0
.../.deployables/org.maven.ide.eclipse.prefs | 0
.../org.eclipse.jdt.core.prefs | 0
.../org.maven.ide.eclipse.prefs | 0
.../.wtpmodules}/org.eclipse.jdt.core.prefs | 0
.../.wtpmodules}/org.maven.ide.eclipse.prefs | 0
.../.deployables}/org.eclipse.jdt.core.prefs | 0
.../.deployables}/org.maven.ide.eclipse.prefs | 0
.../org.eclipse.jdt.core.prefs | 0
.../org.maven.ide.eclipse.prefs | 0
.../.wtpmodules}/org.eclipse.jdt.core.prefs | 0
.../.wtpmodules}/org.maven.ide.eclipse.prefs | 0
.../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
.../main/resources/META-INF/plexus/components.xml | 0
.../test/java/org/apache/assembly/it/AppTest.java | 0
.../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
.../test/java/org/apache/assembly/it/AppTest.java | 0
.../ide-excludes/ide-excludes.iws | 0
.../ide-excludes/maven-eclipse.xml | 0
.../{ => maven-projects}/ide-excludes/pom.xml | 0
.../misc-excludes/.flattened-pom.xml | 0
.../misc-excludes/cobertura.ser | 0
.../{ => 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
.../main/resources/META-INF/plexus/components.xml | 0
.../test/java/org/apache/assembly/it/AppTest.java | 0
.../misc-excludes-child2/cobertura.ser | 0
.../misc-excludes/misc-excludes-child2/pom.xml | 0
.../src/main/java/org/apache/assembly/it/App.java | 0
.../test/java/org/apache/assembly/it/AppTest.java | 0
.../{ => maven-projects}/misc-excludes/pom.xml | 0
.../misc-excludes/pom.xml.releaseBackup | 0
.../misc-excludes/release.properties | 0
.../misc-excludes/some-target.txt | 0
.../output-dir-contains-src-name-child1/pom.xml | 0
.../project/src/main/resources/test.properties | 0
.../output-dir-contains-src-name-child2/pom.xml | 0
.../project/src/main/resources/test.properties | 0
.../output-dir-contains-src-name/pom.xml | 0
.../project/src/main/resources/test.properties | 0
.../{ => maven-projects}/shared-resources/pom.xml | 0
.../shared-resources-child1/pom.xml | 0
.../src/main/java/org/apache/assembly/it/App.java | 0
.../test/java/org/apache/assembly/it/AppTest.java | 0
.../shared-resources-child2/pom.xml | 0
.../src/main/java/org/apache/assembly/it/App.java | 0
.../test/java/org/apache/assembly/it/AppTest.java | 0
.../src-contains-ide-files/pom.xml | 0
.../src-contains-ide-files-child1/pom.xml | 0
.../src/test/resources/.classpath | 0
.../.deployables}/org.eclipse.jdt.core.prefs | 0
.../.deployables}/org.maven.ide.eclipse.prefs | 0
.../org.eclipse.jdt.core.prefs | 0
.../org.maven.ide.eclipse.prefs | 0
.../src/test/resources/.project | 0
.../.settings}/org.eclipse.jdt.core.prefs | 0
.../.settings}/org.maven.ide.eclipse.prefs | 0
.../.wtpmodules}/org.eclipse.jdt.core.prefs | 0
.../.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/test/resources/.classpath | 0
.../.deployables}/org.eclipse.jdt.core.prefs | 0
.../.deployables}/org.maven.ide.eclipse.prefs | 0
.../org.eclipse.jdt.core.prefs | 0
.../org.maven.ide.eclipse.prefs | 0
.../src/test/resources/.project | 0
.../.settings}/org.eclipse.jdt.core.prefs | 0
.../.settings}/org.maven.ide.eclipse.prefs | 0
.../.wtpmodules}/org.eclipse.jdt.core.prefs | 0
.../.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-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
.../{ => maven-projects}/zip-and-tar/pom.xml | 0
.../zip-and-tar/zip-and-tar-child1/pom.xml | 0
.../src/main/java/org/apache/assembly/it/App.java | 0
.../main/resources/META-INF/plexus/components.xml | 0
.../test/java/org/apache/assembly/it/AppTest.java | 0
.../zip-and-tar/zip-and-tar-child2/pom.xml | 0
.../src/main/java/org/apache/assembly/it/App.java | 0
.../test/java/org/apache/assembly/it/AppTest.java | 0
.../resources/.settings/org.eclipse.jdt.core.prefs | 6 ------
.../.settings/org.maven.ide.eclipse.prefs | 9 ---------
.../.wtpmodules/org.eclipse.jdt.core.prefs | 6 ------
.../.wtpmodules/org.maven.ide.eclipse.prefs | 9 ---------
.../src/test/resources/ide-excludes.iml | 9 ---------
.../src/test/resources/ide-excludes.ipr | 9 ---------
143 files changed, 88 insertions(+), 131 deletions(-)
diff --git a/incubator-disclaimer/.checkstyle b/incubator-disclaimer/.checkstyle
new file mode 100644
index 0000000..a2319ac
--- /dev/null
+++ b/incubator-disclaimer/.checkstyle
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+ <local-check-config name="maven-checkstyle-plugin checkstyle-check" location="jar:file:/Users/konradwindszus/.m2/repository/org/apache/maven/shared/maven-shared-resources/5/maven-shared-resources-5.jar!/config/maven_checks_nocodestyle.xml" type="remote" description="maven-checkstyle-plugin configuration checkstyle-check">
+ <property name="checkstyle.header.file" value="/Users/konradwindszus/eclipse-workspaces/maven/.metadata/.plugins/org.eclipse.core.resources/.projects/incubator-disclaimer/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-header-checkstyle-check.txt"/>
+ <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
+ </local-check-config>
+ <fileset name="java-sources-checkstyle-check" enabled="true" check-config-name="maven-checkstyle-plugin checkstyle-check" local="true">
+ <file-match-pattern match-pattern="^src/main/java.*\/.*\.java" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/main/resources/.*\.properties" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/test/resources.*\.properties" include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/jar-txt/.checkstyle b/jar-txt/.checkstyle
new file mode 100644
index 0000000..b93e34e
--- /dev/null
+++ b/jar-txt/.checkstyle
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+ <local-check-config name="maven-checkstyle-plugin checkstyle-check" location="jar:file:/Users/konradwindszus/.m2/repository/org/apache/maven/shared/maven-shared-resources/5/maven-shared-resources-5.jar!/config/maven_checks_nocodestyle.xml" type="remote" description="maven-checkstyle-plugin configuration checkstyle-check">
+ <property name="checkstyle.header.file" value="/Users/konradwindszus/eclipse-workspaces/maven/.metadata/.plugins/org.eclipse.core.resources/.projects/jar-txt/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-header-checkstyle-check.txt"/>
+ <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
+ </local-check-config>
+ <fileset name="java-sources-checkstyle-check" enabled="true" check-config-name="maven-checkstyle-plugin checkstyle-check" local="true">
+ <file-match-pattern match-pattern="^src/main/java.*\/.*\.java" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/main/resources/.*\.properties" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/test/resources.*\.properties" include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/jar/.checkstyle b/jar/.checkstyle
new file mode 100644
index 0000000..d5a39d2
--- /dev/null
+++ b/jar/.checkstyle
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+ <local-check-config name="maven-checkstyle-plugin checkstyle-check" location="jar:file:/Users/konradwindszus/.m2/repository/org/apache/maven/shared/maven-shared-resources/5/maven-shared-resources-5.jar!/config/maven_checks_nocodestyle.xml" type="remote" description="maven-checkstyle-plugin configuration checkstyle-check">
+ <property name="checkstyle.header.file" value="/Users/konradwindszus/eclipse-workspaces/maven/.metadata/.plugins/org.eclipse.core.resources/.projects/jar/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-header-checkstyle-check.txt"/>
+ <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
+ </local-check-config>
+ <fileset name="java-sources-checkstyle-check" enabled="true" check-config-name="maven-checkstyle-plugin checkstyle-check" local="true">
+ <file-match-pattern match-pattern="^src/main/java.*\/.*\.java" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/main/resources/.*\.properties" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/test/resources.*\.properties" include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/license-header/.checkstyle b/license-header/.checkstyle
new file mode 100644
index 0000000..b2b418d
--- /dev/null
+++ b/license-header/.checkstyle
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+ <local-check-config name="maven-checkstyle-plugin checkstyle-check" location="jar:file:/Users/konradwindszus/.m2/repository/org/apache/maven/shared/maven-shared-resources/5/maven-shared-resources-5.jar!/config/maven_checks_nocodestyle.xml" type="remote" description="maven-checkstyle-plugin configuration checkstyle-check">
+ <property name="checkstyle.header.file" value="/Users/konradwindszus/eclipse-workspaces/maven/.metadata/.plugins/org.eclipse.core.resources/.projects/license-header/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-header-checkstyle-check.txt"/>
+ <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
+ </local-check-config>
+ <fileset name="java-sources-checkstyle-check" enabled="true" check-config-name="maven-checkstyle-plugin checkstyle-check" local="true">
+ <file-match-pattern match-pattern="^src/main/java.*\/.*\.java" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/main/resources/.*\.properties" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/test/resources.*\.properties" include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/resources-bundles-sample/.checkstyle b/resources-bundles-sample/.checkstyle
new file mode 100644
index 0000000..84189f6
--- /dev/null
+++ b/resources-bundles-sample/.checkstyle
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+ <local-check-config name="maven-checkstyle-plugin checkstyle-check" location="jar:file:/Users/konradwindszus/.m2/repository/org/apache/maven/shared/maven-shared-resources/5/maven-shared-resources-5.jar!/config/maven_checks_nocodestyle.xml" type="remote" description="maven-checkstyle-plugin configuration checkstyle-check">
+ <property name="checkstyle.header.file" value="/Users/konradwindszus/eclipse-workspaces/maven/.metadata/.plugins/org.eclipse.core.resources/.projects/resources-bundles-sample/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-header-checkstyle-check.txt"/>
+ <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
+ </local-check-config>
+ <fileset name="java-sources-checkstyle-check" enabled="true" check-config-name="maven-checkstyle-plugin checkstyle-check" local="true">
+ <file-match-pattern match-pattern="^src/main/java.*\/.*\.java" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/main/resources.*\.properties" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/test/resources.*\.properties" include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/source-release/.checkstyle b/source-release/.checkstyle
new file mode 100644
index 0000000..386e6b3
--- /dev/null
+++ b/source-release/.checkstyle
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+ <local-check-config name="maven-checkstyle-plugin checkstyle-check" location="jar:file:/Users/konradwindszus/.m2/repository/org/apache/maven/shared/maven-shared-resources/5/maven-shared-resources-5.jar!/config/maven_checks_nocodestyle.xml" type="remote" description="maven-checkstyle-plugin configuration checkstyle-check">
+ <property name="checkstyle.header.file" value="/Users/konradwindszus/eclipse-workspaces/maven/.metadata/.plugins/org.eclipse.core.resources/.projects/source-release/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-header-checkstyle-check.txt"/>
+ <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
+ </local-check-config>
+ <fileset name="java-sources-checkstyle-check" enabled="true" check-config-name="maven-checkstyle-plugin checkstyle-check" local="true">
+ <file-match-pattern match-pattern="^src/main/java.*\/.*\.java" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/main/resources/.*\.properties" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/test/resources/.*\.properties" include-pattern="true"/>
+ </fileset>
+</fileset-config>
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/ide-excludes/.classpath b/source-release/src/test/resources/ide-excludes/.classpath
deleted file mode 100644
index 6625e34..0000000
--- a/source-release/src/test/resources/ide-excludes/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="lib" path="src/test/resources"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/source-release/src/test/resources/ide-excludes/.project b/source-release/src/test/resources/ide-excludes/.project
deleted file mode 100644
index aaac476..0000000
--- a/source-release/src/test/resources/ide-excludes/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>apache-source-release-assembly-descriptor</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.classpath b/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.classpath
deleted file mode 100644
index 6625e34..0000000
--- a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="lib" path="src/test/resources"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.project b/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.project
deleted file mode 100644
index aaac476..0000000
--- a/source-release/src/test/resources/ide-excludes/ide-excludes-child1/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>apache-source-release-assembly-descriptor</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child2/ide-excludes-child2.iml b/source-release/src/test/resources/ide-excludes/ide-excludes-child2/ide-excludes-child2.iml
deleted file mode 100644
index 6625e34..0000000
--- a/source-release/src/test/resources/ide-excludes/ide-excludes-child2/ide-excludes-child2.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="lib" path="src/test/resources"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/source-release/src/test/resources/ide-excludes/ide-excludes-child2/ide-excludes-child2.ipr b/source-release/src/test/resources/ide-excludes/ide-excludes-child2/ide-excludes-child2.ipr
deleted file mode 100644
index 6625e34..0000000
--- a/source-release/src/test/resources/ide-excludes/ide-excludes-child2/ide-excludes-child2.ipr
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="lib" path="src/test/resources"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
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/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-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/.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/ide-excludes/.settings/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/.settings/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/.settings/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/.settings/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/.wtpmodules/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/.wtpmodules/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/.wtpmodules/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/.wtpmodules/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/.deployables/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/.deployables/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/.deployables/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/.deployables/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/.externalToolBuilders/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/.externalToolBuilders/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/.externalToolBuilders/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/.externalToolBuilders/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.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.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/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/ide-excludes/ide-excludes-child1/.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/.deployables/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/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/ide-excludes/ide-excludes-child1/.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/.deployables/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/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/ide-excludes/ide-excludes-child1/.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/.externalToolBuilders/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/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/ide-excludes/ide-excludes-child1/.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/.externalToolBuilders/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/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/.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/.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/.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/.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/.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/.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/.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/.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/.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/.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/.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/.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/.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/.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/.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/.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/ide-excludes/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/ide-excludes/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/ide-excludes/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/ide-excludes/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-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/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/.settings/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-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/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/.settings/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-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/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/.wtpmodules/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-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/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/.wtpmodules/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/.deployables/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/.deployables/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/.deployables/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/.deployables/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/.externalToolBuilders/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/.externalToolBuilders/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/.externalToolBuilders/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/.externalToolBuilders/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-contains-ide-files-child1/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-contains-ide-files-child1/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-contains-ide-files-child1/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-contains-ide-files-child1/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
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/src-contains-ide-files/src/test/resources/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7a16530..0000000
--- a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Thu Aug 06 18:50:54 EDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
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/src-contains-ide-files/src/test/resources/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index b66ab13..0000000
--- a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Thu Aug 06 18:48:42 EDT 2009
-activeProfiles=run-its
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
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/src-contains-ide-files/src/test/resources/.wtpmodules/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7a16530..0000000
--- a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/.wtpmodules/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Thu Aug 06 18:50:54 EDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
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/src-contains-ide-files/src/test/resources/.wtpmodules/org.maven.ide.eclipse.prefs
deleted file mode 100644
index b66ab13..0000000
--- a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/.wtpmodules/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Thu Aug 06 18:48:42 EDT 2009
-activeProfiles=run-its
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/ide-excludes.iml b/source-release/src/test/resources/src-contains-ide-files/src/test/resources/ide-excludes.iml
deleted file mode 100644
index 6625e34..0000000
--- a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/ide-excludes.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="lib" path="src/test/resources"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/ide-excludes.ipr b/source-release/src/test/resources/src-contains-ide-files/src/test/resources/ide-excludes.ipr
deleted file mode 100644
index 6625e34..0000000
--- a/source-release/src/test/resources/src-contains-ide-files/src/test/resources/ide-excludes.ipr
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="lib" path="src/test/resources"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>