Merge master into feature/RM-4186_BenchmarkInPlaceRecords

l10n.properties

@@ -1,4 +1,4 @@
 # Localisation config overrides for Records Management module
 MESSAGE_SEARCH_PATH="rm-community/rm-community-repo/config rm-community/rm-community-share rm-community/rm-share/source rm-enterprise/rm-enterprise-repo/src/main rm-enterprise/rm-enterprise-share/src/main "
-EXCLUDED_FILES="$EXCLUDED_FILES rm-method-security.properties springloaded.properties file-mapping.properties classified-content-notForTranslating.properties notForTranslating"
+EXCLUDED_FILES="$EXCLUDED_FILES rm-method-security.properties springloaded.properties file-mapping.properties classified-content-notForTranslating.properties notForTranslating version.properties"
 EXTENSION_PREFIX=-RM

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-5-SNAPSHOT</tas.restapi.version>
+      <tas.restapi.version>5.2.0-4</tas.restapi.version>
       <fluent.json.version>2.0.0</fluent.json.version>
    </properties>
 

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml

@@ -43,7 +43,8 @@
         <property name="nodeService" ref="NodeService"/>
         <property name="dictionaryService" ref="DictionaryService"/>
         <property name="authenticationUtil" ref="rm.authenticationUtil"/>
-        <property name='transactionalResourceHelper' ref="rm.transactionalResourceHelper" />
+        <property name="transactionalResourceHelper" ref="rm.transactionalResourceHelper" />
+        <property name="renditionService" ref="RenditionService" />
      </bean>
 
     <!-- Records Management Service Registry -->

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_de.properties

@@ -1,3 +0,0 @@
-# RM Schema number
-
-version.rm.schema=2501

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_es.properties

@@ -1,3 +0,0 @@
-# RM Schema number
-
-version.rm.schema=2501

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_fr.properties

@@ -1,3 +0,0 @@
-# RM Schema number
-
-version.rm.schema=2501

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_it.properties

@@ -1,3 +0,0 @@
-# RM Schema number
-
-version.rm.schema=2501

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_ja.properties

@@ -1,3 +0,0 @@
-# RM Schema number
-
-version.rm.schema=2501

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_nb.properties

@@ -1,3 +0,0 @@
-# RM Schema number
-
-version.rm.schema=2501

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_nl.properties

@@ -1,3 +0,0 @@
-# RM Schema number
-
-version.rm.schema=2501

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_pt_BR.properties

@@ -1,3 +0,0 @@
-# RM Schema number
-
-version.rm.schema=2501

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_ru.properties

@@ -1,3 +0,0 @@
-# RM Schema number
-
-version.rm.schema=2501

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/version_zh_CN.properties

@@ -1,3 +0,0 @@
-# RM Schema number
-
-version.rm.schema=2501