diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties index acb0dda81e..011b9d2820 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties @@ -8,5 +8,4 @@ module.title=Records Management module.description=Alfresco Record Management Extension module.version=${rm.module.version} -#module.repo.version.min=${rm.module.repo.version.min} -module.repo.version.min=5.1 \ No newline at end of file +module.repo.version.min=${rm.module.repo.version.min} \ No newline at end of file diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/rm3314/RM3314Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/rm3314/RM3314Test.java index 0aaf87d84b..47d0a0ff1b 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/rm3314/RM3314Test.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/rm3314/RM3314Test.java @@ -31,6 +31,7 @@ import java.util.HashMap; import java.util.Map; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; +import org.apache.commons.lang3.ArrayUtils; /** * Test for https://issues.alfresco.com/jira/browse/RM-3114 @@ -43,12 +44,7 @@ public class RM3314Test extends BaseRMTestCase /** Application context */ protected String[] getConfigLocations() { - return new String[] - { - "classpath:alfresco/application-context.xml", - "classpath:test-context.xml", - "classpath:test-rm3314-context.xml" - }; + return ArrayUtils.add(super.getConfigLocations(), "classpath:test-rm3314-context.xml"); } /** registry to record callback from test beans "test.rm3114.1" and "test.rm3114.2" */ diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java index bd754e2898..b8a873d579 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java @@ -40,6 +40,7 @@ import org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; import org.alfresco.util.GUID; +import org.apache.commons.lang3.ArrayUtils; /** * Test automatic disposition via scheduled job. @@ -55,12 +56,7 @@ public class AutomaticDispositionTest extends BaseRMTestCase /** additional job context to override job frequency */ protected String[] getConfigLocations() { - return new String[] - { - "classpath:alfresco/application-context.xml", - "classpath:test-context.xml", - "classpath:test-job-context.xml" - }; + return ArrayUtils.add(super.getConfigLocations(), "classpath:test-job-context.xml"); } /**