diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml
index 8e4b1a6c..a23d8670 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml
@@ -24,6 +24,57 @@
             <artifactId>alfresco-repository</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>  
+            <!-- Copied PostgreSQL dialect files to generate H2 dialect files on-the-fly -->
+            <plugin>  
+               <artifactId>maven-dependency-plugin</artifactId>
+               <executions>
+                  <execution>
+                     <id>get-postgres-dialect</id>
+                     <phase>generate-test-resources</phase>
+                     <goals>
+                         <goal>unpack</goal>
+                     </goals>
+                     <configuration>
+                         <artifactItems>
+                             <artifactItem>
+                                 <groupId>${alfresco.groupId}</groupId>
+                                 <artifactId>alfresco-repository</artifactId>
+                                 <version>${alfresco.version}</version>
+                             </artifactItem>
+                         </artifactItems>
+                         <includes>alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/*,alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/*</includes>
+                         <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+                     </configuration>
+                  </execution>
+               </executions>
+            </plugin>
+
+            <plugin>
+               <artifactId>maven-antrun-plugin</artifactId>
+               <executions>
+                  <execution>
+                     <id>config-h2-dialect</id>
+                     <phase>generate-test-resources</phase>
+                     <goals>
+                         <goal>run</goal>
+                     </goals>
+                     <configuration>
+                         <target>
+                             <move verbose="true"
+                                file="${project.build.testOutputDirectory}/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect"
+                                tofile="${project.build.testOutputDirectory}/alfresco/dbscripts/create/org.hibernate.dialect.H2Dialect" />
+                             <move verbose="true"
+                                file="${project.build.testOutputDirectory}/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect"
+                                tofile="${project.build.testOutputDirectory}/alfresco/ibatis/org.hibernate.dialect.H2Dialect" />
+                         </target>
+                     </configuration>
+                  </execution>
+               </executions>
+            </plugin>  
+        </plugins>  
+    </build>
     
     <properties>
         <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war switch
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
index fded63e2..3e55d0c1 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
@@ -17,53 +17,6 @@
             <id>run</id>
             <build>
                 <plugins>
-                    <!-- Copied PostgreSQL dialect files to generate H2 dialect files on-the-fly -->
-                    <plugin>
-                       <artifactId>maven-dependency-plugin</artifactId>
-                       <executions>
-                          <execution>
-                             <id>get-postgres-dialect</id>
-                             <phase>generate-test-resources</phase>
-                             <goals>
-                                 <goal>unpack</goal>
-                             </goals>
-                             <configuration>
-                                 <artifactItems>
-                                     <artifactItem>
-                                         <groupId>${alfresco.groupId}</groupId>
-                                         <artifactId>alfresco-repository</artifactId>
-                                         <version>${alfresco.version}</version>
-                                     </artifactItem>
-                                 </artifactItems>
-                                 <includes>alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/*,alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/*</includes>
-                                 <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
-                             </configuration>
-                          </execution>
-                       </executions>
-                    </plugin>
-                    <plugin>
-                       <artifactId>maven-antrun-plugin</artifactId>
-                       <executions>
-                          <execution>
-                             <id>config-h2-dialect</id>
-                             <phase>generate-test-resources</phase>
-                             <goals>
-                                 <goal>run</goal>
-                             </goals>
-                             <configuration>
-                                 <target>
-                                     <move verbose="true"
-                                        file="${project.build.testOutputDirectory}/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect"
-                                        tofile="${project.build.testOutputDirectory}/alfresco/dbscripts/create/org.hibernate.dialect.H2Dialect" />
-                                     <move verbose="true"
-                                        file="${project.build.testOutputDirectory}/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect"
-                                        tofile="${project.build.testOutputDirectory}/alfresco/ibatis/org.hibernate.dialect.H2Dialect" />
-                                 </target>
-                             </configuration>
-                          </execution>
-                       </executions>
-                    </plugin>  
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-resources-plugin</artifactId>
@@ -106,7 +59,7 @@
                                 <solr.solr.home>${project.parent.basedir}/solr/solr_home</solr.solr.home>
                             </systemProperties>
                             <webapps>
-								<webapp>
+                              <webapp>
                                     <groupId>${project.groupId}</groupId>
                                     <artifactId>solr</artifactId>
                                     <version>${project.version}</version>