Properly separate enterprise tests, execute with correct share version

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml

@@ -1,8 +1,8 @@
 #set( $symbol_pound = '#' )
-        #set( $symbol_dollar = '$' )
-        #set( $symbol_escape = '\' )
-        <?xml version='1.0' encoding='UTF-8'?>
-        <!--
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?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.
@@ -17,7 +17,7 @@
     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.
-        -->
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans

archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/goal.txt

@@ -1 +1 @@
-install -Dalfresco.platform.version=@@alfresco.enterprise.default.version@@ -Dmaven.alfresco.edition=@@alfresco.sdk.default.edition@@
+install -Dalfresco.platform.version=@@alfresco.enterprise.default.version@@ -Dalfresco.share.version=@@alfresco.enterprise.default.version@@ -Dmaven.alfresco.edition=enterprise

archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise42/goal.txt

@@ -1 +1 @@
-install -Dalfresco.platform.version=4.2.7 -Dmaven.alfresco.edition=enterprise
+install -Dalfresco.platform.version=4.2.7 -Dalfresco.share.version=4.2.7 -Dmaven.alfresco.edition=enterprise

archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise50/goal.txt

@@ -1 +1 @@
-install -Dalfresco.platform.version=5.0 -Dmaven.alfresco.edition=enterprise
+install -Dalfresco.platform.version=5.0 -Dalfresco.share.version=5.0 -Dmaven.alfresco.edition=enterprise

archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise51/goal.txt

@@ -1 +1 @@
-install -Dalfresco.platform.version=5.1 -Dmaven.alfresco.edition=enterprise
+install -Dalfresco.platform.version=5.1 -Dalfresco.share.version=5.1 -Dmaven.alfresco.edition=enterprise

pom.xml

@@ -136,7 +136,7 @@
         <maven.compiler.target>1.7</maven.compiler.target>
         <maven.archetype.version>3.0.0</maven.archetype.version>
         <alfresco.sdk.parent.version>${project.version}</alfresco.sdk.parent.version>
-        <alfresco.sdk.tests.exclude>*/*-enterprise/*</alfresco.sdk.tests.exclude>
+        <alfresco.sdk.tests.exclude>*/*-enterprise*/*</alfresco.sdk.tests.exclude>
 
         <!-- The following version is needed for alfresco-rad -->
         <alfresco.community.default.version>5.2.e</alfresco.community.default.version>
@@ -176,6 +176,16 @@
                 <version>2.10</version>
             </extension>
         </extensions>
+        <testResources>
+            <testResource>
+                <filtering>true</filtering>
+                <directory>src/test/resources</directory>
+                <excludes>
+                    <exclude>${alfresco.sdk.tests.exclude}</exclude>
+                </excludes>
+            </testResource>
+        </testResources>
+
     </build>
 
     <repositories>
@@ -231,27 +241,6 @@
             </distributionManagement>
         </profile>
 
-        <profile>
-            <id>exclude-enterprise-tests-for-archetypes</id>
-            <activation>
-                <file>
-                    <exists>src/test/resources/projects</exists>
-                </file>
-            </activation>
-            <build>
-                <testResources>
-                    <testResource>
-                        <filtering>true</filtering>
-                        <directory>src/test/resources</directory>
-                        <excludes>
-                            <exclude>${alfresco.sdk.tests.exclude}</exclude>
-                        </excludes>
-                    </testResource>
-                </testResources>
-
-            </build>
-        </profile>
-
         <profile>
             <id>enterprise-tests</id>
             <properties>