Merged branch master into feature/RM-4113-Navigate-Clasification-Guide

pom.xml

@@ -21,9 +21,9 @@
    </organization>
 
    <scm>
-      <connection>scm:git:https://gitlab.alfresco.com/records-management/records-management.git</connection>
-      <developerConnection>scm:git:https://gitlab.alfresco.com/records-management/records-management.git</developerConnection>
-      <url>https://gitlab.alfresco.com/records-management/records-management</url>
+      <connection>scm:git:https://git.alfresco.com/records-management/records-management.git</connection>
+      <developerConnection>scm:git:https://git.alfresco.com/records-management/records-management.git</developerConnection>
+      <url>https://git.alfresco.com/records-management/records-management</url>
       <tag>HEAD</tag>
    </scm>
 
@@ -42,8 +42,8 @@
 
    <repositories>
       <repository>
-         <id>alfresco-internal</id>
-         <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
+         <id>alfresco-public</id>
+         <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
       </repository>
    </repositories>
 
@@ -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>
@@ -99,6 +82,18 @@
             <module>rm-automation</module>
             <module>rm-benchmark</module>
          </modules>
+         <repositories>
+            <repository>
+               <id>alfresco-internal</id>
+               <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
+            </repository>
+         </repositories>
+         <pluginRepositories>
+            <pluginRepository>
+               <id>alfresco-private</id>
+               <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
+            </pluginRepository>
+         </pluginRepositories>
       </profile>
    </profiles>
 
@@ -110,13 +105,19 @@
       <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>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <version>4.12</version>
+         <scope>test</scope>
+      </dependency>
+   </dependencies>
+
    <build>
       <finalName>${project.artifactId}-${project.version}</finalName>
       <plugins>
@@ -332,7 +333,6 @@
                 </configuration>
             </plugin>
 
-			<!-- License header generation -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>license-maven-plugin</artifactId>

rm-automation/rm-automation-community-rest-api/pom.xml

@@ -15,7 +15,7 @@
       <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
       <alfresco.rm.share>alfresco-rm-community-share</alfresco.rm.share>
       <alfresco.rm.repo>alfresco-rm-community-repo</alfresco.rm.repo>
-      <tas.restapi.version>5.2.0-4</tas.restapi.version>
+      <tas.restapi.version>5.2.0-7</tas.restapi.version>
       <fluent.json.version>2.0.0</fluent.json.version>
    </properties>
 
@@ -34,11 +34,11 @@
    </build>
 
    <dependencies>
-	   <dependency>
-	       <groupId>com.jayway.restassured</groupId>
-	       <artifactId>rest-assured</artifactId>
-	       <version>2.9.0</version>
-	   </dependency>
+      <dependency>
+          <groupId>com.jayway.restassured</groupId>
+          <artifactId>rest-assured</artifactId>
+          <version>2.9.0</version>
+      </dependency>
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi-test</artifactId>

rm-community/pom.xml

@@ -23,8 +23,27 @@
       <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>
+      </dependencies>
+   </dependencyManagement>
+
    <properties>
-      <alfresco.version>5.2.b-EA</alfresco.version>
-      <share.version>${alfresco.version}</share.version>
+      <alfresco.version>5.2.f</alfresco.version>
+      <share.version>5.2.e</share.version>
    </properties>
 </project>

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>
@@ -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>
@@ -268,11 +298,12 @@
       <dependency>
          <groupId>${alfresco.groupId}</groupId>
          <artifactId>alfresco-remote-api</artifactId>
+         <version>${alfresco.version}</version>
+         <scope>provided</scope>
       </dependency>
       <dependency>
           <groupId>javax.servlet</groupId>
           <artifactId>javax.servlet-api</artifactId>
-          <version>3.1.0</version>
           <scope>provided</scope>
       </dependency>
       <dependency>
@@ -344,6 +375,7 @@
       <dependency>
           <groupId>org.reflections</groupId>
           <artifactId>reflections</artifactId>
+          <version>0.9.10</version>
           <scope>test</scope>
       </dependency>
    </dependencies>

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