From d562667ee3535f013160c12a5e3f4eb577c8fa9b Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Fri, 25 Oct 2019 11:35:02 +0300
Subject: [PATCH 1/2] move the actions property file in module-context.xml  as
 the audit events that take the action name are loaded at bootstrap

---
 .../module/org_alfresco_module_rm/action-context.xml     | 9 ---------
 .../module/org_alfresco_module_rm/module-context.xml     | 1 +
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml
index b471c996c0..477d319ef4 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml
@@ -5,15 +5,6 @@
          http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 
-   <!-- I18N -->
-   <bean id="rmActionResourceBundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
-      <property name="resourceBundles">
-         <list>
-            <value>alfresco.module.org_alfresco_module_rm.messages.actions</value>
-         </list>
-      </property>
-   </bean>
-
    <!--  Declare as Record action -->
    <!--  TODO rename -->
    <bean id="create-record" parent="action-executer" class="org.alfresco.module.org_alfresco_module_rm.action.dm.CreateRecordAction">
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
index d999b109d7..4ccba8a2a0 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
@@ -64,6 +64,7 @@
             <value>alfresco.module.org_alfresco_module_rm.messages.admin-service</value>
             <value>alfresco.module.org_alfresco_module_rm.messages.records-management-service</value>
             <value>alfresco.module.org_alfresco_module_rm.messages.action-service</value>
+            <value>alfresco.module.org_alfresco_module_rm.messages.actions</value>
             <value>alfresco.module.org_alfresco_module_rm.messages.audit-service</value>
             <value>alfresco.module.org_alfresco_module_rm.messages.rm-events</value>
             <value>alfresco.module.org_alfresco_module_rm.messages.capability-service</value>

From ee929077b96532b453b523293b726ce3bb5efa55 Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Fri, 25 Oct 2019 12:21:28 +0300
Subject: [PATCH 2/2] Update the version for 
 org.apache.commons:commons-compress to 1.19 (fix the security vulnerability
 alert from github)

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4d26994883..a55c004395 100644
--- a/pom.xml
+++ b/pom.xml
@@ -592,6 +592,7 @@
       <image.registry>quay.io</image.registry>
 
       <javax-jaxb.version>2.3.0</javax-jaxb.version>
+      <apache-compress.version>1.19</apache-compress.version>
    </properties>
 
    <dependencyManagement>
@@ -1120,7 +1121,7 @@
                   <dependency>
                      <groupId>org.apache.commons</groupId>
                      <artifactId>commons-compress</artifactId>
-                     <version>1.18</version>
+                     <version>${apache-compress.version}</version>
                   </dependency>
                   <dependency>
                      <groupId>org.alfresco.maven.plugin</groupId>