Merge branch 'release/V2.5'

# Conflicts:
#	README.txt

README.txt

@@ -1,27 +1,23 @@
 Configuring and starting Alfresco/Share:
 ----------------------------------------
 
-- Clone the project from git
+- Clone the project (e.g. git clone git@gitlab.alfresco.com:records-management/records-management.git)
 
 - Import the project as a maven project
 
 - Start the Alfresco/Share instances with the following commands:
 
-  To start the repo:
-  cd rm-community/rm-community-repo
   mvn clean install -Pstart-repo
-  
-  To start Share:
-  cd rm-community/rm-community-share
   mvn clean install -Pstart-share
 
-  NOTE: If you have the enterprise code, see rm-enterprise/README.txt for instructions on how to build/start the enterprise code.
+  (these commands work best if run from the specific directories, e.g. start share from
+  rm-enterprise/rm-enterprise-share/ or rm-community/rm-community-share/ )
 
 
 Configuring a different DB other than H2 (e.g. MySQL or PostgreSQL):
 --------------------------------------------------------------------
 
-- Create a file called "local.properties" under src/main/resources in rm-community-repo (you may need to create the directory)
+- Create a file called "local.properties" under src/main/resources in alfresco-rm-enterprise-repo
 
 - Add the following properties in this new file
   my.db.name -> The name of the database schema
@@ -127,3 +123,19 @@ Install lombok plugin for IDEs:
 To allow automation and benchmark projects to be built within an IDE the lombok 'plugin' needs to be installed.
 
 Execute lombok.jar (doubleclick it, or run java -jar lombok.jar). Follow instructions.
+
+
+Use Solr 6 with Alfresco 5.2.x:
+-------------------------------
+In alfresco-global.properties (depending on the RM edition /records-management/rm-community/rm-community-repo/src/test/properties/local or /records-management/rm-enterprise/rm-enterprise-repo/src/test/properties/local)
+change the value for "index.subsystem.name" from "solr4" to "solr6".
+Add also the following property "solr.port=8983".
+
+Download the latest Alfresco Search Services from
+https://nexus.alfresco.com/nexus/#nexus-search;gav~~alfresco-search-services~~~
+Currently it's 1.0.0 (alfresco-search-services-1.0.0.zip)
+
+Unzip it and change to the "solr" folder within it. Start the Solr server using the following command:
+solr start -a "-Dcreate.alfresco.defaults=alfresco,archive"
+
+Start your repository

rm-community/rm-community-repo/src/test/properties/local/alfresco-global.properties

@@ -39,9 +39,6 @@ share.protocol=http
 
 # Validates and auto-recover if validation fails
 index.recovery.mode=AUTO
-# As we run embedded, we set Lucene
-# TODO: Find a better solution for indexing, as buildonly (embedded Lucene) is deprecated and going to be removed soon
-index.subsystem.name=buildonly
 
 # These jobs seem to require Lucene (Unsupported Operation with Solr) so we disable them / set to future date
 # See https://forums.alfresco.com/en/viewtopic.php?f=52&t=41597