From c5445b1f15e2e7d4d70227368b01465ced5ee675 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Thu, 2 Jun 2016 14:55:50 +0000
Subject: [PATCH 01/12] Merged 5.2.N (5.2.2) to trunk (5.2) (RECORD ONLY)    -
 Commits from trunk: 126267    - record only commits from 5.1.N:     
 126666,127017,127070,127127,127164,127196,127211,     
 127255,127291,127364,127401,127515

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

From 3e0bce08abc8797f5f3c3d171e8320e5e7556a2d Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 3 Jun 2016 12:58:58 +0000
Subject: [PATCH 02/12] Merged 5.2.N (5.2.1) to trunk (5.2)    124770 adavis:
 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)       124598 slanglois: Merged 5.1.1
 (5.1.1) to 5.1.N (5.1.2)          124596 slanglois: ACE-5135 Add aspecjrt jar
 to myfaces1_1-websphere-shared-lib

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127626 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 ear/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ear/pom.xml b/ear/pom.xml
index 534694d749..e42a6dbb00 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -157,6 +157,12 @@
             <version>4.3.2</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>1.8.2</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

From 66c2fbf73ecdd47821c6eb060a77693c4a1d4219 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 3 Jun 2016 13:03:59 +0000
Subject: [PATCH 03/12] Merged 5.2.N (5.2.1) to trunk (5.2)    124772 adavis:
 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)       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/trunk@127627 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 36d2fc1789..f4e7cd5b15 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>

From 40833506419ee48055046f524a6994611b8ab54e Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 3 Jun 2016 13:05:07 +0000
Subject: [PATCH 04/12] Merged 5.2.N (5.2.1) to trunk (5.2)    124773 adavis:
 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)       124768 adavis: Merged 5.1.1
 (5.1.1) to 5.1.N (5.1.2)          124408 jphuynh: ACE-5135: Fixed
 alfresco-full-installation version

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127628 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

From 9157daf3177e3c6ee8e890c46a57e0e50830edc0 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 3 Jun 2016 13:05:27 +0000
Subject: [PATCH 05/12] Merged 5.2.N (5.2.1) to trunk (5.2)    125450
 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)       125343 rneamtu: Merged
 5.1.1 (5.1.1) to 5.1.N (5.1.2)          125254 amukha: ACE-5130: [SUSE 12.0,
 Web Logic] - Admin Console - Install Application Assistant - Install Alfresco
 Failed             - removed _vti_bin.war from the configuration as it is no
 longer shipped in the ear.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127629 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 ear/src/main/application/META-INF/application.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ear/src/main/application/META-INF/application.xml b/ear/src/main/application/META-INF/application.xml
index a659dcb723..426a2d396c 100644
--- a/ear/src/main/application/META-INF/application.xml
+++ b/ear/src/main/application/META-INF/application.xml
@@ -20,10 +20,4 @@
          <context-root>/</context-root>
      </web>
    </module>
-   <module>
-     <web>
-         <web-uri>_vti_bin.war</web-uri>
-         <context-root>/_vti_bin</context-root>
-     </web>
-   </module>
 </application>

From d0ba492e3f3274839d9a56acb9be175a5881c720 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 3 Jun 2016 13:11:22 +0000
Subject: [PATCH 06/12] Merged 5.2.N (5.2.1) to trunk (5.2)    125451
 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)       125344 rneamtu: Merged
 5.1.1 (5.1.1) to 5.1.N (5.1.2)          125267 slanglois: MNT-16094 Remove
 ROOT.war from the Alfresco One EAR

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 ear/pom.xml                                       | 11 -----------
 ear/src/main/application/META-INF/application.xml |  6 ------
 2 files changed, 17 deletions(-)

diff --git a/ear/pom.xml b/ear/pom.xml
index e42a6dbb00..79dc0a58ab 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -36,12 +36,6 @@
             <version>${alfresco.share.version}</version>
             <type>war</type>
         </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-server-root</artifactId>
-            <version>${alfresco.platform.version}</version>
-            <type>war</type>
-        </dependency>
 
         <!-- Provided dependencies, unpacked -->
         <!-- Distribution zip -->
@@ -192,11 +186,6 @@
                             <artifactId>share</artifactId>
                             <bundleFileName>share.war</bundleFileName>
                         </webModule>
-                        <webModule>
-                            <groupId>org.alfresco</groupId>
-                            <artifactId>alfresco-server-root</artifactId>
-                            <bundleFileName>ROOT.war</bundleFileName>
-                        </webModule>
                     </modules>
                 </configuration>
             </plugin>
diff --git a/ear/src/main/application/META-INF/application.xml b/ear/src/main/application/META-INF/application.xml
index 426a2d396c..badc540b66 100644
--- a/ear/src/main/application/META-INF/application.xml
+++ b/ear/src/main/application/META-INF/application.xml
@@ -14,10 +14,4 @@
          <context-root>/share</context-root>
      </web>
    </module>
-   <module>
-     <web>
-         <web-uri>ROOT.war</web-uri>
-         <context-root>/</context-root>
-     </web>
-   </module>
 </application>

From 342bcf34cbb6abfa79214485fc374e7f94461cea Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 3 Jun 2016 13:12:09 +0000
Subject: [PATCH 07/12] Merged 5.2.N (5.2.1) to trunk (5.2)    125810
 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)       125617 rmunteanu:
 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)          125598 slanglois: ACE-5253
 Bring AOS (ROOT.war and _vti_bin.war) back into the EAR

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 ear/pom.xml                                   | 22 +++++++++++++++++++
 .../main/application/META-INF/application.xml | 12 ++++++++++
 2 files changed, 34 insertions(+)

diff --git a/ear/pom.xml b/ear/pom.xml
index 79dc0a58ab..f56310e940 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -36,6 +36,18 @@
             <version>${alfresco.share.version}</version>
             <type>war</type>
         </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-server-root</artifactId>
+            <version>${alfresco.platform.version}</version>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco.aos-module</groupId>
+            <artifactId>alfresco-vti-bin</artifactId>
+            <version>${alfresco.aos-module.version}</version>
+            <type>war</type>
+        </dependency>
 
         <!-- Provided dependencies, unpacked -->
         <!-- Distribution zip -->
@@ -186,6 +198,16 @@
                             <artifactId>share</artifactId>
                             <bundleFileName>share.war</bundleFileName>
                         </webModule>
+                        <webModule>
+                            <groupId>org.alfresco</groupId>
+                            <artifactId>alfresco-server-root</artifactId>
+                            <bundleFileName>ROOT.war</bundleFileName>
+                        </webModule>
+                        <webModule>
+                            <groupId>org.alfresco.aos-module</groupId>
+                            <artifactId>alfresco-vti-bin</artifactId>
+                            <bundleFileName>_vti_bin.war</bundleFileName>
+                        </webModule>
                     </modules>
                 </configuration>
             </plugin>
diff --git a/ear/src/main/application/META-INF/application.xml b/ear/src/main/application/META-INF/application.xml
index badc540b66..a659dcb723 100644
--- a/ear/src/main/application/META-INF/application.xml
+++ b/ear/src/main/application/META-INF/application.xml
@@ -14,4 +14,16 @@
          <context-root>/share</context-root>
      </web>
    </module>
+   <module>
+     <web>
+         <web-uri>ROOT.war</web-uri>
+         <context-root>/</context-root>
+     </web>
+   </module>
+   <module>
+     <web>
+         <web-uri>_vti_bin.war</web-uri>
+         <context-root>/_vti_bin</context-root>
+     </web>
+   </module>
 </application>

From 27b8ab4f995ba5332458b099ad76c20af0dfceae Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 3 Jun 2016 13:12:51 +0000
Subject: [PATCH 08/12] Merged 5.2.N (5.2.1) to trunk (5.2)    126117 adavis:
 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)       126086 aleahu: Merged 5.1.1
 (5.1.1) to 5.1.N (5.1.2)          126048 jphuynh: MNT-16233: Use AOS 1.1.1.
 (Incomplete version bump from ACE-5133 done in Platform)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 434212c4d0..0f51a173d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
         <alfresco.googledocs.version>3.0.3</alfresco.googledocs.version>
 
         <!-- Alfresco Office Services Module -->
-        <alfresco.aos-module.version>1.1</alfresco.aos-module.version>
+        <alfresco.aos-module.version>1.1.1</alfresco.aos-module.version>
 
         <!-- Versions of binaries packaged in the installer -->
         <installer.common.version>5.1-20151118</installer.common.version>

From 19faa7b63aafc51b27a2a9f673f4c769fc18b8d9 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 3 Jun 2016 13:13:17 +0000
Subject: [PATCH 09/12] Merged 5.2.N (5.2.1) to trunk (5.2)    126118 adavis:
 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)       126116 adavis: 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/trunk@127633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

From f8c3e48467edd6be417fc1d7bfe82062dbfbdc63 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 3 Jun 2016 13:13:46 +0000
Subject: [PATCH 10/12] Merged 5.2.N (5.2.1) to trunk (5.2)    127016
 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)       126679 rneamtu: Merged
 5.1.1 (5.1.1) to 5.1.N (5.1.2)          126277 skopf: MNT-16223 - Different
 AOS versions on Alfresco one and Alfresco one Platform using the same build

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0f51a173d1..dcc95b0223 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
         <alfresco.googledocs.version>3.0.3</alfresco.googledocs.version>
 
         <!-- Alfresco Office Services Module -->
-        <alfresco.aos-module.version>1.1.1</alfresco.aos-module.version>
+        <alfresco.aos-module.version>1.1.2-SNAPSHOT</alfresco.aos-module.version>
 
         <!-- Versions of binaries packaged in the installer -->
         <installer.common.version>5.1-20151118</installer.common.version>

From 4a3b8f27f8dc5b6fd2f4f77177728e531eb6e9e7 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 3 Jun 2016 13:14:27 +0000
Subject: [PATCH 11/12] Merged 5.2.N (5.2.1) to trunk (5.2)    127197 jphuynh:
 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)       127192 jphuynh: BDE-674: Pull
 Manager from Nexus instead of BINARIES.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127635 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 installer/pom.xml | 30 ++++++++++++++++++++++++++++++
 pom.xml           |  1 +
 2 files changed, 31 insertions(+)

diff --git a/installer/pom.xml b/installer/pom.xml
index 6ccdb88a73..21c50b9c7e 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -242,6 +242,36 @@
             <classifier>win</classifier>
             <type>tgz</type>
         </dependency>
+        
+        <!-- Manager -->
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>manager</artifactId>
+            <version>${installer.manager.version}</version>
+            <classifier>linux</classifier>
+            <type>tgz</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>manager</artifactId>
+            <version>${installer.manager.version}</version>
+            <classifier>osx</classifier>
+            <type>tgz</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>manager</artifactId>
+            <version>${installer.manager.version}</version>
+            <classifier>win32</classifier>
+            <type>tgz</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>manager</artifactId>
+            <version>${installer.manager.version}</version>
+            <classifier>win64</classifier>
+            <type>tgz</type>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index dcc95b0223..217246d6fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,7 @@
         <installer.libreoffice.version>4.4.5-20151016</installer.libreoffice.version>
         <installer.ghostscript.version>8.64</installer.ghostscript.version>
         <installer.imagemagick.version>6.9.1</installer.imagemagick.version>
+        <installer.manager.version>1.0</installer.manager.version>
 
         <!-- Build timestamp for installer file name -->
         <installer.build.timestamp>${maven.build.timestamp}</installer.build.timestamp>

From 78293fb69122c748c4f0ca2a8c89321c2fa3d6cc Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Mon, 6 Jun 2016 15:21:59 +0000
Subject: [PATCH 12/12] Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) :   
 - 127927,127976

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127977 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261