You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/04/16 20:28:48 UTC

[maven-archetype] 01/01: Move integration tests maven-archetype-plugin, removing archetype-testing

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git

commit 58ef8906a0e95dc7dfcb92905e2b5243c9308b07
Author: rfscholte <rf...@apache.org>
AuthorDate: Tue Apr 16 22:28:33 2019 +0200

    Move integration tests maven-archetype-plugin, removing archetype-testing
---
 archetype-common/pom.xml                           |  43 +--
 .../archetype/creator/FilesetArchetypeCreator.java |  10 +-
 .../RemoteCatalogArchetypeDataSourceTest.java      | 118 -------
 archetype-testing/archetype-final/pom.xml          | 186 -----------
 .../META-INF/maven/archetype-metadata.xml          |  92 ------
 .../META-INF/maven/archetypes/basic/pom.xml        |  27 --
 .../basic-1.0/archetype-resources/pom.xml          |  43 ---
 .../basic-1.0/archetype-resources/src/main/c/App.c |  12 -
 .../archetype-resources/src/main/java/App.java     |  12 -
 .../src/main/java/inner/package/App2.java          |  12 -
 .../archetype-resources/src/main/mdo/App.mdo       |  12 -
 .../src/main/resources/App.properties              |  12 -
 .../src/main/resources/inner/dir/App2.properties   |  12 -
 .../archetype-resources/src/test/c/AppTest.c       |  12 -
 .../archetype-resources/src/test/java/AppTest.java |  12 -
 .../archetype-resources/src/test/mdo/AppTest.mdo   |  12 -
 .../src/test/resources/AppTest.properties          |  12 -
 .../META-INF/maven/archetype-metadata.xml          | 121 -------
 .../META-INF/maven/archetypes/fileset/pom.xml      |  27 --
 .../fileset-1.0/archetype-resources/pom.xml        |  38 ---
 .../fileset-1.0/archetype-resources/profiles.xml   |  13 -
 .../archetype-resources/src/main/java/App.java     |  13 -
 .../archetype-resources/src/main/java/App.ogg      |  13 -
 .../src/main/java/inner/package/App2.java          |  13 -
 .../src/main/resources/App.properties              |  13 -
 .../src/main/resources/__artifactId__/touch.txt    |  13 -
 .../resources/__rootArtifactId__/touch_root.txt    |  13 -
 .../src/main/resources/some-dir/App.png            |  13 -
 .../archetype-resources/src/site/apt/usage.apt     |  13 -
 .../archetype-resources/src/site/site.xml          |  13 -
 .../archetype-resources/subproject/pom.xml         |  44 ---
 .../subproject/src/main/java/App.java              |  13 -
 .../subproject/subsubproject/pom.xml               |  40 ---
 .../subsubproject/src/main/java/App.java           |  13 -
 ...itraryProperty-__property-with-default-1__.java |  14 -
 ...ned-property__-__property-with-default-2__.java |  14 -
 .../Some__rootArtifactId__Class__artifactId__.java |  14 -
 .../META-INF/archetype-post-generate.groovy        |  10 -
 .../META-INF/maven/archetype-metadata.xml          | 121 -------
 .../archetypes/fileset_with_postscript/pom.xml     |  27 --
 .../archetype-resources/pom.xml                    |  38 ---
 .../archetype-resources/profiles.xml               |  13 -
 .../archetype-resources/src/main/java/App.java     |  13 -
 .../archetype-resources/src/main/java/App.ogg      |  13 -
 .../src/main/java/ToDelete.java                    |   1 -
 .../src/main/java/inner/package/App2.java          |  13 -
 .../src/main/resources/App.properties              |  13 -
 .../src/main/resources/__artifactId__/touch.txt    |  13 -
 .../resources/__rootArtifactId__/touch_root.txt    |  13 -
 .../src/main/resources/some-dir/App.png            |  13 -
 .../archetype-resources/src/site/apt/usage.apt     |  13 -
 .../archetype-resources/src/site/site.xml          |  13 -
 .../archetype-resources/subproject/pom.xml         |  44 ---
 .../subproject/src/main/java/App.java              |  13 -
 .../subproject/subsubproject/pom.xml               |  40 ---
 .../subsubproject/src/main/java/App.java           |  13 -
 ...itraryProperty-__property-with-default-1__.java |  14 -
 ...ned-property__-__property-with-default-2__.java |  14 -
 .../Some__rootArtifactId__Class__artifactId__.java |  14 -
 .../test/archetypes/old-1.0/META-INF/archetype.xml |  31 --
 .../old-1.0/META-INF/maven/archetypes/old/pom.xml  |  27 --
 .../archetypes/old-1.0/archetype-resources/pom.xml |  39 ---
 .../archetype-resources/src/main/java/App.java     |   4 -
 .../src/main/resources/App.properties              |   4 -
 .../old-1.0/archetype-resources/src/site/site.xml  |   4 -
 .../META-INF/maven/archetype-metadata.xml          |  37 ---
 .../META-INF/maven/archetypes/partial/pom.xml      |  27 --
 .../partial-1.0/archetype-resources/pom.xml        |  61 ----
 .../archetype-resources/src/main/java/App.java     |   4 -
 .../archetype-resources/src/test/java/AppTest.java |   4 -
 .../site-1.0/META-INF/maven/archetype-metadata.xml |  55 ----
 .../META-INF/maven/archetypes/site/pom.xml         |  27 --
 .../site-1.0/archetype-resources/pom.xml           |  33 --
 .../archetype-resources/src/site/apt/test.apt      |  12 -
 .../site-1.0/archetype-resources/src/site/site.xml |  12 -
 .../archetype/test/ArchetyperRoundtripIT.java      | 277 ----------------
 .../test/ArchetyperRoundtripWithProxyIT.java       | 276 ----------------
 .../archetype/test/RoundtripMultiModuleIT.java     | 346 --------------------
 .../resources/projects/roundtrip-2-project/pom.xml |  38 ---
 .../src/main/java/org/apache/maven/test/App.java   |  32 --
 .../test/java/org/apache/maven/test/AppTest.java   |  57 ----
 .../repositories/central/archetype-catalog.xml     |  30 --
 .../src/test/resources/repositories/central/dummy  |   0
 .../src/test/resources/repositories/local/dummy    |   0
 archetype-testing/archetype-proxy/pom.xml          |  81 -----
 .../apache/maven/archetype/proxy/ProxyServlet.java | 356 ---------------------
 .../maven/archetype/proxy/RepositoryServlet.java   | 265 ---------------
 .../src/main/webapp/WEB-INF/web.xml                |  34 --
 archetype-testing/archetype-repository/pom.xml     |  87 -----
 .../archetype/repository/RepositoryServlet.java    |  84 -----
 .../2.1.1/maven-clean-plugin-2.1.1.jar             | Bin 6200 -> 0 bytes
 .../2.1.1/maven-clean-plugin-2.1.1.jar.sha1        |   1 -
 .../2.1.1/maven-clean-plugin-2.1.1.pom             |  73 -----
 .../2.1.1/maven-clean-plugin-2.1.1.pom.sha1        |   1 -
 .../plugins/maven-clean-plugin/maven-metadata.xml  |  31 --
 .../org/apache/maven/plugins/maven-metadata.xml    |  28 --
 .../src/main/webapp/WEB-INF/web.xml                |  30 --
 archetype-testing/pom.xml                          |  44 ---
 archetype-testing/src/site/site.xml                |  28 --
 maven-archetype-plugin/pom.xml                     |   4 +
 .../roundtrip-1-project/archetype.properties       |  18 ++
 .../roundtrip-1-project/invoker.properties         |  25 ++
 .../it/projects/roundtrip-1-project/project.pom    |   0
 .../src/main/java/org/apache/maven/test/App.java   |   0
 .../test/java/org/apache/maven/test/AppTest.java   |   0
 .../roundtrip-1-project/test-generate.properties   |  27 ++
 .../it/projects/roundtrip-1-project/verify.groovy  |  38 +++
 .../src/it/projects/roundtrip-multi}/.checkstyle   |   0
 .../src/it/projects/roundtrip-multi}/.classpath    |   0
 .../projects/roundtrip-multi/archetype.properties  |  18 ++
 .../it/projects/roundtrip-multi/invoker.properties |  24 ++
 .../src/it}/projects/roundtrip-multi/pom.xml       |   0
 .../roundtrip-multi/proficio-api}/.checkstyle      |   0
 .../roundtrip-multi/proficio-api}/.classpath       |   0
 .../projects/roundtrip-multi/proficio-api/pom.xml  |   0
 .../main/java/com/company/proficio/api/Api.java    |   0
 .../roundtrip-multi/proficio-cli}/.checkstyle      |   0
 .../roundtrip-multi/proficio-cli}/.classpath       |   0
 .../projects/roundtrip-multi/proficio-cli/pom.xml  |   0
 .../main/java/com/company/proficio/cli/Cli.java    |   0
 .../roundtrip-multi/proficio-core/.checkstyle      |   0
 .../roundtrip-multi/proficio-core/.classpath       |   0
 .../projects/roundtrip-multi/proficio-core/pom.xml |   0
 .../main/java/com/company/proficio/core/Core.java  |   0
 .../roundtrip-multi/proficio-model}/.checkstyle    |   0
 .../roundtrip-multi/proficio-model}/.classpath     |   0
 .../roundtrip-multi/proficio-model/pom.xml         |   0
 .../java/org/company/proficio/model/Model.java     |   0
 .../roundtrip-multi/proficio-stores/pom.xml        |   0
 .../proficio-store-memory}/.checkstyle             |   0
 .../proficio-store-memory}/.classpath              |   0
 .../proficio-stores/proficio-store-memory/pom.xml  |   0
 .../com/company/proficio/store/memory/Memory.java  |   0
 .../proficio-store-xstream}/.checkstyle            |   0
 .../proficio-store-xstream}/.classpath             |   0
 .../proficio-stores/proficio-store-xstream/pom.xml |   0
 .../company/proficio/store/xstream/XStream.java    |   0
 .../it}/projects/roundtrip-multi/src/site/site.xml |   0
 .../roundtrip-multi/test-generate.properties       |  27 ++
 .../src/it/projects/roundtrip-multi/verify.groovy  |  33 ++
 .../mojos/CreateProjectFromArchetypeMojo.java      |   8 +-
 pom.xml                                            |   1 -
 142 files changed, 224 insertions(+), 4165 deletions(-)

diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
index 078024e..4eb88d2 100644
--- a/archetype-common/pom.xml
+++ b/archetype-common/pom.xml
@@ -166,28 +166,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>6.1.11</version>
-      <scope>test</scope>
-    </dependency>
-
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>archetype-repository</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>archetype-proxy</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
@@ -247,26 +225,7 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy</id>
-            <phase>process-test-resources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/wars</outputDirectory>
-              <overWriteReleases>true</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-              <includeTypes>war</includeTypes>
-              <stripVersion>true</stripVersion>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
diff --git a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
index 86ffc22..7d511bc 100644
--- a/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
+++ b/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
@@ -182,7 +182,7 @@ public class FilesetArchetypeCreator
 
             String packageName = configurationProperties.getProperty( Constants.PACKAGE );
 
-            Model pom = pomManager.readPom( FileUtils.resolveFile( basedir, Constants.ARCHETYPE_POM ) );
+            Model pom = pomManager.readPom( project.getFile() );
 
             List<String> excludePatterns =
                 configurationProperties.getProperty( Constants.EXCLUDE_PATTERNS ) != null
@@ -241,7 +241,7 @@ public class FilesetArchetypeCreator
 
             createPoms( pom, configurationProperties.getProperty( Constants.ARTIFACT_ID ),
                         configurationProperties.getProperty( Constants.ARTIFACT_ID ), archetypeFilesDirectory, basedir,
-                        pomReversedProperties, preserveCData, keepParent );
+                        project.getFile(), pomReversedProperties, preserveCData, keepParent );
             getLogger().debug( "Created Archetype " + archetypeDescriptor.getName() + " template pom(s)" );
 
             
@@ -532,7 +532,8 @@ public class FilesetArchetypeCreator
     }
 
     private void createPoms( Model pom, String rootArtifactId, String artifactId, File archetypeFilesDirectory,
-                             File basedir, Properties pomReversedProperties, boolean preserveCData, boolean keepParent )
+                             File basedir, File rootPom, Properties pomReversedProperties, boolean preserveCData,
+                             boolean keepParent )
         throws IOException, FileNotFoundException, XmlPullParserException
     {
         setArtifactId( pomReversedProperties, pom.getArtifactId() );
@@ -554,8 +555,7 @@ public class FilesetArchetypeCreator
         restoreParentArtifactId( pomReversedProperties, null );
         restoreArtifactId( pomReversedProperties, artifactId );
 
-        createArchetypePom( pom, archetypeFilesDirectory, pomReversedProperties,
-                            FileUtils.resolveFile( basedir, Constants.ARCHETYPE_POM ), preserveCData, keepParent );
+        createArchetypePom( pom, archetypeFilesDirectory, pomReversedProperties, rootPom, preserveCData, keepParent );
     }
 
     private String getPackageInPathFormat( String aPackage )
diff --git a/archetype-common/src/test/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSourceTest.java b/archetype-common/src/test/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSourceTest.java
deleted file mode 100644
index 300da23..0000000
--- a/archetype-common/src/test/java/org/apache/maven/archetype/source/RemoteCatalogArchetypeDataSourceTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package org.apache.maven.archetype.source;
-
-/*
- *  Copyright 2007 rafale.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  under the License.
- */
-
-import java.io.FileWriter;
-import java.io.File;
-import java.io.Writer;
-
-import org.apache.maven.archetype.ArchetypeManager;
-import org.apache.maven.archetype.catalog.Archetype;
-import org.apache.maven.archetype.catalog.ArchetypeCatalog;
-import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
-import org.apache.maven.artifact.repository.MavenArtifactRepository;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-import org.apache.maven.plugin.LegacySupport;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.apache.maven.project.DefaultProjectBuildingRequest;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
-
-public class RemoteCatalogArchetypeDataSourceTest extends AbstractMojoTestCase
-{
-    private Server server;
-
-    int port;
-
-    @Override
-    protected void setUp()
-        throws Exception
-    {
-        super.setUp();
-
-        System.setProperty( "org.apache.maven.archetype.repository.directory",
-                            getTestPath( "target/test-classes/repositories/test-catalog" ) );
-
-        // Start Jetty
-        server = new Server( 0 );
-
-        WebAppContext webapp = new WebAppContext();
-        webapp.setContextPath( "/repo" );
-        webapp.setWar( "target/wars/archetype-repository.war" );
-        server.setHandler( webapp );
-
-        server.start();
-
-        port = server.getConnectors()[0].getLocalPort();
-
-        File catalogDirectory = getTestFile( "target/test-classes/repositories/test-catalog" );
-        catalogDirectory.mkdirs();
-
-        getTestFile( "target/test-classes/repositories/test-catalog/dummy" ).createNewFile();
-
-        ArchetypeCatalog catalog = new ArchetypeCatalog();
-        Archetype generatedArchetype = new Archetype();
-        generatedArchetype.setGroupId( "groupId" );
-        generatedArchetype.setArtifactId( "artifactId" );
-        generatedArchetype.setVersion( "1" );
-        generatedArchetype.setRepository( "http://localhost:" + port + "/repo/" );
-        catalog.addArchetype( generatedArchetype );
-
-        File catalogFile = new File( catalogDirectory, "archetype-catalog.xml" );
-        ArchetypeCatalogXpp3Writer catalogWriter = new ArchetypeCatalogXpp3Writer();
-        try ( Writer writer = new FileWriter( catalogFile ) )
-        {
-            catalogWriter.write( writer, catalog );
-        }
-    }
-
-    @Override
-    protected void tearDown()
-        throws Exception
-    {
-        super.tearDown();
-        // Stop Jetty
-        server.stop();
-    }
-    
-    public void testRemoteCatalog()
-        throws Exception
-    {
-        ArchetypeManager archetype = lookup( ArchetypeManager.class );
-        
-        LegacySupport legacySupport = lookup( LegacySupport.class );
-        legacySupport.setSession( newMavenSession( new MavenProjectStub() ) );
-
-        ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
-        buildingRequest.getRemoteRepositories().add( new MavenArtifactRepository( "central",
-                                                                                  "http://localhost:" + port + "/repo/",
-                                                                                  new DefaultRepositoryLayout(), null,
-                                                                                  null ) );
-
-        ArchetypeCatalog result = archetype.getRemoteCatalog( buildingRequest );
-
-        assertEquals( 1, result.getArchetypes().size() );
-        assertEquals( "groupId", result.getArchetypes().get( 0 ).getGroupId() );
-        assertEquals( "artifactId", result.getArchetypes().get( 0 ).getArtifactId() );
-        assertEquals( "1", result.getArchetypes().get( 0 ).getVersion() );
-        assertEquals( "http://localhost:" + port + "/repo/", result.getArchetypes().get( 0 ).getRepository() );
-    }
-
-}
diff --git a/archetype-testing/archetype-final/pom.xml b/archetype-testing/archetype-final/pom.xml
deleted file mode 100644
index 1fedddf..0000000
--- a/archetype-testing/archetype-final/pom.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <artifactId>archetype-testing</artifactId>
-    <groupId>org.apache.maven.archetype</groupId>
-    <version>3.0.2-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>archetype-final</artifactId>
-  <packaging>jar</packaging> <!-- to compile test-classes -->
-
-  <name>Maven Archetype Testing Final</name>
-
-  <properties>
-    <cargoVersion>1.0-alpha-6</cargoVersion>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.archetype</groupId>
-      <artifactId>archetype-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.archetype</groupId>
-      <artifactId>archetype-packaging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-archetype-plugin</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugin-testing</groupId>
-      <artifactId>maven-plugin-testing-harness</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>6.1.11</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-file</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.sonatype.aether</groupId>
-      <artifactId>aether-connector-wagon</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>archetype-repository</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>archetype-proxy</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <configuration>
-          <excludes combine.children="append">
-            <exclude>src/test/archetypes/**</exclude>
-            <exclude>src/test/repository/**/*.jar</exclude>
-            <exclude>src/test/resources/**/.checkstyle</exclude>
-            <exclude>src/test/resources/**/.classpath</exclude>
-            <exclude>src/test/resources/**/dummy</exclude>
-            <exclude>src/test/resources/**/META-INF/MANIFEST.MF</exclude>
-            <exclude>src/test/resources/**/*.ogg</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy</id>
-            <phase>process-test-resources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/wars</outputDirectory>
-              <overWriteReleases>true</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-              <includeTypes>war</includeTypes>
-              <stripVersion>true</stripVersion>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-invoker-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>install</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <localRepositoryPath>target/test-classes/repositories/local</localRepositoryPath>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.19.1</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <systemPropertyVariables>
-            <maven.home>${maven.home}</maven.home>
-            <java.io.tmpdir>${project.build.outputDirectory}</java.io.tmpdir>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/META-INF/maven/archetype-metadata.xml b/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 1a061c4..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<archetype-descriptor name="basic">
-
-  <requiredProperties>
-    <requiredProperty key="property-with-default-1">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-with-default-2">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-with-default-3">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-with-default-4">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-without-default-1"/>
-    <requiredProperty key="property-without-default-2"/>
-    <requiredProperty key="property-without-default-3"/>
-    <requiredProperty key="property-without-default-4"/>
-  </requiredProperties>
-
-  <fileSets>
-    <fileSet filtered="true" packaged="true">
-      <directory>src/main/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="true">
-      <directory>src/main/c</directory>
-      <includes>
-        <include>**/*.c</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="true">
-      <directory>src/test/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="true">
-      <directory>src/test/c</directory>
-      <includes>
-        <include>**/*.c</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="false">
-      <directory>src/main/resources</directory>
-      <includes>
-        <include>**/*.properties</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="false">
-      <directory>src/main/mdo</directory>
-      <includes>
-        <include>**/*.mdo</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="false">
-      <directory>src/test/resources</directory>
-      <includes>
-        <include>**/*.properties</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="false">
-      <directory>src/test/mdo</directory>
-      <includes>
-        <include>**/*.mdo</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-
-</archetype-descriptor>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/META-INF/maven/archetypes/basic/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/META-INF/maven/archetypes/basic/pom.xml
deleted file mode 100644
index a00a8c3..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/META-INF/maven/archetypes/basic/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>archetypes</groupId>
-  <artifactId>basic</artifactId>
-  <version>1.0</version>
-</project>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/pom.xml
deleted file mode 100644
index bb055cf..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>
-
-  <name>Maven archetype Test</name>
-  <packaging>jar</packaging>
-
-  <properties>
-    <empty></empty>
-  </properties>
-
-  <!-- comment in prototype pom -->
-  <dependencies>
-    <!-- empty dependencies, with comments -->
-  </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/c/App.c b/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/c/App.c
deleted file mode 100644
index fb8cea5..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/c/App.c
+++ /dev/null
@@ -1,12 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/java/App.java b/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/java/App.java
deleted file mode 100644
index 2176fc9..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/java/App.java
+++ /dev/null
@@ -1,12 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/java/inner/package/App2.java b/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/java/inner/package/App2.java
deleted file mode 100644
index 2176fc9..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/java/inner/package/App2.java
+++ /dev/null
@@ -1,12 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/mdo/App.mdo b/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/mdo/App.mdo
deleted file mode 100644
index ceecd7a..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/mdo/App.mdo
+++ /dev/null
@@ -1,12 +0,0 @@
-groupId=${groupId}
-  artifactId=${artifactId}
-  version=${version}
-  package=${package}
-  property-without-default-1=${property-without-default-1}
-  property-without-default-2=${property-without-default-2}
-  property-without-default-3=${property-without-default-3}
-  property-without-default-4=${property-without-default-4}
-  property-with-default-1=${property-with-default-1}
-  property-with-default-2=${property-with-default-2}
-  property-with-default-3=${property-with-default-3}
-  property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/resources/App.properties b/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/resources/App.properties
deleted file mode 100644
index 2176fc9..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/resources/App.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/resources/inner/dir/App2.properties b/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/resources/inner/dir/App2.properties
deleted file mode 100644
index 2176fc9..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/main/resources/inner/dir/App2.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/test/c/AppTest.c b/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/test/c/AppTest.c
deleted file mode 100644
index 2176fc9..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/test/c/AppTest.c
+++ /dev/null
@@ -1,12 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/test/java/AppTest.java b/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/test/java/AppTest.java
deleted file mode 100644
index 2176fc9..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/test/java/AppTest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/test/mdo/AppTest.mdo b/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/test/mdo/AppTest.mdo
deleted file mode 100644
index ceecd7a..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/test/mdo/AppTest.mdo
+++ /dev/null
@@ -1,12 +0,0 @@
-groupId=${groupId}
-  artifactId=${artifactId}
-  version=${version}
-  package=${package}
-  property-without-default-1=${property-without-default-1}
-  property-without-default-2=${property-without-default-2}
-  property-without-default-3=${property-without-default-3}
-  property-without-default-4=${property-without-default-4}
-  property-with-default-1=${property-with-default-1}
-  property-with-default-2=${property-with-default-2}
-  property-with-default-3=${property-with-default-3}
-  property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/test/resources/AppTest.properties b/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/test/resources/AppTest.properties
deleted file mode 100644
index 2176fc9..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/basic-1.0/archetype-resources/src/test/resources/AppTest.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/META-INF/maven/archetype-metadata.xml b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 6b2523a..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<archetype-descriptor name="fileset" partial="false">
-
-  <requiredProperties>
-    <requiredProperty key="property-with-default-1">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-with-default-2">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-with-default-3">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-with-default-4">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-without-default-1"/>
-    <requiredProperty key="property-without-default-2"/>
-    <requiredProperty key="property-without-default-3"/>
-    <requiredProperty key="property-without-default-4"/>
-  </requiredProperties>
-
-  <fileSets>
-    <fileSet filtered="true" packaged="true">
-      <directory>src/main/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="false" packaged="true">
-      <directory>src/main/java</directory>
-      <includes>
-        <include>**/*.ogg</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="false">
-      <directory>src/main/resources</directory>
-      <includes>
-        <include>**/*.properties</include>
-        <include>**/*.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="false" packaged="false">
-      <directory>src/main/resources</directory>
-      <includes>
-        <include>**/*.png</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="false">
-      <directory>src/site</directory>
-      <includes>
-        <include>**/*.xml</include>
-        <include>**/*.apt</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true">
-      <directory></directory>
-      <includes>
-        <include>.classpath</include>
-        <include>*.xml</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="false" packaged="false">
-      <directory>src/main/toto</directory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-
-  <modules>
-    <module name="subproject" id="subproject" dir="subproject">
-      <fileSets>
-        <fileSet filtered="true" packaged="true">
-          <directory>src/main/java</directory>
-          <includes>
-            <include>**/*.java</include>
-          </includes>
-        </fileSet>
-        <fileSet filtered="true" packaged="false">
-          <directory>src/main/toto</directory>
-          <includes>
-            <include>**/*</include>
-          </includes>
-        </fileSet>
-      </fileSets>
-
-      <modules>
-        <module name="subsubproject" id="subsubproject" dir="subsubproject">
-          <fileSets>
-            <fileSet filtered="true" packaged="true">
-              <directory>src/main/java</directory>
-              <includes>
-                <include>**/*.java</include>
-              </includes>
-            </fileSet>
-          </fileSets>
-        </module>
-      </modules>
-    </module>
-  </modules>
-
-</archetype-descriptor>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/META-INF/maven/archetypes/fileset/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/META-INF/maven/archetypes/fileset/pom.xml
deleted file mode 100644
index b7422de..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/META-INF/maven/archetypes/fileset/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>archetypes</groupId>
-  <artifactId>fileset</artifactId>
-  <version>1.0</version>
-</project>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/pom.xml
deleted file mode 100644
index 33d6dcf..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>
-
-  <name>Maven archetype Test</name>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>subproject</module>
-  </modules>
-
-</project>
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/profiles.xml b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/profiles.xml
deleted file mode 100644
index 8fedfdf..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/profiles.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/java/App.java b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/java/App.java
deleted file mode 100644
index 8fedfdf..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/java/App.java
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/java/App.ogg b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/java/App.ogg
deleted file mode 100644
index 8fedfdf..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/java/App.ogg
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/java/inner/package/App2.java b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/java/inner/package/App2.java
deleted file mode 100644
index 8fedfdf..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/java/inner/package/App2.java
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/App.properties b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/App.properties
deleted file mode 100644
index 8fedfdf..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/App.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__artifactId__/touch.txt b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__artifactId__/touch.txt
deleted file mode 100644
index 8fedfdf..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__artifactId__/touch.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__rootArtifactId__/touch_root.txt b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__rootArtifactId__/touch_root.txt
deleted file mode 100644
index 8fedfdf..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/__rootArtifactId__/touch_root.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/some-dir/App.png b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/some-dir/App.png
deleted file mode 100644
index d34de6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/main/resources/some-dir/App.png
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/site/apt/usage.apt b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/site/apt/usage.apt
deleted file mode 100644
index 8fedfdf..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/site/apt/usage.apt
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/site/site.xml b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/site/site.xml
deleted file mode 100644
index 8fedfdf..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/src/site/site.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/pom.xml
deleted file mode 100644
index 3ae5c9a..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>${groupId}</groupId>
-    <artifactId>${parentArtifactId}</artifactId>
-    <version>${version}</version>
-  </parent>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>
-
-  <name>Maven archetype Test Subfolder</name>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>subsubproject</module>
-  </modules>
-
-</project>
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/src/main/java/App.java b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/src/main/java/App.java
deleted file mode 100644
index 8fedfdf..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/src/main/java/App.java
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/pom.xml
deleted file mode 100644
index 4c2bc23..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>${groupId}</groupId>
-    <artifactId>${parentArtifactId}</artifactId>
-    <version>${version}</version>
-  </parent>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>
-
-  <name>Maven archetype Test Subsubfolder</name>
-  <packaging>jar</packaging>
-
-</project>
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/App.java b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/App.java
deleted file mode 100644
index 8fedfdf..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/App.java
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/ArbitraryProperty-__property-with-default-1__.java b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/ArbitraryProperty-__property-with-default-1__.java
deleted file mode 100644
index e6a5a6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/ArbitraryProperty-__property-with-default-1__.java
+++ /dev/null
@@ -1,14 +0,0 @@
-groupId=${groupId}
-rootArtifactId=${rootArtifactId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/SkipsUndefinedProperty-__undefined-property__-__property-with-default-2__.java b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/SkipsUndefinedProperty-__undefined-property__-__property-with-default-2__.java
deleted file mode 100644
index e6a5a6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/SkipsUndefinedProperty-__undefined-property__-__property-with-default-2__.java
+++ /dev/null
@@ -1,14 +0,0 @@
-groupId=${groupId}
-rootArtifactId=${rootArtifactId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/__rootArtifactId__/inner/__artifactId__/innest/Some__rootArtifactId__Class__artifactId__.java b/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/__rootArtifactId__/inner/__artifactId__/innest/Some__rootArtifactId__Class__artifactId__.java
deleted file mode 100644
index e6a5a6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset-1.0/archetype-resources/subproject/subsubproject/src/main/java/__rootArtifactId__/inner/__artifactId__/innest/Some__rootArtifactId__Class__artifactId__.java
+++ /dev/null
@@ -1,14 +0,0 @@
-groupId=${groupId}
-rootArtifactId=${rootArtifactId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/META-INF/archetype-post-generate.groovy b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/META-INF/archetype-post-generate.groovy
deleted file mode 100644
index 3ac5757..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/META-INF/archetype-post-generate.groovy
+++ /dev/null
@@ -1,10 +0,0 @@
-println "Executing the archetype-post-generate.groovy script...";
-
-def outputDirectory = new File( request.getOutputDirectory() );
-
-def packageFolder = request.getPackage().replace( '.', '/' );
-
-def toDelete = new File( outputDirectory, request.getArtifactId() + "/src/main/java/${packageFolder}/ToDelete.java" );
-
-println "Removing file: " + toDelete;
-assert toDelete.delete();
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/META-INF/maven/archetype-metadata.xml b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 6b2523a..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<archetype-descriptor name="fileset" partial="false">
-
-  <requiredProperties>
-    <requiredProperty key="property-with-default-1">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-with-default-2">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-with-default-3">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-with-default-4">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-without-default-1"/>
-    <requiredProperty key="property-without-default-2"/>
-    <requiredProperty key="property-without-default-3"/>
-    <requiredProperty key="property-without-default-4"/>
-  </requiredProperties>
-
-  <fileSets>
-    <fileSet filtered="true" packaged="true">
-      <directory>src/main/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="false" packaged="true">
-      <directory>src/main/java</directory>
-      <includes>
-        <include>**/*.ogg</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="false">
-      <directory>src/main/resources</directory>
-      <includes>
-        <include>**/*.properties</include>
-        <include>**/*.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="false" packaged="false">
-      <directory>src/main/resources</directory>
-      <includes>
-        <include>**/*.png</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="false">
-      <directory>src/site</directory>
-      <includes>
-        <include>**/*.xml</include>
-        <include>**/*.apt</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true">
-      <directory></directory>
-      <includes>
-        <include>.classpath</include>
-        <include>*.xml</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="false" packaged="false">
-      <directory>src/main/toto</directory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-
-  <modules>
-    <module name="subproject" id="subproject" dir="subproject">
-      <fileSets>
-        <fileSet filtered="true" packaged="true">
-          <directory>src/main/java</directory>
-          <includes>
-            <include>**/*.java</include>
-          </includes>
-        </fileSet>
-        <fileSet filtered="true" packaged="false">
-          <directory>src/main/toto</directory>
-          <includes>
-            <include>**/*</include>
-          </includes>
-        </fileSet>
-      </fileSets>
-
-      <modules>
-        <module name="subsubproject" id="subsubproject" dir="subsubproject">
-          <fileSets>
-            <fileSet filtered="true" packaged="true">
-              <directory>src/main/java</directory>
-              <includes>
-                <include>**/*.java</include>
-              </includes>
-            </fileSet>
-          </fileSets>
-        </module>
-      </modules>
-    </module>
-  </modules>
-
-</archetype-descriptor>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/META-INF/maven/archetypes/fileset_with_postscript/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/META-INF/maven/archetypes/fileset_with_postscript/pom.xml
deleted file mode 100644
index b7422de..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/META-INF/maven/archetypes/fileset_with_postscript/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>archetypes</groupId>
-  <artifactId>fileset</artifactId>
-  <version>1.0</version>
-</project>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/pom.xml
deleted file mode 100644
index 6c34c7b..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>
-
-  <name>Maven archetype Test</name>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>subproject</module>
-  </modules>
-
-</project>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/profiles.xml b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/profiles.xml
deleted file mode 100644
index d34de6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/profiles.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/java/App.java b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/java/App.java
deleted file mode 100644
index d34de6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/java/App.java
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/java/App.ogg b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/java/App.ogg
deleted file mode 100644
index d34de6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/java/App.ogg
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/java/ToDelete.java b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/java/ToDelete.java
deleted file mode 100644
index 3c74a80..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/java/ToDelete.java
+++ /dev/null
@@ -1 +0,0 @@
-This file must be deleted by the post-create script.
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/java/inner/package/App2.java b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/java/inner/package/App2.java
deleted file mode 100644
index d34de6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/java/inner/package/App2.java
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/resources/App.properties b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/resources/App.properties
deleted file mode 100644
index d34de6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/resources/App.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/resources/__artifactId__/touch.txt b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/resources/__artifactId__/touch.txt
deleted file mode 100644
index d34de6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/resources/__artifactId__/touch.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/resources/__rootArtifactId__/touch_root.txt b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/resources/__rootArtifactId__/touch_root.txt
deleted file mode 100644
index d34de6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/resources/__rootArtifactId__/touch_root.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/resources/some-dir/App.png b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/resources/some-dir/App.png
deleted file mode 100644
index d34de6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/main/resources/some-dir/App.png
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/site/apt/usage.apt b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/site/apt/usage.apt
deleted file mode 100644
index d34de6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/site/apt/usage.apt
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/site/site.xml b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/site/site.xml
deleted file mode 100644
index d34de6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/src/site/site.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/pom.xml
deleted file mode 100644
index f74a253..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>${groupId}</groupId>
-    <artifactId>${parentArtifactId}</artifactId>
-    <version>${version}</version>
-  </parent>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>
-
-  <name>Maven archetype Test Subfolder</name>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>subsubproject</module>
-  </modules>
-
-</project>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/src/main/java/App.java b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/src/main/java/App.java
deleted file mode 100644
index d34de6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/src/main/java/App.java
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/subsubproject/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/subsubproject/pom.xml
deleted file mode 100644
index dfbf01b..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/subsubproject/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>${groupId}</groupId>
-    <artifactId>${parentArtifactId}</artifactId>
-    <version>${version}</version>
-  </parent>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>
-
-  <name>Maven archetype Test Subsubfolder</name>
-  <packaging>jar</packaging>
-
-</project>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/subsubproject/src/main/java/App.java b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/subsubproject/src/main/java/App.java
deleted file mode 100644
index d34de6e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/subsubproject/src/main/java/App.java
+++ /dev/null
@@ -1,13 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/subsubproject/src/main/java/ArbitraryProperty-__property-with-default-1__.java b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/subsubproject/src/main/java/ArbitraryProperty-__property-with-default-1__.java
deleted file mode 100644
index c6837ac..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/subsubproject/src/main/java/ArbitraryProperty-__property-with-default-1__.java
+++ /dev/null
@@ -1,14 +0,0 @@
-groupId=${groupId}
-rootArtifactId=${rootArtifactId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/subsubproject/src/main/java/SkipsUndefinedProperty-__undefined-property__-__property-with-default-2__.java b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/subsubproject/src/main/java/SkipsUndefinedProperty-__undefined-property__-__property-with-default-2__.java
deleted file mode 100644
index c6837ac..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/subsubproject/src/main/java/SkipsUndefinedProperty-__undefined-property__-__property-with-default-2__.java
+++ /dev/null
@@ -1,14 +0,0 @@
-groupId=${groupId}
-rootArtifactId=${rootArtifactId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/subsubproject/src/main/java/__rootArtifactId__/inner/__artifactId__/innest/Some__rootArtifactId__Class__artifactId__.java b/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/subsubproject/src/main/java/__rootArtifactId__/inner/__artifactId__/innest/Some__rootArtifactId__Class__artifactId__.java
deleted file mode 100644
index c6837ac..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/fileset_with_postscript-1.0/archetype-resources/subproject/subsubproject/src/main/java/__rootArtifactId__/inner/__artifactId__/innest/Some__rootArtifactId__Class__artifactId__.java
+++ /dev/null
@@ -1,14 +0,0 @@
-groupId=${groupId}
-rootArtifactId=${rootArtifactId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-packageInPathFormat=${packageInPathFormat}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/old-1.0/META-INF/archetype.xml b/archetype-testing/archetype-final/src/test/archetypes/old-1.0/META-INF/archetype.xml
deleted file mode 100644
index d620e84..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/old-1.0/META-INF/archetype.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<archetype>
-  <id>old</id>
-  <sources>
-    <source>src/main/java/App.java</source>
-  </sources>
-  <resources>
-    <resource>src/main/resources/App.properties</resource>
-  </resources>
-  <siteResources>
-    <resource>src/site/site.xml</resource>
-  </siteResources>
-</archetype>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/old-1.0/META-INF/maven/archetypes/old/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/old-1.0/META-INF/maven/archetypes/old/pom.xml
deleted file mode 100644
index e5b97e5..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/old-1.0/META-INF/maven/archetypes/old/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>archetypes</groupId>
-  <artifactId>old</artifactId>
-  <version>1.0</version>
-</project>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/old-1.0/archetype-resources/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/old-1.0/archetype-resources/pom.xml
deleted file mode 100644
index e13e2cd..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/old-1.0/archetype-resources/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>
-
-  <name>Maven archetype Test Old archetype</name>
-  <packaging>jar</packaging>
-
-  <!-- comment in prototype pom -->
-  <dependencies>
-    <!-- empty dependencies, with comments -->
-  </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/old-1.0/archetype-resources/src/main/java/App.java b/archetype-testing/archetype-final/src/test/archetypes/old-1.0/archetype-resources/src/main/java/App.java
deleted file mode 100644
index 882084f..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/old-1.0/archetype-resources/src/main/java/App.java
+++ /dev/null
@@ -1,4 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/old-1.0/archetype-resources/src/main/resources/App.properties b/archetype-testing/archetype-final/src/test/archetypes/old-1.0/archetype-resources/src/main/resources/App.properties
deleted file mode 100644
index 882084f..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/old-1.0/archetype-resources/src/main/resources/App.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/old-1.0/archetype-resources/src/site/site.xml b/archetype-testing/archetype-final/src/test/archetypes/old-1.0/archetype-resources/src/site/site.xml
deleted file mode 100644
index 54fc7b9..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/old-1.0/archetype-resources/src/site/site.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-groupId=${groupId}
-  artifactId=${artifactId}
-  version=${version}
-  package=${package}
diff --git a/archetype-testing/archetype-final/src/test/archetypes/partial-1.0/META-INF/maven/archetype-metadata.xml b/archetype-testing/archetype-final/src/test/archetypes/partial-1.0/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 57da3fc..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/partial-1.0/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<archetype-descriptor name="partial" partial="true">
-
-  <fileSets>
-    <fileSet filtered="true" packaged="true">
-      <directory>src/main/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" packaged="true">
-      <directory>src/test/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-
-</archetype-descriptor>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/partial-1.0/META-INF/maven/archetypes/partial/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/partial-1.0/META-INF/maven/archetypes/partial/pom.xml
deleted file mode 100644
index 8df2ff4..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/partial-1.0/META-INF/maven/archetypes/partial/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>archetypes</groupId>
-  <artifactId>partial</artifactId>
-  <version>1.0</version>
-</project>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/partial-1.0/archetype-resources/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/partial-1.0/archetype-resources/pom.xml
deleted file mode 100644
index ce15f3e..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/partial-1.0/archetype-resources/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>
-
-  <name>Maven archetype Test partial</name>
-  <packaging>jar</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0</version>
-      </plugin>
-    </plugins>
-  </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-info-reports-plugin</artifactId>
-        <version>2.0</version>
-      </plugin>
-    </plugins>
-  </reporting>
-</project>
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/partial-1.0/archetype-resources/src/main/java/App.java b/archetype-testing/archetype-final/src/test/archetypes/partial-1.0/archetype-resources/src/main/java/App.java
deleted file mode 100644
index 882084f..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/partial-1.0/archetype-resources/src/main/java/App.java
+++ /dev/null
@@ -1,4 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/partial-1.0/archetype-resources/src/test/java/AppTest.java b/archetype-testing/archetype-final/src/test/archetypes/partial-1.0/archetype-resources/src/test/java/AppTest.java
deleted file mode 100644
index 882084f..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/partial-1.0/archetype-resources/src/test/java/AppTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/site-1.0/META-INF/maven/archetype-metadata.xml b/archetype-testing/archetype-final/src/test/archetypes/site-1.0/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index ad3db4f..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/site-1.0/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<archetype-descriptor name="site">
-
-  <requiredProperties>
-    <requiredProperty key="property-with-default-1">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-with-default-2">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-with-default-3">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-with-default-4">
-      <defaultValue>default-value</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="property-without-default-1">
-    </requiredProperty>
-    <requiredProperty key="property-without-default-2">
-    </requiredProperty>
-    <requiredProperty key="property-without-default-3">
-    </requiredProperty>
-    <requiredProperty key="property-without-default-4">
-    </requiredProperty>
-  </requiredProperties>
-
-  <fileSets>
-    <fileSet filtered="true" packaged="false">
-      <directory>src/site</directory>
-      <includes>
-        <include>**/*.xml</include>
-        <include>**/*.apt</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-
-</archetype-descriptor>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/site-1.0/META-INF/maven/archetypes/site/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/site-1.0/META-INF/maven/archetypes/site/pom.xml
deleted file mode 100644
index 1cfabd4..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/site-1.0/META-INF/maven/archetypes/site/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>archetypes</groupId>
-  <artifactId>site</artifactId>
-  <version>1.0</version>
-</project>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/site-1.0/archetype-resources/pom.xml b/archetype-testing/archetype-final/src/test/archetypes/site-1.0/archetype-resources/pom.xml
deleted file mode 100644
index b3d58bc..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/site-1.0/archetype-resources/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>
-
-  <name>Maven archetype Test site</name>
-  <packaging>pom</packaging>
-</project>
diff --git a/archetype-testing/archetype-final/src/test/archetypes/site-1.0/archetype-resources/src/site/apt/test.apt b/archetype-testing/archetype-final/src/test/archetypes/site-1.0/archetype-resources/src/site/apt/test.apt
deleted file mode 100644
index 2176fc9..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/site-1.0/archetype-resources/src/site/apt/test.apt
+++ /dev/null
@@ -1,12 +0,0 @@
-groupId=${groupId}
-artifactId=${artifactId}
-version=${version}
-package=${package}
-property-without-default-1=${property-without-default-1}
-property-without-default-2=${property-without-default-2}
-property-without-default-3=${property-without-default-3}
-property-without-default-4=${property-without-default-4}
-property-with-default-1=${property-with-default-1}
-property-with-default-2=${property-with-default-2}
-property-with-default-3=${property-with-default-3}
-property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/archetypes/site-1.0/archetype-resources/src/site/site.xml b/archetype-testing/archetype-final/src/test/archetypes/site-1.0/archetype-resources/src/site/site.xml
deleted file mode 100644
index ceecd7a..0000000
--- a/archetype-testing/archetype-final/src/test/archetypes/site-1.0/archetype-resources/src/site/site.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-groupId=${groupId}
-  artifactId=${artifactId}
-  version=${version}
-  package=${package}
-  property-without-default-1=${property-without-default-1}
-  property-without-default-2=${property-without-default-2}
-  property-without-default-3=${property-without-default-3}
-  property-without-default-4=${property-without-default-4}
-  property-with-default-1=${property-with-default-1}
-  property-with-default-2=${property-with-default-2}
-  property-with-default-3=${property-with-default-3}
-  property-with-default-4=${property-with-default-4}
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripIT.java b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripIT.java
deleted file mode 100644
index 23f6523..0000000
--- a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripIT.java
+++ /dev/null
@@ -1,277 +0,0 @@
-package org.apache.maven.archetype.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
-import java.util.Properties;
-
-import org.apache.maven.archetype.ArchetypeCreationRequest;
-import org.apache.maven.archetype.ArchetypeCreationResult;
-import org.apache.maven.archetype.ArchetypeGenerationRequest;
-import org.apache.maven.archetype.ArchetypeGenerationResult;
-import org.apache.maven.archetype.ArchetypeManager;
-import org.apache.maven.archetype.catalog.Archetype;
-import org.apache.maven.archetype.catalog.ArchetypeCatalog;
-import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.MavenArtifactRepository;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-import org.apache.maven.model.Model;
-import org.apache.maven.project.DefaultProjectBuilderConfiguration;
-import org.apache.maven.project.DefaultProjectBuildingRequest;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.project.ProjectBuildingResult;
-import org.apache.maven.project.interpolation.ModelInterpolator;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-
-/**
- * @author Jason van Zyl
- */
-public class ArchetyperRoundtripIT
-    extends PlexusTestCase
-{
-
-    public void testArchetyper()
-        throws Exception
-    {
-
-        ArchetypeManager archetype = (ArchetypeManager) lookup( ArchetypeManager.ROLE );
-
-        ProjectBuilder projectBuilder = lookup( ProjectBuilder.class );
-
-        ArtifactRepository localRepository = createRepository( new File( getBasedir(),
-                                                                                         "target" + File.separator
-                                                                                             + "test-classes"
-                                                                                             + File.separator
-                                                                                             + "repositories"
-                                                                                             + File.separator
-                                                                                             + "local" ).toURI().toURL().toExternalForm(),
-                                                                               "local-repo" );
-
-        ArtifactRepository centralRepository = createRepository( new File( getBasedir(),
-                                                                                           "target" + File.separator
-                                                                                               + "test-classes"
-                                                                                               + File.separator
-                                                                                               + "repositories"
-                                                                                               + File.separator
-                                                                                               + "central" ).toURI().toURL().toExternalForm(),
-                                                                                 "central-repo" );
-
-        // (1) create a project from scratch
-        // (2) create an archetype from the project
-        // (3) create our own archetype catalog properties in memory
-        // (4) create our own archetype catalog describing the archetype we just created
-        // (5) deploy the archetype we just created
-        // (6) create a project form the archetype we just created
-        // ------------------------------------------------------------------------
-        //
-        // ------------------------------------------------------------------------
-        // (1) create a project from scratch
-//        File sourceProject = new File( getBasedir(  ), "target/test-classes/projects/roundtrip-1-project" );
-
-        File workingProject = new File( getBasedir(),
-                                        "target" + File.separator + "test-classes" + File.separator + "projects"
-                                            + File.separator + "roundtrip-1-project" );
-        FileUtils.forceDelete( new File( workingProject, "target" ) );
-
-        // (2) create an archetype from the project
-        File pom = new File( workingProject, "pom.xml" );
-
-        ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
-        MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
-        repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepository.getBasedir() ) );
-        buildingRequest.setRepositorySession( repositorySession );
-
-        MavenProject project = projectBuilder.build( pom, buildingRequest ).getProject();
-
-        Properties properties = new Properties();
-        properties.setProperty( "someProperty", "someValue" );
-        ArchetypeCreationRequest acr = new ArchetypeCreationRequest().setProject( project ).
-            setLocalRepository( localRepository ).setProperties( properties ).setPostPhase( "package" );
-
-        ArchetypeCreationResult creationResult = archetype.createArchetypeFromProject( acr );
-
-        if ( creationResult.getCause() != null )
-        {
-            throw creationResult.getCause();
-        }
-
-        // (3) create our own archetype catalog properties in memory
-        File catalogDirectory = new File( getBasedir(), "target" + File.separator + "catalog" );
-        catalogDirectory.mkdirs();
-
-        File catalogFile = new File( catalogDirectory, "archetype-catalog.xml" );
-
-        // (5) install the archetype we just created
-        File generatedArchetypeDirectory = new File( project.getBasedir(),
-                                                     "target" + File.separator + "generated-sources" + File.separator
-                                                         + "archetype" );
-        File generatedArchetypePom = new File( generatedArchetypeDirectory, "pom.xml" );
-        
-        ProjectBuildingResult buildingResult = projectBuilder.build( generatedArchetypePom, buildingRequest );
-        
-        MavenProject generatedArchetypeProject = projectBuilder.build( generatedArchetypePom, buildingRequest ).getProject();
-        
-        ModelInterpolator modelInterpolator = (ModelInterpolator)lookup( ModelInterpolator.ROLE );
-        Model generatedArchetypeModel = modelInterpolator.interpolate( generatedArchetypeProject.getModel(), generatedArchetypePom.getParentFile(), new DefaultProjectBuilderConfiguration(), true );
-
-        File archetypeDirectory =
-            new File( generatedArchetypeDirectory, "src" + File.separator + "main" + File.separator + "resources" );
-
-        File archetypeArchive = archetype.archiveArchetype( archetypeDirectory, new File(
-            generatedArchetypeModel.getBuild().getDirectory() ),
-                                                            generatedArchetypeModel.getBuild().getFinalName() );
-
-        String baseName =
-            StringUtils.replace( generatedArchetypeProject.getGroupId(), ".", File.separator ) + File.separator
-                + generatedArchetypeProject.getArtifactId() + File.separator + generatedArchetypeProject.getVersion()
-                + File.separator + generatedArchetypeProject.getBuild().getFinalName();
-        File archetypeInRepository = new File( centralRepository.getBasedir(), baseName + ".jar" );
-        File archetypePomInRepository = new File( centralRepository.getBasedir(), baseName + ".pom" );
-        archetypeInRepository.getParentFile().mkdirs();
-        FileUtils.copyFile( archetypeArchive, archetypeInRepository );
-        FileUtils.copyFile( generatedArchetypePom, archetypePomInRepository );
-
-        // (4) create our own archetype catalog describing the archetype we just created
-        ArchetypeCatalog catalog = new ArchetypeCatalog();
-        Archetype generatedArchetype = new Archetype();
-        generatedArchetype.setGroupId( generatedArchetypeProject.getGroupId() );
-        generatedArchetype.setArtifactId( generatedArchetypeProject.getArtifactId() );
-        generatedArchetype.setVersion( generatedArchetypeProject.getVersion() );
-        generatedArchetype.setRepository( "http://localhost:" + port + "/repo" );
-        catalog.addArchetype( generatedArchetype );
-
-        ArchetypeCatalogXpp3Writer catalogWriter = new ArchetypeCatalogXpp3Writer();
-        try ( Writer writer = new FileWriter( catalogFile ) )
-        {
-            catalogWriter.write( writer, catalog );
-        }
-
-        // (6) create a project form the archetype we just created
-        String outputDirectory = new File( getBasedir(),
-                                           "target" + File.separator + "test-classes" + File.separator + "projects"
-                                               + File.separator + "roundtrip-1-recreatedproject" ).getAbsolutePath();
-        FileUtils.forceDelete( outputDirectory );
-
-        ArchetypeGenerationRequest agr =
-            new ArchetypeGenerationRequest().setArchetypeGroupId( generatedArchetypeProject.getGroupId() ).
-                setArchetypeArtifactId( generatedArchetypeProject.getArtifactId() ).
-                setArchetypeVersion( generatedArchetypeProject.getVersion() ).
-                setGroupId( "com.mycompany" ).setArtifactId( "myapp" ).setVersion( "1.0-SNAPSHOT" ).
-                setPackage( "com.mycompany.myapp" ).setProperties( properties ).
-                setOutputDirectory( outputDirectory ).setLocalRepository( localRepository ).
-                setArchetypeRepository( "http://localhost:" + port + "/repo/" ).setProjectBuildingRequest( buildingRequest );
-        ArchetypeGenerationResult generationResult = archetype.generateProjectFromArchetype( agr );
-
-        if ( generationResult.getCause() != null )
-        {
-            throw generationResult.getCause();
-        }
-
-        //ASSERT symbol_pound replacement (archetype-180 archetype-183)
-        String content = FileUtils.fileRead(
-            outputDirectory + File.separator + "myapp" + File.separator + "src" + File.separator + "main"
-                + File.separator + "java" + File.separator + "com" + File.separator + "mycompany" + File.separator
-                + "myapp" + File.separator + "App.java" );
-        System.err.println( "content=" + content );
-        assertTrue( content.indexOf( "//A   #\\{some}" ) > 0 );
-        assertTrue( content.indexOf( "//B   #{some}" ) > 0 );
-        assertTrue( content.indexOf( "//C   #{some other}" ) > 0 );
-        assertTrue( content.indexOf( "//D   \\#{some other}" ) > 0 );
-        assertTrue( content.indexOf( "//E   #{}" ) > 0 );
-        assertTrue( content.indexOf( "//F   {some}" ) > 0 );
-        assertTrue( content.indexOf( "//G   ${someOtherProperty}" ) > 0 );
-        assertTrue( content.indexOf( "//H   ${someValue}" ) > 0 );
-        assertTrue( content.indexOf( "/*" ) > 0 );
-        assertTrue( content.indexOf( "  A   #\\{some}" ) > 0 );
-        assertTrue( content.indexOf( "  B   #{some}" ) > 0 );
-        assertTrue( content.indexOf( "  C   #{some other}" ) > 0 );
-        assertTrue( content.indexOf( "  D   \\#{some other}" ) > 0 );
-        assertTrue( content.indexOf( "  E   #{}" ) > 0 );
-        assertTrue( content.indexOf( "  F   {some}" ) > 0 );
-        assertTrue( content.indexOf( "  G   ${someOtherProperty}" ) > 0 );
-        assertTrue( content.indexOf( "  H   ${someValue}" ) > 0 );
-        //Assert symbol_dollar archetype-138
-    }
-
-    private Server server;
-
-    int port;
-
-    @Override
-    public void setUp()
-        throws Exception
-    {
-        super.setUp();
-        // Start Jetty
-
-        System.setProperty( "org.apache.maven.archetype.repository.directory",
-                            getTestPath( "target/test-classes/repositories/central" ) );
-
-        server = new Server( 0 );
-
-        WebAppContext webapp = new WebAppContext();
-        webapp.setContextPath( "/repo" );
-        webapp.setWar( "target/wars/archetype-repository.war" );
-        server.setHandler( webapp );
-
-        server.start();
-
-        port = server.getConnectors()[0].getLocalPort();
-
-    }
-
-    @Override
-    public void tearDown()
-        throws Exception
-    {
-        super.tearDown();
-        // Stop Jetty
-
-        server.stop();
-    }
-    
-    private ArtifactRepository createRepository( String url, String repositoryId )
-    {
-        String updatePolicyFlag = ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS;
-
-        String checksumPolicyFlag = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
-
-        ArtifactRepositoryPolicy snapshotsPolicy =
-            new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
-
-        ArtifactRepositoryPolicy releasesPolicy =
-            new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
-        
-        return new MavenArtifactRepository( repositoryId, url, new DefaultRepositoryLayout() , snapshotsPolicy,
-                                            releasesPolicy );
-    }
-}
diff --git a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyIT.java b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyIT.java
deleted file mode 100644
index 33d9d1b..0000000
--- a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyIT.java
+++ /dev/null
@@ -1,276 +0,0 @@
-package org.apache.maven.archetype.test;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.util.Properties;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.archetype.ArchetypeCreationRequest;
-import org.apache.maven.archetype.ArchetypeCreationResult;
-import org.apache.maven.archetype.ArchetypeGenerationRequest;
-import org.apache.maven.archetype.ArchetypeGenerationResult;
-import org.apache.maven.archetype.ArchetypeManager;
-import org.apache.maven.archetype.catalog.Archetype;
-import org.apache.maven.archetype.catalog.ArchetypeCatalog;
-import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.MavenArtifactRepository;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-import org.apache.maven.model.Model;
-import org.apache.maven.project.DefaultProjectBuilderConfiguration;
-import org.apache.maven.project.DefaultProjectBuildingRequest;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.project.interpolation.ModelInterpolator;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-
-/**
- * @author Jason van Zyl
- */
-public class ArchetyperRoundtripWithProxyIT
-    extends PlexusTestCase
-{
-    Server proxyServer;
-
-    int proxyPort;
-
-    Server server;
-
-    int port;
-
-    public void testArchetyper()
-        throws Exception
-    {
-        ArchetypeManager archetype = (ArchetypeManager) lookup( ArchetypeManager.ROLE );
-
-        ProjectBuilder projectBuilder = lookup( ProjectBuilder.class );
-
-        ArtifactRepository localRepository = createRepository( new File( getBasedir(),
-                                                                                         "target" + File.separator
-                                                                                             + "test-classes"
-                                                                                             + File.separator
-                                                                                             + "repositories"
-                                                                                             + File.separator
-                                                                                             + "local" ).toURI().toURL().toExternalForm(),
-                                                                               "local-repo" );
-        ArtifactRepository centralRepository = createRepository( new File( getBasedir(),
-                                                                                           "target" + File.separator
-                                                                                               + "test-classes"
-                                                                                               + File.separator
-                                                                                               + "repositories"
-                                                                                               + File.separator
-                                                                                               + "central" ).toURI().toURL().toExternalForm(),
-                                                                                 "central-repo" );
-
-        // (1) create a project from scratch
-        // (2) create an archetype from the project
-        // (3) create our own archetype catalog properties in memory
-        // (4) create our own archetype catalog describing the archetype we just created
-        // (5) deploy the archetype we just created
-        // (6) create a project form the archetype we just created
-        // ------------------------------------------------------------------------
-        //
-        // ------------------------------------------------------------------------
-        // (1) create a project from scratch
-//        File sourceProject = new File( getBasedir(  ), "target/test-classes/projects/roundtrip-1-project" );
-
-        File workingProject = new File( getBasedir(),
-                                        "target" + File.separator + "test-classes" + File.separator + "projects"
-                                            + File.separator + "roundtrip-2-project" );
-        FileUtils.forceDelete( new File( workingProject, "target" ) );
-
-        // (2) create an archetype from the project
-        File pom = new File( workingProject, "pom.xml" );
-
-        ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
-        MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
-        repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepository.getBasedir() ) );
-        buildingRequest.setRepositorySession( repositorySession );
-
-        
-        MavenProject project = projectBuilder.build( pom, buildingRequest ).getProject();
-
-        ArchetypeCreationRequest acr = new ArchetypeCreationRequest().setProject( project ).
-            setLocalRepository( localRepository ).setPostPhase( "package" );
-
-        ArchetypeCreationResult creationResult = archetype.createArchetypeFromProject( acr );
-
-        if ( creationResult.getCause() != null )
-        {
-            throw creationResult.getCause();
-        }
-
-        // (3) create our own archetype catalog properties in memory
-        File catalogDirectory = new File( getBasedir(), "target" + File.separator + "catalog" );
-
-        File catalogFile = new File( catalogDirectory, "archetype-catalog.xml" );
-
-        File catalogProperties = new File( catalogDirectory, "archetype-catalog.properties" );
-
-        catalogDirectory.mkdirs();
-
-        Properties p = new Properties();
-        p.setProperty( "sources", "catalog" );
-        p.setProperty( "catalog.file", catalogFile.getAbsolutePath() );
-        OutputStream os = new FileOutputStream( catalogProperties );
-        p.store( os, "Generated catalog properties" );
-
-        // (5) install the archetype we just created
-        File generatedArchetypeDirectory = new File( project.getBasedir(),
-                                                     "target" + File.separator + "generated-sources" + File.separator
-                                                         + "archetype" );
-        File generatedArchetypePom = new File( generatedArchetypeDirectory, "pom.xml" );
-        MavenProject generatedArchetypeProject = projectBuilder.build( generatedArchetypePom, buildingRequest ).getProject();
-        
-        ModelInterpolator modelInterpolator = (ModelInterpolator)lookup( ModelInterpolator.ROLE );
-        Model generatedArchetypeModel = modelInterpolator.interpolate( generatedArchetypeProject.getModel(), generatedArchetypePom.getParentFile(), new DefaultProjectBuilderConfiguration(), true );
-
-        File archetypeDirectory =
-            new File( generatedArchetypeDirectory, "src" + File.separator + "main" + File.separator + "resources" );
-
-        File archetypeArchive = archetype.archiveArchetype( archetypeDirectory, new File(
-            generatedArchetypeModel.getBuild().getDirectory() ),
-                                                            generatedArchetypeModel.getBuild().getFinalName() );
-
-        String baseName =
-            StringUtils.replace( generatedArchetypeProject.getGroupId(), ".", File.separator ) + File.separator
-                + generatedArchetypeProject.getArtifactId() + File.separator + generatedArchetypeProject.getVersion()
-                + File.separator + generatedArchetypeModel.getBuild().getFinalName();
-        File archetypeInRepository = new File( centralRepository.getBasedir(), baseName + ".jar" );
-        File archetypePomInRepository = new File( centralRepository.getBasedir(), baseName + ".pom" );
-        archetypeInRepository.getParentFile().mkdirs();
-        FileUtils.copyFile( archetypeArchive, archetypeInRepository );
-        FileUtils.copyFile( generatedArchetypePom, archetypePomInRepository );
-
-        // (4) create our own archetype catalog describing the archetype we just created
-        ArchetypeCatalog catalog = new ArchetypeCatalog();
-        Archetype generatedArchetype = new Archetype();
-        generatedArchetype.setGroupId( generatedArchetypeProject.getGroupId() );
-        generatedArchetype.setArtifactId( generatedArchetypeProject.getArtifactId() );
-        generatedArchetype.setVersion( generatedArchetypeProject.getVersion() );
-        generatedArchetype.setRepository( "http://localhost:" + port + "/repo" );
-        catalog.addArchetype( generatedArchetype );
-
-        ArchetypeCatalogXpp3Writer catalogWriter = new ArchetypeCatalogXpp3Writer();
-        try ( Writer writer = new FileWriter( catalogFile ) )
-        {
-            catalogWriter.write( writer, catalog );
-        }
-
-        // (6) create a project form the archetype we just created
-        String outputDirectory = new File( getBasedir(),
-                                           "target" + File.separator + "test-classes" + File.separator + "projects"
-                                               + File.separator + "roundtrip-2-recreatedproject" ).getAbsolutePath();
-        FileUtils.forceDelete( outputDirectory );
-
-//        WagonManager manager = (WagonManager) lookup( WagonManager.class.getName() );
-//        manager.addProxy( "http", "localhost", proxyPort, null, null, null );
-
-        ArchetypeGenerationRequest agr =
-            new ArchetypeGenerationRequest().setArchetypeGroupId( generatedArchetypeProject.getGroupId() ).
-                setArchetypeArtifactId( generatedArchetypeProject.getArtifactId() ).
-                setArchetypeVersion( generatedArchetypeProject.getVersion() ).
-                setGroupId( "com.mycompany" ).setArtifactId( "myapp" ).setVersion( "1.0-SNAPSHOT" ).
-                setPackage( "com.mycompany.myapp" ).setOutputDirectory( outputDirectory ).
-                setLocalRepository( localRepository ).setArchetypeRepository( "http://localhost:" + port + "/repo" ).
-                setProjectBuildingRequest( buildingRequest );
-        ArchetypeGenerationResult generationResult = archetype.generateProjectFromArchetype( agr );
-
-        if ( generationResult.getCause() != null )
-        {
-            throw generationResult.getCause();
-        }
-
-    }
-
-    @Override
-    public void setUp()
-        throws Exception
-    {
-        super.setUp();
-        // Start Proxy Jetty
-
-        System.setProperty( "org.apache.maven.archetype.repository.directory",
-                            getTestPath( "target/test-classes/repositories/central" ) );
-
-        proxyServer = new Server( 0 );
-
-        WebAppContext webappProxy = new WebAppContext();
-        webappProxy.setContextPath( "/" );
-        webappProxy.setWar( "target/wars/archetype-proxy.war" );
-        proxyServer.setHandler( webappProxy );
-
-        proxyServer.start();
-
-        proxyPort = proxyServer.getConnectors()[0].getLocalPort();
-
-        server = new Server( 0 );
-
-        WebAppContext webapp = new WebAppContext();
-        webapp.setContextPath( "/repo" );
-        webapp.setWar( "target/wars/archetype-repository.war" );
-        server.setHandler( webapp );
-
-        server.start();
-
-        port = server.getConnectors()[0].getLocalPort();
-
-    }
-
-    @Override
-    public void tearDown()
-        throws Exception
-    {
-        super.tearDown();
-        // Stop Jettys
-
-        proxyServer.stop();
-        server.stop();
-    }
-    
-    private ArtifactRepository createRepository( String url, String repositoryId )
-    {
-        String updatePolicyFlag = ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS;
-
-        String checksumPolicyFlag = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
-
-        ArtifactRepositoryPolicy snapshotsPolicy =
-            new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
-
-        ArtifactRepositoryPolicy releasesPolicy =
-            new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
-        
-        return new MavenArtifactRepository( repositoryId, url, new DefaultRepositoryLayout() , snapshotsPolicy,
-                                            releasesPolicy );
-    }
-
-}
diff --git a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleIT.java b/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleIT.java
deleted file mode 100644
index 8b5e416..0000000
--- a/archetype-testing/archetype-final/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleIT.java
+++ /dev/null
@@ -1,346 +0,0 @@
-package org.apache.maven.archetype.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.Properties;
-
-import org.apache.maven.archetype.ArchetypeCreationRequest;
-import org.apache.maven.archetype.ArchetypeCreationResult;
-import org.apache.maven.archetype.ArchetypeGenerationRequest;
-import org.apache.maven.archetype.ArchetypeGenerationResult;
-import org.apache.maven.archetype.ArchetypeManager;
-import org.apache.maven.archetype.catalog.Archetype;
-import org.apache.maven.archetype.catalog.ArchetypeCatalog;
-import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
-import org.apache.maven.archetype.common.Constants;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.artifact.repository.MavenArtifactRepository;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-import org.apache.maven.model.Model;
-import org.apache.maven.project.DefaultProjectBuilderConfiguration;
-import org.apache.maven.project.DefaultProjectBuildingRequest;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.project.interpolation.ModelInterpolator;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-
-/**
- * @author Jason van Zyl
- */
-public class RoundtripMultiModuleIT
-    extends PlexusTestCase
-{
-    public void testArchetyper()
-        throws Exception
-    {
-
-        ArchetypeManager archetype = (ArchetypeManager) lookup( ArchetypeManager.ROLE );
-
-        ProjectBuilder projectBuilder = lookup( ProjectBuilder.class );
-
-        ArtifactRepository localRepository = createRepository( new File( getBasedir(),
-                                                                                         "target" + File.separator
-                                                                                             + "test-classes"
-                                                                                             + File.separator
-                                                                                             + "repositories"
-                                                                                             + File.separator
-                                                                                             + "local" ).toURI().toURL().toExternalForm(),
-                                                                               "local-repo" );
-
-        ArtifactRepository centralRepository = createRepository( new File( getBasedir(),
-                                                                                           "target" + File.separator
-                                                                                               + "test-classes"
-                                                                                               + File.separator
-                                                                                               + "repositories"
-                                                                                               + File.separator
-                                                                                               + "central" ).toURI().toURL().toExternalForm(),
-                                                                                 "central-repo" );
-
-        // (1) create a project from scratch
-        // (2) create an archetype from the project
-        // (3) create our own archetype catalog properties in memory
-        // (4) create our own archetype catalog describing the archetype we just created
-        // (5) deploy the archetype we just created
-        // (6) create a project form the archetype we just created
-        // ------------------------------------------------------------------------
-        //
-        // ------------------------------------------------------------------------
-        // (1) create a project from scratch
-//        File sourceProject = new File( getBasedir(  ), "target/test-classes/projects/roundtrip-1-project" );
-
-        File workingProject = new File( getBasedir(),
-                                        "target" + File.separator + "test-classes" + File.separator + "projects"
-                                            + File.separator + "roundtrip-multi" );
-        FileUtils.forceDelete( new File( workingProject, "target" ) );
-
-        // (2) create an archetype from the project
-        File pom = new File( workingProject, "pom.xml" );
-        
-        ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
-        MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
-        repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepository.getBasedir() ) );
-        buildingRequest.setRepositorySession( repositorySession );
-
-        
-        MavenProject project = projectBuilder.build( pom, buildingRequest ).getProject();
-
-        ModelInterpolator modelInterpolator = (ModelInterpolator)lookup( ModelInterpolator.ROLE );
-
-        ArchetypeCreationRequest acr =
-            new ArchetypeCreationRequest().setProject( project ).setLocalRepository( localRepository ).setFiltereds(
-                Constants.DEFAULT_FILTERED_EXTENSIONS ).setLanguages( Constants.DEFAULT_LANGUAGES ).setPostPhase(
-                "package" );
-
-        ArchetypeCreationResult creationResult = archetype.createArchetypeFromProject( acr );
-
-        if ( creationResult.getCause() != null )
-        {
-            throw creationResult.getCause();
-        }
-        else
-        {
-            assertArchetypeCreated( workingProject );
-        }
-
-        // (3) create our own archetype catalog properties in memory
-        File catalogDirectory = new File( getBasedir(), "target" + File.separator + "catalog" );
-
-        File catalogFile = new File( catalogDirectory, "archetype-catalog.xml" );
-
-        File catalogProperties = new File( catalogDirectory, "archetype-catalog.properties" );
-
-        catalogDirectory.mkdirs();
-
-        Properties p = new Properties();
-        p.setProperty( "sources", "catalog" );
-        p.setProperty( "catalog.file", catalogFile.getAbsolutePath() );
-        OutputStream os = new FileOutputStream( catalogProperties );
-        p.store( os, "Generated catalog properties" );
-
-        // (5) install the archetype we just created
-        File generatedArchetypeDirectory = new File( project.getBasedir(),
-                                                     "target" + File.separator + "generated-sources" + File.separator
-                                                         + "archetype" );
-        File generatedArchetypePom = new File( generatedArchetypeDirectory, "pom.xml" );
-        MavenProject generatedArchetypeProject = projectBuilder.build( generatedArchetypePom, buildingRequest ).getProject();
-        Model generatedModel = modelInterpolator.interpolate( generatedArchetypeProject.getModel(), generatedArchetypePom.getParentFile(), new DefaultProjectBuilderConfiguration(), true );
-
-        File archetypeDirectory =
-            new File( generatedArchetypeDirectory, "src" + File.separator + "main" + File.separator + "resources" );
-
-        File archetypeArchive = archetype.archiveArchetype( archetypeDirectory,
-                new File( generatedModel.getBuild().getDirectory() ),
-                        generatedModel.getBuild().getFinalName() );
-
-        String baseName =
-            StringUtils.replace( generatedArchetypeProject.getGroupId(), ".", File.separator ) + File.separator
-                + generatedArchetypeProject.getArtifactId() + File.separator + generatedArchetypeProject.getVersion()
-                + File.separator + generatedModel.getBuild().getFinalName();
-        File archetypeInRepository = new File( centralRepository.getBasedir(), baseName + ".jar" );
-        File archetypePomInRepository = new File( centralRepository.getBasedir(), baseName + ".pom" );
-        archetypeInRepository.getParentFile().mkdirs();
-        FileUtils.copyFile( archetypeArchive, archetypeInRepository );
-        FileUtils.copyFile( generatedArchetypePom, archetypePomInRepository );
-
-        // (4) create our own archetype catalog describing the archetype we just created
-        ArchetypeCatalog catalog = new ArchetypeCatalog();
-        Archetype generatedArchetype = new Archetype();
-        generatedArchetype.setGroupId( generatedArchetypeProject.getGroupId() );
-        generatedArchetype.setArtifactId( generatedArchetypeProject.getArtifactId() );
-        generatedArchetype.setVersion( generatedArchetypeProject.getVersion() );
-        generatedArchetype.setRepository( "http://localhost:" + port + "/repo" );
-        catalog.addArchetype( generatedArchetype );
-
-        ArchetypeCatalogXpp3Writer catalogWriter = new ArchetypeCatalogXpp3Writer();
-        try ( Writer writer = new FileWriter( catalogFile ) )
-        {
-            catalogWriter.write( writer, catalog );
-        }
-
-        // (6) create a project form the archetype we just created
-        String outputDirectory = new File( getBasedir(),
-                                           "target" + File.separator + "test-classes" + File.separator + "projects"
-                                               + File.separator + "roundtrip-multi-recreated" ).getAbsolutePath();
-        FileUtils.forceDelete( outputDirectory );
-
-        ArchetypeGenerationRequest agr = new ArchetypeGenerationRequest().setArchetypeGroupId(
-            generatedArchetypeProject.getGroupId() ).setArchetypeArtifactId(
-            generatedArchetypeProject.getArtifactId() ).setArchetypeVersion(
-            generatedArchetypeProject.getVersion() ).setGroupId( "com.mycompany" ).setArtifactId( "myapp" ).setVersion(
-            "1.0-SNAPSHOT" ).setPackage( "com.mycompany.myapp" ).setOutputDirectory(
-            outputDirectory ).setLocalRepository( localRepository ).setArchetypeRepository(
-            "http://localhost:" + port + "/repo/" ).setProjectBuildingRequest( buildingRequest );
-        ArchetypeGenerationResult generationResult = archetype.generateProjectFromArchetype( agr );
-
-        if ( generationResult.getCause() != null )
-        {
-            fail( generationResult.getCause().getMessage() );
-        }
-
-        String myapp = outputDirectory + File.separator + "myapp" + File.separator;
-        assertTrue( new File( myapp + "myapp-api", ".classpath" ).exists() );
-        assertTrue( new File( myapp + "myapp-cli", ".classpath" ).exists() );
-        assertTrue( new File( myapp + "myapp-core", ".classpath" ).exists() );
-        assertTrue( new File( myapp + "myapp-model", ".classpath" ).exists() );
-        assertTrue( new File( myapp + File.separator + "myapp-stores" + File.separator + "myapp-store-memory",
-                              ".classpath" ).exists() );
-        assertTrue(
-            new File( myapp + "myapp-stores" + File.separator + "myapp-store-xstream", ".classpath" ).exists() );
-
-        assertTrue( new File( myapp + "myapp-api", ".checkstyle" ).exists() );
-        assertTrue( new File( myapp + "myapp-cli", ".checkstyle" ).exists() );
-        assertTrue( new File( myapp + "myapp-core", ".checkstyle" ).exists() );
-        assertTrue( new File( myapp + "myapp-model", ".checkstyle" ).exists() );
-        assertTrue(
-            new File( myapp + "myapp-stores" + File.separator + "myapp-store-memory", ".checkstyle" ).exists() );
-        assertTrue(
-            new File( myapp + "myapp-stores" + File.separator + "myapp-store-xstream", ".checkstyle" ).exists() );
-
-    }
-
-    private Server server;
-
-    int port;
-
-    @Override
-    public void setUp()
-        throws Exception
-    {
-        super.setUp();
-        // Start Jetty
-
-        System.setProperty( "org.apache.maven.archetype.repository.directory",
-                            getTestPath( "target/test-classes/repositories/central" ) );
-
-        server = new Server( 0 );
-
-        WebAppContext webapp = new WebAppContext();
-        webapp.setContextPath( "/repo" );
-        webapp.setWar( "target/wars/archetype-repository.war" );
-        server.setHandler( webapp );
-
-        server.start();
-
-        port = server.getConnectors()[0].getLocalPort();
-
-
-    }
-
-    @Override
-    public void tearDown()
-        throws Exception
-    {
-        super.tearDown();
-        // Stop Jetty
-
-        server.stop();
-    }
-
-    private void assertArchetypeCreated( File workingProject )
-    {
-        File archetypeSourcesDirectory = FileUtils.resolveFile( workingProject, "target/generated-sources/archetype" );
-        File archetypeResourcesDirectory =
-            FileUtils.resolveFile( archetypeSourcesDirectory, "src/main/resources/archetype-resources" );
-        File archetypeMetadataDirectory =
-            FileUtils.resolveFile( archetypeSourcesDirectory, "src/main/resources/META-INF/maven" );
-
-        Iterator i = org.apache.commons.io.FileUtils.iterateFiles( archetypeSourcesDirectory, null, true );
-        while ( i.hasNext() )
-        {
-            File f = (File) i.next();
-            System.err.println( f.getPath() );
-        }
-
-        File api = FileUtils.resolveFile( archetypeResourcesDirectory, "__rootArtifactId__-api" );
-        assertExistDirectory( api );
-        assertExistFile( FileUtils.resolveFile( api, "pom.xml" ) );
-
-        File cli = FileUtils.resolveFile( archetypeResourcesDirectory, "__rootArtifactId__-cli" );
-        assertExistDirectory( cli );
-        assertExistFile( FileUtils.resolveFile( cli, "pom.xml" ) );
-
-        File core = FileUtils.resolveFile( archetypeResourcesDirectory, "__rootArtifactId__-core" );
-        assertExistDirectory( core );
-        assertExistFile( FileUtils.resolveFile( core, "pom.xml" ) );
-
-        File model = FileUtils.resolveFile( archetypeResourcesDirectory, "__rootArtifactId__-model" );
-        assertExistDirectory( model );
-        assertExistFile( FileUtils.resolveFile( model, "pom.xml" ) );
-
-        File stores = FileUtils.resolveFile( archetypeResourcesDirectory, "__rootArtifactId__-stores" );
-        assertExistDirectory( stores );
-        assertExistFile( FileUtils.resolveFile( stores, "pom.xml" ) );
-        assertExistDirectory( FileUtils.resolveFile( stores, "__rootArtifactId__-store-memory" ) );
-        assertExistFile(
-            FileUtils.resolveFile( FileUtils.resolveFile( stores, "__rootArtifactId__-store-memory" ), "pom.xml" ) );
-        assertExistDirectory( FileUtils.resolveFile( stores, "__rootArtifactId__-store-xstream" ) );
-        assertExistFile(
-            FileUtils.resolveFile( FileUtils.resolveFile( stores, "__rootArtifactId__-store-xstream" ), "pom.xml" ) );
-        assertExistFile( FileUtils.resolveFile( archetypeResourcesDirectory, "pom.xml" ) );
-
-        assertExistDirectory( archetypeMetadataDirectory );
-        assertExistFile( FileUtils.resolveFile( archetypeMetadataDirectory, "archetype-metadata.xml" ) );
-        assertExistFile( FileUtils.resolveFile( archetypeSourcesDirectory, "pom.xml" ) );
-
-    }
-
-    private void assertExistDirectory( File resolveFile )
-    {
-        assertTrue( "resolveFile " + resolveFile + " !exists", resolveFile.exists() );
-        assertTrue( "resolveFile " + resolveFile + " !isDirectory", resolveFile.isDirectory() );
-    }
-
-    private void assertExistFile( File resolveFile )
-    {
-        assertTrue( "resolveFile " + resolveFile + " !exists", resolveFile.exists() );
-        assertTrue( "resolveFile " + resolveFile + " !isFile", resolveFile.isFile() );
-    }
-    
-    private ArtifactRepository createRepository( String url, String repositoryId )
-    {
-        String updatePolicyFlag = ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS;
-
-        String checksumPolicyFlag = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
-
-        ArtifactRepositoryPolicy snapshotsPolicy =
-            new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
-
-        ArtifactRepositoryPolicy releasesPolicy =
-            new ArtifactRepositoryPolicy( true, updatePolicyFlag, checksumPolicyFlag );
-        
-        return new MavenArtifactRepository( repositoryId, url, new DefaultRepositoryLayout() , snapshotsPolicy,
-                                            releasesPolicy );
-    }
-
-}
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-2-project/pom.xml b/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-2-project/pom.xml
deleted file mode 100644
index f657dae..0000000
--- a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-2-project/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-  <project xmlns="http://maven.apache.org/POM/4.0.0" 
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.test</groupId>
-  <artifactId>test-project-2</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0</version>
-  <name>test-project-2</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-2-project/src/main/java/org/apache/maven/test/App.java b/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-2-project/src/main/java/org/apache/maven/test/App.java
deleted file mode 100644
index b876653..0000000
--- a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-2-project/src/main/java/org/apache/maven/test/App.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package projects.roundtrip-1-project_1.src.main.java.org.apache.maven.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Hello world!
- *
- */
-public class App
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-2-project/src/test/java/org/apache/maven/test/AppTest.java b/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-2-project/src/test/java/org/apache/maven/test/AppTest.java
deleted file mode 100644
index 6a67062..0000000
--- a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-2-project/src/test/java/org/apache/maven/test/AppTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package projects.roundtrip-1-project_1.src.test.java.org.apache.maven.test;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigorous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}
diff --git a/archetype-testing/archetype-final/src/test/resources/repositories/central/archetype-catalog.xml b/archetype-testing/archetype-final/src/test/resources/repositories/central/archetype-catalog.xml
deleted file mode 100644
index f78f50d..0000000
--- a/archetype-testing/archetype-final/src/test/resources/repositories/central/archetype-catalog.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<archetype-catalog>
-  <archetypes>
-    <archetype>
-      <groupId>archetypes</groupId>
-      <artifactId>fileset</artifactId>
-      <version>1.0</version>
-      <description>Fileset test archetype</description>
-      <repository>file://${basedir}/target/test-classes/repositories/central</repository>
-    </archetype>
-  </archetypes>
-</archetype-catalog>
diff --git a/archetype-testing/archetype-final/src/test/resources/repositories/central/dummy b/archetype-testing/archetype-final/src/test/resources/repositories/central/dummy
deleted file mode 100644
index e69de29..0000000
diff --git a/archetype-testing/archetype-final/src/test/resources/repositories/local/dummy b/archetype-testing/archetype-final/src/test/resources/repositories/local/dummy
deleted file mode 100644
index e69de29..0000000
diff --git a/archetype-testing/archetype-proxy/pom.xml b/archetype-testing/archetype-proxy/pom.xml
deleted file mode 100644
index db50290..0000000
--- a/archetype-testing/archetype-proxy/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <artifactId>archetype-testing</artifactId>
-    <groupId>org.apache.maven.archetype</groupId>
-    <version>3.0.2-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>archetype-proxy</artifactId>
-  <packaging>war</packaging>
-
-  <name>Maven Archetype Webapp Proxy</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>6.1.11</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <!-- Add this in settings to use No authentication is made
-          <proxies>
-          <proxy>
-          <active>true</active>
-          <id>jetty</id>
-          <host>localhost</host>
-          <port>8080</port>
-          <protocol>http</protocol>
-          </proxy>
-          </proxies>
-        -->
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <configuration>
-          <connectors>
-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-              <port>18881</port>
-              <maxIdleTime>60000</maxIdleTime>
-            </connector>
-          </connectors>
-          <webAppConfig>
-            <contextPath>/</contextPath>
-          </webAppConfig>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
\ No newline at end of file
diff --git a/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java b/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java
deleted file mode 100644
index f50c3e9..0000000
--- a/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java
+++ /dev/null
@@ -1,356 +0,0 @@
-package org.apache.maven.archetype.proxy;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.HttpURLConnection;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.mortbay.util.IO;
-
-/**
- * Stolen code from Mortbay
- *
- * @author rafale
- */
-public class ProxyServlet
-    extends HttpServlet
-{
-    protected Set<String> dontProxyHeaders = new HashSet<String>();
-
-    {
-        dontProxyHeaders.add( "proxy-connection" );
-        dontProxyHeaders.add( "connection" );
-        dontProxyHeaders.add( "keep-alive" );
-        dontProxyHeaders.add( "transfer-encoding" );
-        dontProxyHeaders.add( "te" );
-        dontProxyHeaders.add( "trailer" );
-        dontProxyHeaders.add( "proxy-authorization" );
-        dontProxyHeaders.add( "proxy-authenticate" );
-        dontProxyHeaders.add( "upgrade" );
-    }
-
-    private ServletConfig config;
-
-    private ServletContext context;
-
-    /* (non-Javadoc)
-     * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
-     */
-    @Override
-    public void init( ServletConfig config )
-        throws ServletException
-    {
-        this.config = config;
-        this.context = config.getServletContext();
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.Servlet#getServletConfig()
-     */
-    @Override
-    public ServletConfig getServletConfig()
-    {
-        return config;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
-     */
-    @Override
-    @SuppressWarnings( "checkstyle:methodlength" )
-    public void service( ServletRequest req, ServletResponse res )
-        throws ServletException,
-               IOException
-    {
-        HttpServletRequest request = (HttpServletRequest) req;
-        HttpServletResponse response = (HttpServletResponse) res;
-        if ( "CONNECT".equalsIgnoreCase( request.getMethod() ) )
-        {
-            handleConnect( request, response );
-        }
-        else
-        {
-            String uri = request.getRequestURI();
-            if ( request.getQueryString() != null )
-            {
-                uri += "?" + request.getQueryString();
-            }
-            URL url =
-                new URL( request.getScheme(), request.getServerName(),
-                request.getServerPort(),
-                uri );
-
-            context.log( "\n\n\nURL=" + url );
-
-            URLConnection connection = url.openConnection();
-            connection.setAllowUserInteraction( false );
-
-            // Set method
-            HttpURLConnection http = null;
-            if ( connection instanceof HttpURLConnection )
-            {
-                http = (HttpURLConnection) connection;
-                http.setRequestMethod( request.getMethod() );
-                http.setInstanceFollowRedirects( false );
-            }
-
-            // check connection header
-            String connectionHdr = request.getHeader( "Connection" );
-            if ( connectionHdr != null )
-            {
-                connectionHdr = connectionHdr.toLowerCase();
-                if ( connectionHdr.equals( "keep-alive" ) || connectionHdr.equals( "close" ) )
-                {
-                    connectionHdr = null;
-                }
-            }
-
-            // copy headers
-            boolean xForwardedFor = false;
-            boolean hasContent = false;
-            Enumeration enm = request.getHeaderNames();
-            while ( enm.hasMoreElements() )
-            {
-                // TODO could be better than this!
-                String hdr = (String) enm.nextElement();
-                String lhdr = hdr.toLowerCase();
-
-                if ( dontProxyHeaders.contains( lhdr ) )
-                {
-                    continue;
-                }
-                if ( connectionHdr != null && connectionHdr.indexOf( lhdr ) >= 0 )
-                {
-                    continue;
-                }
-                if ( "content-type".equals( lhdr ) )
-                {
-                    hasContent = true;
-                }
-                Enumeration vals = request.getHeaders( hdr );
-                while ( vals.hasMoreElements() )
-                {
-                    String val = (String) vals.nextElement();
-                    if ( val != null )
-                    {
-                        connection.addRequestProperty( hdr, val );
-                        context.log( "req " + hdr + ": " + val );
-                        xForwardedFor |= "X-Forwarded-For".equalsIgnoreCase( hdr );
-                    }
-                }
-            }
-
-            // Proxy headers
-            connection.setRequestProperty( "Via", "1.1 (jetty)" );
-            if ( !xForwardedFor )
-            {
-                connection.addRequestProperty( "X-Forwarded-For", request.getRemoteAddr() );
-            }
-            // a little bit of cache control
-            String cacheControl = request.getHeader( "Cache-Control" );
-            if ( cacheControl != null
-                && ( cacheControl.indexOf( "no-cache" ) >= 0 || cacheControl.indexOf( "no-store" ) >= 0 ) )
-            {
-                connection.setUseCaches( false );
-
-            // customize Connection
-            }
-            try
-            {
-                connection.setDoInput( true );
-
-                // do input thang!
-                InputStream in = request.getInputStream();
-                if ( hasContent )
-                {
-                    connection.setDoOutput( true );
-                    IO.copy( in, connection.getOutputStream() );
-                }
-
-                // Connect
-                connection.connect();
-            }
-            catch ( Exception e )
-            {
-                context.log( "proxy", e );
-            }
-
-            InputStream proxyIn = null;
-
-            // handler status codes etc.
-            int code = HttpURLConnection.HTTP_INTERNAL_ERROR;
-            if ( http != null )
-            {
-                proxyIn = http.getErrorStream();
-
-                code = http.getResponseCode();
-                response.setStatus( code, http.getResponseMessage() );
-                context.log( "response = " + http.getResponseCode() );
-            }
-
-            if ( proxyIn == null )
-            {
-                try
-                {
-                    proxyIn = connection.getInputStream();
-                }
-                catch ( Exception e )
-                {
-                    context.log( "stream", e );
-                    proxyIn = http.getErrorStream();
-                }
-            }
-
-            // clear response defaults.
-            response.setHeader( "Date", null );
-            response.setHeader( "Server", null );
-
-            // set response headers
-            int h = 0;
-            String hdr = connection.getHeaderFieldKey( h );
-            String val = connection.getHeaderField( h );
-            while ( hdr != null || val != null )
-            {
-                String lhdr = hdr != null ? hdr.toLowerCase() : null;
-                if ( hdr != null && val != null && !dontProxyHeaders.contains( lhdr ) )
-                {
-                    response.addHeader( hdr, val );
-                }
-                context.log( "res " + hdr + ": " + val );
-
-                h++;
-                hdr = connection.getHeaderFieldKey( h );
-                val = connection.getHeaderField( h );
-            }
-            response.addHeader( "Via", "1.1 (jetty)" );
-
-            // Handle
-            if ( proxyIn != null )
-            {
-                IO.copy( proxyIn, response.getOutputStream() );
-            }
-        }
-    }
-
-    /* ------------------------------------------------------------ */
-    public void handleConnect( HttpServletRequest request,
-        HttpServletResponse response )
-        throws IOException
-    {
-        String uri = request.getRequestURI();
-
-        context.log( "CONNECT: " + uri );
-
-        String port = "";
-        String host = "";
-
-        int c = uri.indexOf( ':' );
-        if ( c >= 0 )
-        {
-            port = uri.substring( c + 1 );
-            host = uri.substring( 0, c );
-            if ( host.indexOf( '/' ) > 0 )
-            {
-                host = host.substring( host.indexOf( '/' ) + 1 );
-            }
-        }
-
-        InetSocketAddress inetAddress =
-            new InetSocketAddress( host, Integer.parseInt( port ) );
-
-        InputStream in = request.getInputStream();
-        OutputStream out = response.getOutputStream();
-
-        Socket socket = new Socket( inetAddress.getAddress(), inetAddress.getPort() );
-        context.log( "Socket: " + socket );
-
-        response.setStatus( HttpURLConnection.HTTP_OK );
-        response.setHeader( "Connection", "close" );
-        response.flushBuffer();
-
-
-
-        context.log( "out<-in" );
-        IO.copyThread( socket.getInputStream(), out );
-        context.log( "in->out" );
-        IO.copy( in, socket.getOutputStream() );
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.Servlet#getServletInfo()
-     */
-    @Override
-    public String getServletInfo()
-    {
-        return "Proxy Servlet";
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.Servlet#destroy()
-     */
-    @Override
-    public void destroy()
-    {
-    }
-
-    /**
-     * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
-     * @param request servlet request
-     * @param response servlet response
-     */
-    protected void processRequest( HttpServletRequest request,
-        HttpServletResponse response )
-        throws ServletException, IOException
-    {
-        response.setContentType( "text/html;charset=UTF-8" );
-        try ( PrintWriter out = response.getWriter()  )
-        {
-        /* TODO output your page here
-        out.println("<html>");
-        out.println("<head>");
-        out.println("<title>Servlet ProxyServlet</title>");
-        out.println("</head>");
-        out.println("<body>");
-        out.println("<h1>Servlet ProxyServlet at " + request.getContextPath () + "</h1>");
-        out.println("</body>");
-        out.println("</html>");
-         */
-        }
-    }
-}
diff --git a/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java b/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java
deleted file mode 100644
index 747bdd0..0000000
--- a/archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java
+++ /dev/null
@@ -1,265 +0,0 @@
-package org.apache.maven.archetype.proxy;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.mortbay.util.IO;
-import org.mortbay.util.StringUtil;
-
-/**
- *
- * @author rafale
- */
-public class RepositoryServlet
-    extends HttpServlet
-{
-    private ServletConfig config;
-
-    private ServletContext context;
-
-    /*
-     * (non-Javadoc)
-     * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
-     */
-    @Override
-    public void init( ServletConfig config )
-        throws ServletException
-    {
-        this.config = config;
-        this.context = config.getServletContext();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see javax.servlet.Servlet#getServletConfig()
-     */
-    @Override
-    public ServletConfig getServletConfig()
-    {
-        return config;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
-     */
-    @Override
-    public void service( ServletRequest req, ServletResponse res )
-        throws ServletException
-    {
-        HttpServletRequest request = (HttpServletRequest) req;
-        HttpServletResponse response = (HttpServletResponse) res;
-
-        // log( "A = " + request.getAuthType() );
-        // log( "A = " + request.getCharacterEncoding() );
-        // log( "A = " + request.getContentType() );
-        // log( "B = " + request.getContextPath() );
-        // log( "B = " + request.getLocalAddr() );
-        // log( "B = " + request.getLocalName() );
-        // log( "C = " + request.getMethod() );
-        // log( "C = " + request.getPathInfo() );
-        // log( "C = " + request.getPathTranslated() );
-        // log( "D = " + request.getProtocol() );
-        // log( "D = " + request.getQueryString() );
-        // log( "D = " + request.getRemoteAddr() );
-        // log( "E = " + request.getRemoteHost() );
-        // log( "E = " + request.getRemoteUser() );
-        // log( "E = " + request.getRequestURI() );
-        // log( "F = " + request.getRequestedSessionId() );
-        // log( "F = " + request.getScheme() );
-        // log( "F = " + request.getServerName() );
-        // log( "G = " + request.getServletPath() );
-        // log( "G = " + request.getAttributeNames() );
-        // log( "G = " + request.getCookies() );
-        // log( "H = " + request.getHeaderNames() );
-
-        // log( "H = " + request.get );
-        // log( "H = " + request.get );
-        // log( "I = " + request.get );
-        // log( "I = " + request.get );
-        // log( "I = " + request.get );
-        // log( "J = " + request.get );
-        // log( "J = " + request.get );
-        // log( "J = " + request.get );
-        // log( "K = " + request.get );
-        // log( "K = " + request.get );
-        // log( "K = " + request.get );
-
-        response.setHeader( "Date", null );
-        response.setHeader( "Server", null );
-
-        log( "Proxy Requested file = " + request.getRequestURI() );
-        String filePath =
-            System.getProperty( "org.apache.maven.archetype.repository.directory" ).trim() + "/"
-                + request.getRequestURI();
-        filePath = StringUtil.replace( filePath, "\\", "/" );
-        filePath = StringUtil.replace( filePath, "/", File.separator );
-        log( "Complete file path = " + filePath );
-
-        String method = request.getMethod();
-
-        if ( "GET".equalsIgnoreCase( method ) )
-        {
-            log( "Getting file" );
-            try
-            {
-                File requestedFile = new File( filePath );
-
-                InputStream is = new FileInputStream( requestedFile );
-
-                if ( is != null )
-                {
-                    IO.copy( is, response.getOutputStream() );
-                    response.setStatus( HttpServletResponse.SC_OK );
-                    log( "File sent" );
-                }
-                else
-                {
-                    log( "Can not send file no content" );
-                }
-            }
-            catch ( FileNotFoundException fileNotFoundException )
-            {
-                response.setStatus( HttpServletResponse.SC_NOT_FOUND );
-                log( "Requested file not found ", fileNotFoundException );
-            }
-            catch ( IOException iOException )
-            {
-                response.setStatus( HttpServletResponse.SC_INTERNAL_SERVER_ERROR );
-                log( "Can not send file", iOException );
-            }
-        }
-        else if ( "PUT".equalsIgnoreCase( method ) )
-        {
-            log( "Putting file" );
-            File uploadedFile = new File( filePath );
-            if ( uploadedFile.exists() )
-            {
-                uploadedFile.delete();
-                log( "Removed old file" );
-            }
-            else if ( !uploadedFile.getParentFile().exists() )
-            {
-                uploadedFile.getParentFile().mkdirs();
-                log( "Created directory " + uploadedFile.getParent() );
-            }
-
-            try
-            {
-                FileWriter fw = new FileWriter( uploadedFile );
-                IO.copy( request.getReader(), fw );
-                response.setStatus( HttpServletResponse.SC_OK );
-                log( "File copied" );
-            }
-            catch ( IOException iOException )
-            {
-
-                response.setStatus( HttpServletResponse.SC_INTERNAL_SERVER_ERROR );
-                log( "Can not send file", iOException );
-            }
-        }
-        else
-        {
-
-            response.setStatus( HttpServletResponse.SC_INTERNAL_SERVER_ERROR );
-            try
-            {
-                log( "Method " + request.getMethod() );
-                log( "ContextPath " + request.getContextPath() );
-                log( "QueryString" + request.getQueryString() );
-                log( "PathInfo " + request.getPathInfo() );
-                log( "ServletPath " + request.getServletPath() );
-                log( "AttributeNames " + request.getAttributeNames().toString() );
-                log( "HeaderNames " + request.getHeaderNames().toString() );
-                log( "RequestURL " + request.getRequestURL().toString() );
-                log( "ParameterNames " + request.getParameterNames().toString() );
-                StringWriter w = new StringWriter();
-                IO.copy( request.getReader(), w );
-                log( "Content " + w.toString() );
-            }
-            catch ( IOException iOException )
-            {
-                log( "Error in unnknown method", iOException );
-            }
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see javax.servlet.Servlet#getServletInfo()
-     */
-    @Override
-    public String getServletInfo()
-    {
-        return "Repository Servlet";
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see javax.servlet.Servlet#destroy()
-     */
-    @Override
-    public void destroy()
-    {
-    }
-
-    /**
-     * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
-     * 
-     * @param request servlet request
-     * @param response servlet response
-     */
-    protected void processRequest( HttpServletRequest request, HttpServletResponse response )
-        throws ServletException, IOException
-    {
-        response.setContentType( "text/html;charset=UTF-8" );
-        try ( PrintWriter out = response.getWriter() )
-        {
-            /*
-             * TODO output your page here out.println("<html>"); out.println("<head>");
-             * out.println("<title>Servlet RepositoryServlet</title>"); out.println("</head>"); out.println("<body>");
-             * out.println("<h1>Servlet RepositoryServlet at " + request.getContextPath () + "</h1>");
-             * out.println("</body>"); out.println("</html>");
-             */
-        }
-    }
-
-    @Override
-    public String getServletName()
-    {
-        return "Repository Servlet";
-    }
-
-}
\ No newline at end of file
diff --git a/archetype-testing/archetype-proxy/src/main/webapp/WEB-INF/web.xml b/archetype-testing/archetype-proxy/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index e79ac56..0000000
--- a/archetype-testing/archetype-proxy/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-  <display-name>Archetype Proxy Web Application</display-name>
-  <servlet>
-    <servlet-name>ProxyServlet</servlet-name>
-    <servlet-class>org.apache.maven.archetype.proxy.ProxyServlet</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>RepositoryServlet</servlet-name>
-    <servlet-class>org.apache.maven.archetype.proxy.RepositoryServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>RepositoryServlet</servlet-name>
-    <url-pattern>/*</url-pattern>
-  </servlet-mapping>
-</web-app>
diff --git a/archetype-testing/archetype-repository/pom.xml b/archetype-testing/archetype-repository/pom.xml
deleted file mode 100644
index 4d44d15..0000000
--- a/archetype-testing/archetype-repository/pom.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <artifactId>archetype-testing</artifactId>
-    <groupId>org.apache.maven.archetype</groupId>
-    <version>3.0.2-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>archetype-repository</artifactId>
-  <packaging>war</packaging>
-
-  <name>Maven Archetype Webapp Repository</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>6.1.11</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <!-- Add this in settings to use No authentication is made
-          <proxies>
-          <proxy>
-          <active>true</active>
-          <id>jetty</id>
-          <host>localhost</host>
-          <port>8080</port>
-          <protocol>http</protocol>
-          </proxy>
-          </proxies>
-        -->
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <configuration>
-          <connectors>
-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-              <port>18882</port>
-              <maxIdleTime>60000</maxIdleTime>
-            </connector>
-          </connectors>
-          <webAppConfig>
-            <contextPath>/</contextPath>
-          </webAppConfig>
-          <systemProperties>
-            <systemProperty>
-              <name>org.apache.maven.archetype.repository.directory</name>
-              <value>${project.basedir}/target/repository</value>
-            </systemProperty>
-          </systemProperties>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
\ No newline at end of file
diff --git a/archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java b/archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java
deleted file mode 100644
index a8c742c..0000000
--- a/archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.apache.maven.archetype.repository;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.mortbay.util.IO;
-import org.mortbay.util.StringUtil;
-
-/**
- *
- * @author rafale
- */
-public class RepositoryServlet
-    extends HttpServlet
-{
-    private File getFile( HttpServletRequest request )
-    {
-        log( "Requested file = " + request.getRequestURI() );
-
-        String filePath =
-            System.getProperty( "org.apache.maven.archetype.repository.directory" ).trim() + "/"
-                + request.getRequestURI();
-        filePath = StringUtil.replace( filePath, "\\", File.separator );
-        filePath = StringUtil.replace( filePath, File.separator, "/" );
-        filePath = filePath.replaceAll( "/repo/", "/" );
-        filePath = filePath.replaceAll( "//", "/" );
-        filePath = filePath.replaceAll( "//", "/" );
-        filePath = filePath.replaceAll( "//", "/" );
-        filePath = StringUtil.replace( filePath, "/", File.separator );
-        log( "Complete file path = " + filePath );
-        
-        return new File( filePath );
-    }
-
-    @Override
-    public void doGet( HttpServletRequest request, HttpServletResponse response )
-        throws ServletException
-    {
-        log( "Getting file" );
-        
-        try ( InputStream is = new FileInputStream( getFile( request ) ) )
-        {
-            IO.copy( is, response.getOutputStream() );
-            response.setStatus( HttpServletResponse.SC_OK );
-            log( "File sent" );
-        }
-        catch ( FileNotFoundException fileNotFoundException )
-        {
-            response.setStatus( HttpServletResponse.SC_NOT_FOUND );
-            log( "Requested file not found " );
-        }
-        catch ( IOException iOException )
-        {
-            response.setStatus( HttpServletResponse.SC_INTERNAL_SERVER_ERROR );
-            log( "Cannot send file", iOException );
-        }
-    }
-}
\ No newline at end of file
diff --git a/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-clean-plugin/2.1.1/maven-clean-plugin-2.1.1.jar b/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-clean-plugin/2.1.1/maven-clean-plugin-2.1.1.jar
deleted file mode 100644
index d7645dd..0000000
Binary files a/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-clean-plugin/2.1.1/maven-clean-plugin-2.1.1.jar and /dev/null differ
diff --git a/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-clean-plugin/2.1.1/maven-clean-plugin-2.1.1.jar.sha1 b/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-clean-plugin/2.1.1/maven-clean-plugin-2.1.1.jar.sha1
deleted file mode 100644
index 1ad1c1c..0000000
--- a/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-clean-plugin/2.1.1/maven-clean-plugin-2.1.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c2a1763a75e23880db524df59abcb8e64bf90a7d
\ No newline at end of file
diff --git a/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-clean-plugin/2.1.1/maven-clean-plugin-2.1.1.pom b/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-clean-plugin/2.1.1/maven-clean-plugin-2.1.1.pom
deleted file mode 100644
index 00a6f36..0000000
--- a/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-clean-plugin/2.1.1/maven-clean-plugin-2.1.1.pom
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project>
-  <parent>
-    <artifactId>maven-plugins</artifactId>
-    <groupId>org.apache.maven.plugins</groupId>
-    <version>3</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-clean-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
-  <name>Maven Clean Plugin</name>
-  <version>2.1.1</version>
-  <prerequisites />
-  <issueManagement>
-    <system>JIRA</system>
-    <url>http://jira.codehaus.org/browse/MCLEAN</url>
-  </issueManagement>
-  <inceptionYear>2001</inceptionYear>
-  <contributors>
-    <contributor>
-      <name>Jesse McConnell</name>
-    </contributor>
-  </contributors>
-  <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-2.1.1</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-2.1.1</developerConnection>
-    <url>https://svn.apache.org/repos/asf/maven/plugins/tags/maven-clean-plugin-2.1.1</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>file-management</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>1.1</version>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <status>deployed</status>
-  </distributionManagement>
-</project>
\ No newline at end of file
diff --git a/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-clean-plugin/2.1.1/maven-clean-plugin-2.1.1.pom.sha1 b/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-clean-plugin/2.1.1/maven-clean-plugin-2.1.1.pom.sha1
deleted file mode 100644
index 9c18b65..0000000
--- a/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-clean-plugin/2.1.1/maven-clean-plugin-2.1.1.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1aff1846902ed6c1b8c89cd72ed35f22dc2aab05
\ No newline at end of file
diff --git a/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-clean-plugin/maven-metadata.xml b/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-clean-plugin/maven-metadata.xml
deleted file mode 100644
index a2d214c..0000000
--- a/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-clean-plugin/maven-metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<metadata>
-  <groupId>org.apache.maven.plugins</groupId>
-  <artifactId>maven-clean-plugin</artifactId>
-  <versioning>
-    <latest>2.1.1</latest>
-    <release>2.1.1</release>
-    <versions>
-      <version>2.1.1</version>
-    </versions>
-    <lastUpdated>20070508000000</lastUpdated>
-  </versioning>
-</metadata>
\ No newline at end of file
diff --git a/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-metadata.xml b/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-metadata.xml
deleted file mode 100644
index 87df7bc..0000000
--- a/archetype-testing/archetype-repository/src/main/resources/org/apache/maven/plugins/maven-metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<metadata>
-  <plugins>
-    <plugin>
-      <name>Maven Clean Plugin</name>
-      <prefix>clean</prefix>
-      <artifactId>maven-clean-plugin</artifactId>
-    </plugin>
-  </plugins>
-</metadata>
\ No newline at end of file
diff --git a/archetype-testing/archetype-repository/src/main/webapp/WEB-INF/web.xml b/archetype-testing/archetype-repository/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 90e61e6..0000000
--- a/archetype-testing/archetype-repository/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-  <display-name>Archetype Repository Web Application</display-name>
-  <servlet>
-    <servlet-name>RepositoryServlet</servlet-name>
-    <servlet-class>org.apache.maven.archetype.repository.RepositoryServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>RepositoryServlet</servlet-name>
-    <url-pattern>/*</url-pattern>
-  </servlet-mapping>
-</web-app>
diff --git a/archetype-testing/pom.xml b/archetype-testing/pom.xml
deleted file mode 100644
index c060b8b..0000000
--- a/archetype-testing/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <artifactId>maven-archetype</artifactId>
-    <groupId>org.apache.maven.archetype</groupId>
-    <version>3.0.2-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>archetype-testing</artifactId>
-  <packaging>pom</packaging>
-
-  <name>Maven Archetype Testing</name>
-  <description>Tools used to test Maven Archetype.</description>
-
-  <modules>
-	<module>archetype-final</module>
-    <module>archetype-proxy</module>
-    <module>archetype-repository</module>
-  </modules>
-
-</project>
diff --git a/archetype-testing/src/site/site.xml b/archetype-testing/src/site/site.xml
deleted file mode 100644
index d8fdce1..0000000
--- a/archetype-testing/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
-  <body>
-    <menu ref="parent" inherit="top" />
-  </body>
-</project>
\ No newline at end of file
diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml
index 17d2823..15797ad 100644
--- a/maven-archetype-plugin/pom.xml
+++ b/maven-archetype-plugin/pom.xml
@@ -186,6 +186,9 @@
   <profiles>
     <profile>
       <id>run-its</id>
+      <properties>
+        <maven.it.failure.ignore>false</maven.it.failure.ignore>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -251,6 +254,7 @@
                 <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
                 <https.protocols>${https.protocols}</https.protocols>
               </properties>
+              <ignoreFailures>${maven.it.failure.ignore}</ignoreFailures>
             </configuration>
             <executions>
               <execution>
diff --git a/maven-archetype-plugin/src/it/projects/roundtrip-1-project/archetype.properties b/maven-archetype-plugin/src/it/projects/roundtrip-1-project/archetype.properties
new file mode 100644
index 0000000..6024e90
--- /dev/null
+++ b/maven-archetype-plugin/src/it/projects/roundtrip-1-project/archetype.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+excludePatterns=build.log,invoker.properties,project.pom,test-generate.properties,verify.groovy
\ No newline at end of file
diff --git a/maven-archetype-plugin/src/it/projects/roundtrip-1-project/invoker.properties b/maven-archetype-plugin/src/it/projects/roundtrip-1-project/invoker.properties
new file mode 100644
index 0000000..5d20adb
--- /dev/null
+++ b/maven-archetype-plugin/src/it/projects/roundtrip-1-project/invoker.properties
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals.1 = org.apache.maven.plugins:maven-archetype-plugin:${project.version}:create-from-project
+invoker.project.1 = project.pom
+
+invoker.goals.2 = install
+invoker.project.2 = target/generated-sources/archetype/pom.xml
+
+invoker.goals.3 = org.apache.maven.plugins:maven-archetype-plugin:${project.version}:generate
+invoker.systemPropertiesFile.3 = test-generate.properties
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-1-project/pom.xml b/maven-archetype-plugin/src/it/projects/roundtrip-1-project/project.pom
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-1-project/pom.xml
rename to maven-archetype-plugin/src/it/projects/roundtrip-1-project/project.pom
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-1-project/src/main/java/org/apache/maven/test/App.java b/maven-archetype-plugin/src/it/projects/roundtrip-1-project/src/main/java/org/apache/maven/test/App.java
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-1-project/src/main/java/org/apache/maven/test/App.java
rename to maven-archetype-plugin/src/it/projects/roundtrip-1-project/src/main/java/org/apache/maven/test/App.java
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-1-project/src/test/java/org/apache/maven/test/AppTest.java b/maven-archetype-plugin/src/it/projects/roundtrip-1-project/src/test/java/org/apache/maven/test/AppTest.java
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-1-project/src/test/java/org/apache/maven/test/AppTest.java
rename to maven-archetype-plugin/src/it/projects/roundtrip-1-project/src/test/java/org/apache/maven/test/AppTest.java
diff --git a/maven-archetype-plugin/src/it/projects/roundtrip-1-project/test-generate.properties b/maven-archetype-plugin/src/it/projects/roundtrip-1-project/test-generate.properties
new file mode 100644
index 0000000..25c027c
--- /dev/null
+++ b/maven-archetype-plugin/src/it/projects/roundtrip-1-project/test-generate.properties
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+archetypeArtifactId = test-project-1-archetype
+archetypeGroupId = org.apache.maven.test
+archetypeVersion = 1.0
+
+outputDirectory = out
+
+groupId = com.mycompany
+artifactId = myapp
+version = 1.0-SNAPSHOT
+package = com.mycompany.myapp
\ No newline at end of file
diff --git a/maven-archetype-plugin/src/it/projects/roundtrip-1-project/verify.groovy b/maven-archetype-plugin/src/it/projects/roundtrip-1-project/verify.groovy
new file mode 100644
index 0000000..a68b416
--- /dev/null
+++ b/maven-archetype-plugin/src/it/projects/roundtrip-1-project/verify.groovy
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ //ASSERT symbol_pound replacement (archetype-180 archetype-183)
+def content = new File(basedir, 'out/myapp/src/main/java/com/mycompany/myapp/App.java').text
+assert content.indexOf( '//A   #\\{some}' ) > 0
+assert content.indexOf( '//B   #{some}' ) > 0
+assert content.indexOf( '//C   #{some other}' ) > 0
+assert content.indexOf( '//D   \\#{some other}' ) > 0
+assert content.indexOf( '//E   #{}' ) > 0
+assert content.indexOf( '//F   {some}' ) > 0
+assert content.indexOf( '//G   ${someOtherProperty}' ) > 0
+assert content.indexOf( '//H   ${someValue}' ) > 0
+assert content.indexOf( '/*' ) > 0
+assert content.indexOf( '  A   #\\{some}' ) > 0
+assert content.indexOf( '  B   #{some}' ) > 0
+assert content.indexOf( '  C   #{some other}' ) > 0
+assert content.indexOf( '  D   \\#{some other}' ) > 0
+assert content.indexOf( '  E   #{}' ) > 0
+assert content.indexOf( '  F   {some}' ) > 0
+assert content.indexOf( '  G   ${someOtherProperty}' ) > 0
+assert content.indexOf( '  H   ${someValue}' ) > 0
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/.checkstyle b/maven-archetype-plugin/src/it/projects/roundtrip-multi/.checkstyle
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/.checkstyle
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/.checkstyle
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/.classpath b/maven-archetype-plugin/src/it/projects/roundtrip-multi/.classpath
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/.classpath
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/.classpath
diff --git a/maven-archetype-plugin/src/it/projects/roundtrip-multi/archetype.properties b/maven-archetype-plugin/src/it/projects/roundtrip-multi/archetype.properties
new file mode 100644
index 0000000..6024e90
--- /dev/null
+++ b/maven-archetype-plugin/src/it/projects/roundtrip-multi/archetype.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+excludePatterns=build.log,invoker.properties,project.pom,test-generate.properties,verify.groovy
\ No newline at end of file
diff --git a/maven-archetype-plugin/src/it/projects/roundtrip-multi/invoker.properties b/maven-archetype-plugin/src/it/projects/roundtrip-multi/invoker.properties
new file mode 100644
index 0000000..a7bc0a4
--- /dev/null
+++ b/maven-archetype-plugin/src/it/projects/roundtrip-multi/invoker.properties
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.goals.1 = org.apache.maven.plugins:maven-archetype-plugin:${project.version}:create-from-project
+
+invoker.goals.2 = install
+invoker.project.2 = target/generated-sources/archetype/pom.xml
+
+invoker.goals.3 = org.apache.maven.plugins:maven-archetype-plugin:${project.version}:generate
+invoker.systemPropertiesFile.3 = test-generate.properties
\ No newline at end of file
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/pom.xml b/maven-archetype-plugin/src/it/projects/roundtrip-multi/pom.xml
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/pom.xml
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/pom.xml
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-memory/.checkstyle b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-api/.checkstyle
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-memory/.checkstyle
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-api/.checkstyle
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-memory/.classpath b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-api/.classpath
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-memory/.classpath
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-api/.classpath
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-api/pom.xml b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-api/pom.xml
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-api/pom.xml
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-api/pom.xml
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-api/src/main/java/com/company/proficio/api/Api.java b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-api/src/main/java/com/company/proficio/api/Api.java
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-api/src/main/java/com/company/proficio/api/Api.java
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-api/src/main/java/com/company/proficio/api/Api.java
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-model/.checkstyle b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-cli/.checkstyle
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-model/.checkstyle
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-cli/.checkstyle
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-model/.classpath b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-cli/.classpath
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-model/.classpath
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-cli/.classpath
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-cli/pom.xml b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-cli/pom.xml
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-cli/pom.xml
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-cli/pom.xml
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-cli/src/main/java/com/company/proficio/cli/Cli.java b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-cli/src/main/java/com/company/proficio/cli/Cli.java
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-cli/src/main/java/com/company/proficio/cli/Cli.java
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-cli/src/main/java/com/company/proficio/cli/Cli.java
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-core/.checkstyle b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-core/.checkstyle
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-core/.checkstyle
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-core/.checkstyle
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-core/.classpath b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-core/.classpath
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-core/.classpath
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-core/.classpath
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-core/pom.xml b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-core/pom.xml
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-core/pom.xml
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-core/pom.xml
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-core/src/main/java/com/company/proficio/core/Core.java b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-core/src/main/java/com/company/proficio/core/Core.java
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-core/src/main/java/com/company/proficio/core/Core.java
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-core/src/main/java/com/company/proficio/core/Core.java
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-cli/.checkstyle b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-model/.checkstyle
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-cli/.checkstyle
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-model/.checkstyle
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-cli/.classpath b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-model/.classpath
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-cli/.classpath
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-model/.classpath
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-model/pom.xml b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-model/pom.xml
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-model/pom.xml
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-model/pom.xml
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-model/src/main/java/org/company/proficio/model/Model.java b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-model/src/main/java/org/company/proficio/model/Model.java
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-model/src/main/java/org/company/proficio/model/Model.java
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-model/src/main/java/org/company/proficio/model/Model.java
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/pom.xml b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/pom.xml
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/pom.xml
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/pom.xml
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-api/.checkstyle b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-memory/.checkstyle
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-api/.checkstyle
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-memory/.checkstyle
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-api/.classpath b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-memory/.classpath
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-api/.classpath
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-memory/.classpath
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-memory/pom.xml b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-memory/pom.xml
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-memory/pom.xml
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-memory/pom.xml
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-memory/src/main/java/com/company/proficio/store/memory/Memory.java b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-memory/src/main/java/com/company/proficio/store/memory/Memory.java
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-memory/src/main/java/com/company/proficio/store/memory/Memory.java
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-memory/src/main/java/com/company/proficio/store/memory/Memory.java
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/.checkstyle b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/.checkstyle
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/.checkstyle
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/.checkstyle
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/.classpath b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/.classpath
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/.classpath
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/.classpath
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/pom.xml b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/pom.xml
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/pom.xml
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/pom.xml
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/src/main/java/com/company/proficio/store/xstream/XStream.java b/maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/src/main/java/com/company/proficio/store/xstream/XStream.java
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/src/main/java/com/company/proficio/store/xstream/XStream.java
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/proficio-stores/proficio-store-xstream/src/main/java/com/company/proficio/store/xstream/XStream.java
diff --git a/archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/src/site/site.xml b/maven-archetype-plugin/src/it/projects/roundtrip-multi/src/site/site.xml
similarity index 100%
rename from archetype-testing/archetype-final/src/test/resources/projects/roundtrip-multi/src/site/site.xml
rename to maven-archetype-plugin/src/it/projects/roundtrip-multi/src/site/site.xml
diff --git a/maven-archetype-plugin/src/it/projects/roundtrip-multi/test-generate.properties b/maven-archetype-plugin/src/it/projects/roundtrip-multi/test-generate.properties
new file mode 100644
index 0000000..d4ccaba
--- /dev/null
+++ b/maven-archetype-plugin/src/it/projects/roundtrip-multi/test-generate.properties
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+archetypeArtifactId = proficio-archetype
+archetypeGroupId = com.company.proficio
+archetypeVersion = 1.0-SNAPSHOT
+
+outputDirectory = out
+
+groupId = com.mycompany
+artifactId = myapp
+version = 1.0-SNAPSHOT
+package = com.mycompany.myapp
\ No newline at end of file
diff --git a/maven-archetype-plugin/src/it/projects/roundtrip-multi/verify.groovy b/maven-archetype-plugin/src/it/projects/roundtrip-multi/verify.groovy
new file mode 100644
index 0000000..6facc33
--- /dev/null
+++ b/maven-archetype-plugin/src/it/projects/roundtrip-multi/verify.groovy
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+def myapp = new File(basedir, 'out/myapp')
+assert new File(myapp,'myapp-api/.classpath').exists()
+assert new File(myapp,'myapp-cli/.classpath').exists()
+assert new File(myapp,'myapp-core/.classpath').exists()
+assert new File(myapp,'myapp-model/.classpath').exists()
+assert new File(myapp,'myapp-stores/myapp-store-memory/.classpath').exists()
+assert new File(myapp,'myapp-stores/myapp-store-xstream/.classpath').exists()
+
+assert new File(myapp,'myapp-api/.checkstyle').exists()
+assert new File(myapp,'myapp-cli/.checkstyle').exists()
+assert new File(myapp,'myapp-core/.checkstyle').exists()
+assert new File(myapp,'myapp-model/.checkstyle').exists()
+assert new File(myapp,'myapp-stores/myapp-store-memory/.checkstyle').exists()
+assert new File(myapp,'myapp-stores/myapp-store-xstream/.checkstyle').exists()
\ No newline at end of file
diff --git a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
index 14007c8..e53de07 100644
--- a/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
+++ b/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
@@ -138,8 +138,8 @@ public class CreateProjectFromArchetypeMojo
     @Parameter( property = "interactiveMode", defaultValue = "${settings.interactiveMode}", required = true )
     private Boolean interactiveMode;
 
-    @Parameter( defaultValue = "${basedir}" )
-    private File basedir;
+    @Parameter( defaultValue = "${basedir}", property = "outputDirectory" )
+    private File outputDirectory;
 
     @Parameter( defaultValue = "${session}", readonly = true )
     private MavenSession session;
@@ -173,7 +173,7 @@ public class CreateProjectFromArchetypeMojo
             new ArchetypeGenerationRequest().setArchetypeGroupId( archetypeGroupId )
             .setArchetypeArtifactId( archetypeArtifactId )
             .setArchetypeVersion( archetypeVersion )
-            .setOutputDirectory( basedir.getAbsolutePath() )
+            .setOutputDirectory( outputDirectory.getAbsolutePath() )
             .setLocalRepository( localRepository )
             .setRemoteArtifactRepositories( remoteArtifactRepositories )
             .setFilter( filter )
@@ -237,7 +237,7 @@ public class CreateProjectFromArchetypeMojo
     {
         getLog().info( "Invoking post-archetype-generation goals: " + goals );
 
-        File projectBasedir = new File( basedir, artifactId );
+        File projectBasedir = new File( outputDirectory, artifactId );
 
         if ( projectBasedir.exists() )
         {
diff --git a/pom.xml b/pom.xml
index bf287f3..e7b8f87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,6 @@
   <inceptionYear>2007</inceptionYear>
 
   <modules>
-    <module>archetype-testing</module>
     <module>archetype-models</module>
     <module>archetype-common</module>
     <module>maven-archetype-plugin</module>