inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

Browse Source 
124767 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      124406 jphuynh: ACE-5135: Pre-apply share-services AMP in alfresco.war packaged in EAR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@124772 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-04-04 09:00:14 +00:00
parent 048b7ef6ac 7286b41cb9
commit 3ebff40bc3
3 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ear/pom.xml
View File

@@ -26,8 +26,8 @@
<!-- WARs to include in the EAR -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-platform-enterprise</artifactId>
<version>${alfresco.platform.version}</version>
<artifactId>alfresco-enterprise-war-for-ear</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
@@ -184,7 +184,7 @@
<modules>
<webModule>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-platform-enterprise</artifactId>
<artifactId>alfresco-enterprise-war-for-ear</artifactId>
<bundleFileName>alfresco.war</bundleFileName>
</webModule>
<webModule>

57
enterprise-war-for-ear/pom.xml Normal file
View File

@@ -0,0 +1,57 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-enterprise-war-for-ear</artifactId>
<name>Alfresco Enterprise WAR for inclusion in EAR</name>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-full-installation</artifactId>
<version>2015-SNAPSHOT</version>
</parent>
<packaging>war</packaging>
<dependencies>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-platform-enterprise</artifactId>
<version>${alfresco.platform.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-share-services</artifactId>
<version>${alfresco.share.version}</version>
<type>amp</type>
</dependency>
</dependencies>
<build>
<finalName>alfresco</finalName>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<!-- Add dependency to alfresco-maven-plugin, to allow AMP overlays -->
<dependencies>
<dependency>
<groupId>org.alfresco.maven.plugin</groupId>
<artifactId>alfresco-maven-plugin</artifactId>
<version>2.1.1</version>
</dependency>
</dependencies>
<configuration>
<overlays>
<overlay>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-platform-enterprise</artifactId>
<type>war</type>
</overlay>
<overlay>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-share-services</artifactId>
<type>amp</type>
</overlay>
</overlays>
</configuration>
</plugin>
</plugins>
</build>
</project>

1
pom.xml
View File

@@ -80,6 +80,7 @@
<profile>
<id>enterprise</id>
<modules>
<module>enterprise-war-for-ear</module>
<module>ear</module>
<module>enterprise-distribution</module>
<module>enterprise-update</module>