From b36944baaa5c1c20f87a0e13dc019b11126cfd4d Mon Sep 17 00:00:00 2001
From: Andreea Dragoi <andreea.dragoi@ness.com>
Date: Tue, 15 Dec 2015 13:18:23 +0000
Subject: [PATCH] Merged HEAD (5.1) to 5.1.N (5.1.1)    119937 jphuynh: Merged
 5.1-MC1 (5.1.0) to HEAD (5.1)       119423 skopf: Merged AOS-SEPARATION
 (5.1.0) to 5.1-MC1 (5.1.0)          115135 skopf: ALF-21405 - AOS should be
 an optional removable module:          BDE-415 - Include AOS module in
 installer:          Get sharepoint-masquerade from
 alfresco-sharepoint-masquerade-distributionzip instead of individually from
 repository and local files

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120187 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index ad1cb57da3..7eb30a724d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -297,29 +297,12 @@
                                     <outputDirectory>${project.build.directory}/distribution/${alfresco.distribution.name}-${project.version}/web-server/webapps</outputDirectory>
                                     <includes>solr4.war</includes>
                                 </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>get-sharepoint-masquerade</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
                                 <artifactItem>
                                     <groupId>org.alfresco.sharepoint-masquerade</groupId>
-                                    <artifactId>alfresco-sharepoint-masquerade</artifactId>
+                                    <artifactId>alfresco-sharepoint-masquerade-distributionzip</artifactId>
                                     <version>${alfresco.sharepoint-masquerade.version}</version>
-                                    <type>amp</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.alfresco.sharepoint-masquerade</groupId>
-                                    <artifactId>alfresco-vti-bin</artifactId>
-                                    <version>${alfresco.sharepoint-masquerade.version}</version>
-                                    <destFileName>_vti_bin.war</destFileName>
-                                    <type>war</type>
+                                    <type>zip</type>
+                                    <outputDirectory>${project.build.directory}/distribution/sharepoint-masquerade</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>