From a3b85225246ec0449e045117fca60cebfc7e59af Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Thu, 5 May 2016 11:53:05 +0000
Subject: [PATCH] Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)    126106 slanglois:
 MNT-16094 Apply alfresco-aos-module to alfresco.war in EAR

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@126116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 enterprise-war-for-ear/pom.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/enterprise-war-for-ear/pom.xml b/enterprise-war-for-ear/pom.xml
index 33f736a84c..ad181f8c66 100644
--- a/enterprise-war-for-ear/pom.xml
+++ b/enterprise-war-for-ear/pom.xml
@@ -22,6 +22,18 @@
             <version>${alfresco.share.version}</version>
             <type>amp</type>
         </dependency>
+        <dependency>
+            <groupId>org.alfresco.aos-module</groupId>
+            <artifactId>alfresco-aos-module</artifactId>
+            <version>${alfresco.aos-module.version}</version>
+            <type>amp</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -34,7 +46,7 @@
                     <dependency>
                         <groupId>org.alfresco.maven.plugin</groupId>
                         <artifactId>alfresco-maven-plugin</artifactId>
-                        <version>2.1.1</version>
+                        <version>2.2.0</version>
                     </dependency>
                 </dependencies>
                 <configuration>
@@ -49,6 +61,11 @@
                             <artifactId>alfresco-share-services</artifactId>
                             <type>amp</type>
                         </overlay>
+                        <overlay>
+                            <groupId>org.alfresco.aos-module</groupId>
+                            <artifactId>alfresco-aos-module</artifactId>
+                            <type>amp</type>
+                        </overlay>
                     </overlays>
                 </configuration>
             </plugin>