From a0c4cd579c4a0950e7e84856b5abb35ba48293dc Mon Sep 17 00:00:00 2001
From: rlucanu <roxana.lucanu-ghetu@ness.com>
Date: Fri, 5 Apr 2019 14:44:30 +0300
Subject: [PATCH] RM-6723 Added ActiveMQ

---
 rm-community/rm-community-repo/pom.xml          | 17 +++++++++++++----
 .../test/util/BaseRMTestCase.java               |  5 -----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 434c7dc340..72410de0c6 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -27,10 +27,10 @@
       <skip.integrationtests>true</skip.integrationtests>
 
       <!-- 6.0 changes -->
-      <dependency.alfresco-core.version>7.5</dependency.alfresco-core.version>
-      <dependency.alfresco-repository.version>7.43</dependency.alfresco-repository.version>
-      <dependency.alfresco-remote-api.version>7.35</dependency.alfresco-remote-api.version>
-      <alfresco.alfresco-share-services.version>6.1.0-RC3</alfresco.alfresco-share-services.version>
+      <dependency.alfresco-core.version>7.5.1</dependency.alfresco-core.version>
+      <dependency.alfresco-repository.version>7.33.12</dependency.alfresco-repository.version>
+      <dependency.alfresco-remote-api.version>7.34.1</dependency.alfresco-remote-api.version>
+      <alfresco.alfresco-share-services.version>6.1.0</alfresco.alfresco-share-services.version>
       <image.name>alfresco/alfresco-governance-repository-community</image.name>
 
    </properties>
@@ -155,6 +155,15 @@
                         </wait>
                      </run>
                   </image>
+                  <image>
+                     <name>alfresco/alfresco-activemq:5.15.6</name>
+                     <run>
+                        <ports>
+                           <port>61616:61616</port>
+                           <port>5672:5672</port>
+                        </ports>
+                     </run>
+                  </image>
                </images>
                <skip>${skip.integrationtests}</skip>
             </configuration>
diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
index 4eeb564b49..6d6862dfe3 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
@@ -548,11 +548,6 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
     protected void setupTestDataImpl()
     {
         AuthorityDAO authDao = (AuthorityDAO)applicationContext.getBean("authorityDAO");
-        if (!authDao.authorityExists(AuthenticationUtil.getSystemUserName()))
-        {
-            createPerson(AuthenticationUtil.getSystemUserName(), false);
-        }
-        assertTrue("No person object for System available.", authDao.authorityExists(AuthenticationUtil.getSystemUserName()));
 
         storeRef = StoreRef.STORE_REF_WORKSPACE_SPACESSTORE;
         rootNodeRef = nodeService.getRootNode(storeRef);