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
This commit is contained in:
Alan Davis
2016-05-05 11:53:05 +00:00
parent ecf3e0dd1f
commit a3b8522524

View File

@@ -22,6 +22,18 @@
<version>${alfresco.share.version}</version> <version>${alfresco.share.version}</version>
<type>amp</type> <type>amp</type>
</dependency> </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> </dependencies>
<build> <build>
@@ -34,7 +46,7 @@
<dependency> <dependency>
<groupId>org.alfresco.maven.plugin</groupId> <groupId>org.alfresco.maven.plugin</groupId>
<artifactId>alfresco-maven-plugin</artifactId> <artifactId>alfresco-maven-plugin</artifactId>
<version>2.1.1</version> <version>2.2.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
@@ -49,6 +61,11 @@
<artifactId>alfresco-share-services</artifactId> <artifactId>alfresco-share-services</artifactId>
<type>amp</type> <type>amp</type>
</overlay> </overlay>
<overlay>
<groupId>org.alfresco.aos-module</groupId>
<artifactId>alfresco-aos-module</artifactId>
<type>amp</type>
</overlay>
</overlays> </overlays>
</configuration> </configuration>
</plugin> </plugin>