From 1bf5d1d77cb24ffbfe12fc8e8498a48a7f89b926 Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Wed, 23 May 2018 12:36:24 +0300
Subject: [PATCH] fix integration tests

---
 pom.xml                                                        | 3 ++-
 .../alfresco/module/org_alfresco_module_rm/module.properties   | 2 +-
 .../rm-public-services-security-context.xml                    | 2 +-
 rm-community/rm-community-repo/test/resources/test-context.xml | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e91a141ffe..960cf6f3bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,6 +171,7 @@
       <argLine>-Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
       <license.update.dryrun>true</license.update.dryrun>
       <license.verbose>false</license.verbose>
+      <alfresco.min.version>6.0.0</alfresco.min.version>
    </properties>
 
    <dependencyManagement>
@@ -227,7 +228,7 @@
                      <regexPropertySettings>
                         <regexPropertySetting>
                            <name>rm.module.repo.version.min</name>
-                           <value>${alfresco.version}</value>
+                           <value>${alfresco.min.version}</value>
                             <regex>(\d+)\.(\d+).*</regex>
                             <replacement>$1.$2</replacement>
                            <failIfNoMatch>false</failIfNoMatch>
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 011b9d2820..272ed18d91 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,4 +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}
\ No newline at end of file
+module.repo.version.min=1.1.0
\ No newline at end of file
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml
index afd9d8a728..ce4d04e6f8 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd">
+        http://www.springframework.org/schema/beans/spring-beans.xsd" >
 
 <!-- ========================== -->
 <!-- Enforcement of permissions -->
diff --git a/rm-community/rm-community-repo/test/resources/test-context.xml b/rm-community/rm-community-repo/test/resources/test-context.xml
index 7e0f0e1bd2..3ed57e4507 100644
--- a/rm-community/rm-community-repo/test/resources/test-context.xml
+++ b/rm-community/rm-community-repo/test/resources/test-context.xml
@@ -238,7 +238,7 @@
          <value>Search</value>
       </property>
       <property name="sourceBeanName">
-         <value>buildonly</value>
+         <value>noindex</value>
       </property>
       <property name="instancePath">
          <list>