From b9103bc8cd4eaa772e3c2e2dee29f5f5bd23bf34 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 23 Jan 2017 23:01:31 +0000
Subject: [PATCH 1/5] Updated Alfresco dependency for RM Community (Repo ->
 5.2.e, Share -> 5.2.d)

---
 pom.xml                                       | 26 ++++++-----------
 rm-community/pom.xml                          | 28 +++++++++++++++++--
 rm-community/rm-community-repo/pom.xml        |  4 +--
 .../rm/rest/api/impl/RMSitesImpl.java         |  2 +-
 4 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4eff6fbd7f..48eb54091a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,23 +65,6 @@
       </snapshotRepository>
    </distributionManagement>
 
-   <dependencyManagement>
-      <dependencies>
-         <dependency>
-            <groupId>${alfresco.groupId}</groupId>
-            <artifactId>alfresco-platform-distribution</artifactId>
-            <version>${alfresco.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-         </dependency>
-         <dependency>
-             <groupId>org.reflections</groupId>
-             <artifactId>reflections</artifactId>
-             <version>0.9.10</version>
-         </dependency>
-      </dependencies>
-   </dependencyManagement>
-
    <modules>
       <module>rm-community</module>
    </modules>
@@ -117,6 +100,15 @@
 
    </properties>
 
+   <dependencies>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <version>4.12</version>
+         <scope>test</scope>
+      </dependency>
+   </dependencies>
+
    <build>
       <finalName>${project.artifactId}-${project.version}</finalName>
       <plugins>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index 5ade81abbe..ec4af993c7 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -23,8 +23,32 @@
       <module>rm-community-share</module>
    </modules>
 
+   <dependencyManagement>
+      <dependencies>
+         <dependency>
+            <groupId>${alfresco.groupId}</groupId>
+            <artifactId>alfresco-parent</artifactId>
+            <version>${alfresco.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+         </dependency>
+         <dependency>
+            <groupId>${alfresco.groupId}</groupId>
+            <artifactId>alfresco-share-parent</artifactId>
+            <version>${share.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+         </dependency>
+         <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>0.9.10</version>
+         </dependency>
+      </dependencies>
+   </dependencyManagement>
+
    <properties>
-      <alfresco.version>5.2.b-EA</alfresco.version>
-      <share.version>${alfresco.version}</share.version>
+      <alfresco.version>5.2.e</alfresco.version>
+      <share.version>5.2.d</share.version>
    </properties>
 </project>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 3097d04a65..0aaff805ad 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -19,7 +19,7 @@
       <alfresco.db.username>alfresco</alfresco.db.username>
       <alfresco.db.password>alfresco</alfresco.db.password>
       <alfresco.db.host>localhost</alfresco.db.host>
-      <alfresco.repo.artifactId>alfresco</alfresco.repo.artifactId>
+      <alfresco.repo.artifactId>alfresco-platform</alfresco.repo.artifactId>
       <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
       <alfresco.mysql.version>5.1.31</alfresco.mysql.version>
       <alfresco.rm.artifactId>alfresco-rm-community-repo</alfresco.rm.artifactId>
@@ -268,11 +268,11 @@
       <dependency>
          <groupId>${alfresco.groupId}</groupId>
          <artifactId>alfresco-remote-api</artifactId>
+         <version>${alfresco.version}</version>
       </dependency>
       <dependency>
           <groupId>javax.servlet</groupId>
           <artifactId>javax.servlet-api</artifactId>
-          <version>3.1.0</version>
           <scope>provided</scope>
       </dependency>
       <dependency>
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMSitesImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMSitesImpl.java
index 569ce2549c..45a8b50cea 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMSitesImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMSitesImpl.java
@@ -207,7 +207,7 @@ public class RMSitesImpl extends SitesImpl implements RMSites
      * @param site
      * @return
      */
-    private Site validateSite(Site site)
+    protected Site validateSite(Site site)
     {
         // site title - mandatory
         String siteTitle = site.getTitle();

From eec77c5a49e75f0a55f50212957546b40ac2576b Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Wed, 25 Jan 2017 14:59:47 +0000
Subject: [PATCH 2/5] RM-4617: Temporary solution to fix an issue on Bamboo

---
 .../module/org_alfresco_module_rm/rm-service-context.xml     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index 56d5b0f6af..7e335ec982 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -1642,4 +1642,9 @@
          </value>
       </property>
    </bean>
+
+   <!-- FIXME: Temporary workaround for RM-4617 -->
+   <bean id="protectedUsersCache" factory-bean="cacheFactory" factory-method="createCache">
+      <constructor-arg value="cache.protectedUsersCache"/>
+   </bean>
 </beans>

From e604d2baa9bef41b5ddd9b9cbbb4010274553ef7 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Wed, 25 Jan 2017 17:35:00 +0000
Subject: [PATCH 3/5] RM-4617: Removed workaround

---
 .../module/org_alfresco_module_rm/rm-service-context.xml     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index 7e335ec982..56d5b0f6af 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -1642,9 +1642,4 @@
          </value>
       </property>
    </bean>
-
-   <!-- FIXME: Temporary workaround for RM-4617 -->
-   <bean id="protectedUsersCache" factory-bean="cacheFactory" factory-method="createCache">
-      <constructor-arg value="cache.protectedUsersCache"/>
-   </bean>
 </beans>

From 385d6fca1d56731fa842c6fd12fa114561eb5779 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Thu, 26 Jan 2017 23:01:37 +0000
Subject: [PATCH 4/5] RM-4617 (Update Repo/Share dependency for RM Community)

---
 pom.xml                                | 8 ++------
 rm-community/pom.xml                   | 5 -----
 rm-community/rm-community-repo/pom.xml | 2 ++
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 48eb54091a..b885c3cb8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,11 +93,8 @@
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
       <argLine>-Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
-
-	  <!-- license properties -->
-	  <license.update.dryrun>true</license.update.dryrun>
-	  <license.verbose>false</license.verbose>
-
+      <license.update.dryrun>true</license.update.dryrun>
+      <license.verbose>false</license.verbose>
    </properties>
 
    <dependencies>
@@ -324,7 +321,6 @@
                 </configuration>
             </plugin>
 
-			<!-- License header generation -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>license-maven-plugin</artifactId>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index ec4af993c7..07497c2900 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -39,11 +39,6 @@
             <type>pom</type>
             <scope>import</scope>
          </dependency>
-         <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>0.9.10</version>
-         </dependency>
       </dependencies>
    </dependencyManagement>
 
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 0aaff805ad..915bf2897d 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -269,6 +269,7 @@
          <groupId>${alfresco.groupId}</groupId>
          <artifactId>alfresco-remote-api</artifactId>
          <version>${alfresco.version}</version>
+         <scope>provided</scope>
       </dependency>
       <dependency>
           <groupId>javax.servlet</groupId>
@@ -344,6 +345,7 @@
       <dependency>
           <groupId>org.reflections</groupId>
           <artifactId>reflections</artifactId>
+          <version>0.9.10</version>
           <scope>test</scope>
       </dependency>
    </dependencies>

From a9be95d781281098b49cbb440d5d97c4d50694e4 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Fri, 27 Jan 2017 17:04:16 +0000
Subject: [PATCH 5/5] RM-4617 (Update Repo/Share dependency for RM Community)

---
 rm-community/rm-community-repo/pom.xml | 30 ++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 915bf2897d..f61f1bf752 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -146,6 +146,24 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
+               <execution>
+                  <id>fetch-share-services-amp</id>
+                  <phase>process-test-resources</phase>
+                  <goals>
+                     <goal>copy</goal>
+                  </goals>
+                  <configuration>
+                     <artifactItems>
+                        <artifactItem>
+                           <groupId>org.alfresco</groupId>
+                           <artifactId>alfresco-share-services</artifactId>
+                           <version>${share.version}</version>
+                           <type>amp</type>
+                        </artifactItem>
+                     </artifactItems>
+                     <outputDirectory>${project.build.directory}</outputDirectory>
+                  </configuration>
+               </execution>
                <execution>
                   <id>unpack-alfresco</id>
                   <phase>prepare-package</phase>
@@ -188,6 +206,18 @@
                      <goal>install</goal>
                   </goals>
                </execution>
+               <execution>
+                  <id>install-share-services-amp</id>
+                  <goals>
+                     <goal>install</goal>
+                  </goals>
+                  <phase>prepare-package</phase>
+                  <configuration>
+                     <backup>true</backup>
+                     <ampLocation>${project.build.directory}/alfresco-share-services-${share.version}.amp</ampLocation>
+                     <warLocation>${app.amp.client.war.folder}</warLocation>
+                  </configuration>
+               </execution>
             </executions>
          </plugin>
          <plugin>