inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'origin/master' into feature/RM-7034_AddPoliciesForHeldContent

Browse Source
This commit is contained in:
Roxana Lucanu-Ghetu
2019-10-28 11:16:41 +02:00
parent 5c6c3a395c a3450f74cf
commit 5f42f53cb1
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@@ -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>

9
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/action-context.xml
View File

@@ -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">

1
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
View File

@@ -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>