Merged HEAD-BUG-FIX (6.0/Cloud) to trunk (5.1/Cloud)

   106252: Merge RA-SPRINT6 to HEAD-BUG-FIX (5.1)
      105167: Use AMP overlay in the war rather than calling the alfresco-maven-plugin directly


git-svn-id: https://svn.alfresco.com/repos/alfresco-open-mirror/web-apps/Share/trunk@106331 7033f55c-6c29-4ad8-afba-765cb616e738

alfresco/pom.xml

@@ -25,6 +25,14 @@
             <type>war</type>
             <scope>runtime</scope>
         </dependency>
+
+        <!-- share-services AMP -->
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-share-services</artifactId>
+            <version>${project.version}</version>
+            <type>amp</type>
+        </dependency>
     </dependencies>
 
     <build>
@@ -42,6 +50,11 @@
                             <!-- <classifier>nossl</classifier> -->
                             <excludes/>
                         </overlay>
+                        <overlay>
+                            <groupId>org.alfresco</groupId>
+                            <artifactId>alfresco-share-services</artifactId>
+                            <type>amp</type>
+                        </overlay>
                     </overlays>
                 </configuration>
                 <!-- This allows overlays to be prepared on the FS for minification and faster run -->
@@ -75,52 +88,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <!-- Fetch amp files -->
-                    <execution>
-                        <id>fetch-amps</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-share-services</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>amp</type>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>target/amps</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Apply amp files -->
-            <plugin>
-                <groupId>org.alfresco.maven.plugin</groupId>
-                <artifactId>alfresco-maven-plugin</artifactId>
-                <configuration>
-                    <warLocation>${project.build.directory}/${project.build.finalName}</warLocation>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>install-amps</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>install</goal>
-                        </goals>
-                        <configuration>
-                            <ampLocation>target/amps</ampLocation>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>