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] 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();