From c09a3731eecc545a4bad93216186e7f5cb429563 Mon Sep 17 00:00:00 2001 From: Andreea Dragoi Date: Tue, 13 Oct 2015 13:32:34 +0000 Subject: [PATCH 1/9] RM-2522 : Select "Download Zip" (rm-download-zip) on RM Transfer Target inside RM Transfer view throws 400 Bad Request: Node is not fileplan - used isFilePlan method from FilePlanService instead of old check git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@114258 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org_alfresco_module_rm/script/BaseTransferWebScript.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java index 60398a4d44..3304648aa3 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java @@ -104,7 +104,7 @@ public abstract class BaseTransferWebScript extends StreamACP } // ensure the node is a filePlan object - if (!TYPE_FILE_PLAN.equals(this.nodeService.getType(filePlan))) + if (!filePlanService.isFilePlan(filePlan)) { status.setCode(HttpServletResponse.SC_BAD_REQUEST, "Node " + filePlan.toString() + " is not a file plan"); From 670ca476a470957331950d32a0d55a38b0fafd93 Mon Sep 17 00:00:00 2001 From: Alexandru Balmus Date: Thu, 15 Oct 2015 13:18:14 +0000 Subject: [PATCH 2/9] Merged DEV to V2.2.1.x 114241: MNT-14900 : Alfresco doesn't work with Records Management - Fixed problem with circular references during Spring dependency injection process git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114437 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../extended-repository-context.xml | 3 +- .../rm-service-context.xml | 3 +- .../role/FilePlanRoleServiceImpl.java | 30 ++++++++++++++++--- .../action/ExtendedActionServiceImpl.java | 12 +++++++- 4 files changed, 41 insertions(+), 7 deletions(-) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml index 2b10615154..c0fb9ec36d 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml @@ -145,7 +145,8 @@ - + + diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml index 6de002f343..ad4a1a7ac9 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml @@ -501,7 +501,8 @@ - + + diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java index 2ef8b753d8..1000908aca 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java @@ -53,6 +53,9 @@ import org.apache.commons.lang.StringUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; import org.springframework.extensions.surf.util.I18NUtil; /** @@ -62,7 +65,8 @@ import org.springframework.extensions.surf.util.I18NUtil; * @since 2.1 */ public class FilePlanRoleServiceImpl implements FilePlanRoleService, - RecordsManagementModel + RecordsManagementModel, + ApplicationContextAware { /** I18N */ private static final String MSG_ALL_ROLES = "rm.role.all"; @@ -93,6 +97,8 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, private BootstrapImporterModuleComponent bootstrapImporterModule; + private ApplicationContext applicationContext; + /** Records management role zone */ public static final String RM_ROLE_ZONE_PREFIX = "rmRoleZone"; @@ -147,6 +153,16 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, { this.bootstrapImporterModule = bootstrapImporterModuleComponent; } + + protected FilePlanService getFilePlanService() + { + if (filePlanService == null) + { + filePlanService = (FilePlanService) applicationContext.getBean("FilePlanService"); + } + + return filePlanService; + } /** * @see org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService#initialiseFilePlan(org.alfresco.service.cmr.repository.NodeRef) @@ -190,11 +206,11 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, permissionService.setPermission(filePlan, ExtendedWriterDynamicAuthority.EXTENDED_WRITER, RMPermissionModel.FILING, true); // Create the transfer and hold containers - systemContainers.add(filePlanService.createHoldContainer(filePlan)); - systemContainers.add(filePlanService.createTransferContainer(filePlan)); + systemContainers.add(getFilePlanService().createHoldContainer(filePlan)); + systemContainers.add(getFilePlanService().createTransferContainer(filePlan)); // Create the unfiled record container - systemContainers.add(filePlanService.createUnfiledContainer(filePlan)); + systemContainers.add(getFilePlanService().createUnfiledContainer(filePlan)); return systemContainers; } @@ -877,4 +893,10 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, { return authorityService.getName(AuthorityType.GROUP, getAllRolesGroupShortName(filePlan)); } + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException + { + this.applicationContext = applicationContext; + } } diff --git a/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java b/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java index 4d6d313465..35225914d9 100644 --- a/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java +++ b/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java @@ -46,6 +46,16 @@ public class ExtendedActionServiceImpl extends ActionServiceImpl implements Appl /** Application context */ private ApplicationContext extendedApplicationContext; + protected FilePlanService getFilePlanService() + { + if (filePlanService == null) + { + filePlanService = (FilePlanService) extendedApplicationContext.getBean("FilePlanService"); + } + + return filePlanService; + } + /** * @see org.alfresco.repo.action.ActionServiceImpl#setApplicationContext(org.springframework.context.ApplicationContext) */ @@ -98,7 +108,7 @@ public class ExtendedActionServiceImpl extends ActionServiceImpl implements Appl else { // get the file component kind of the node reference - FilePlanComponentKind kind = filePlanService.getFilePlanComponentKind(nodeRef); + FilePlanComponentKind kind = getFilePlanService().getFilePlanComponentKind(nodeRef); result = new ArrayList(actionDefinitions.size()); // check each action definition From dbbe428c378d38a92dd46b80f6912a66ab2bcfa3 Mon Sep 17 00:00:00 2001 From: Alexandru Balmus Date: Fri, 16 Oct 2015 14:14:03 +0000 Subject: [PATCH 3/9] Reverse merged V2.2.1.x <<< Need to use a different approach. >>> Merged DEV to V2.2.1.x 114241: MNT-14900 : Alfresco doesn't work with Records Management - Fixed problem with circular references during Spring dependency injection process git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../extended-repository-context.xml | 3 +- .../rm-service-context.xml | 3 +- .../role/FilePlanRoleServiceImpl.java | 30 +++---------------- .../action/ExtendedActionServiceImpl.java | 12 +------- 4 files changed, 7 insertions(+), 41 deletions(-) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml index c0fb9ec36d..2b10615154 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml @@ -145,8 +145,7 @@ - - + diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml index ad4a1a7ac9..6de002f343 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml @@ -501,8 +501,7 @@ - - + diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java index 1000908aca..2ef8b753d8 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java @@ -53,9 +53,6 @@ import org.apache.commons.lang.StringUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import org.springframework.beans.BeansException; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; import org.springframework.extensions.surf.util.I18NUtil; /** @@ -65,8 +62,7 @@ import org.springframework.extensions.surf.util.I18NUtil; * @since 2.1 */ public class FilePlanRoleServiceImpl implements FilePlanRoleService, - RecordsManagementModel, - ApplicationContextAware + RecordsManagementModel { /** I18N */ private static final String MSG_ALL_ROLES = "rm.role.all"; @@ -97,8 +93,6 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, private BootstrapImporterModuleComponent bootstrapImporterModule; - private ApplicationContext applicationContext; - /** Records management role zone */ public static final String RM_ROLE_ZONE_PREFIX = "rmRoleZone"; @@ -153,16 +147,6 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, { this.bootstrapImporterModule = bootstrapImporterModuleComponent; } - - protected FilePlanService getFilePlanService() - { - if (filePlanService == null) - { - filePlanService = (FilePlanService) applicationContext.getBean("FilePlanService"); - } - - return filePlanService; - } /** * @see org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService#initialiseFilePlan(org.alfresco.service.cmr.repository.NodeRef) @@ -206,11 +190,11 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, permissionService.setPermission(filePlan, ExtendedWriterDynamicAuthority.EXTENDED_WRITER, RMPermissionModel.FILING, true); // Create the transfer and hold containers - systemContainers.add(getFilePlanService().createHoldContainer(filePlan)); - systemContainers.add(getFilePlanService().createTransferContainer(filePlan)); + systemContainers.add(filePlanService.createHoldContainer(filePlan)); + systemContainers.add(filePlanService.createTransferContainer(filePlan)); // Create the unfiled record container - systemContainers.add(getFilePlanService().createUnfiledContainer(filePlan)); + systemContainers.add(filePlanService.createUnfiledContainer(filePlan)); return systemContainers; } @@ -893,10 +877,4 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, { return authorityService.getName(AuthorityType.GROUP, getAllRolesGroupShortName(filePlan)); } - - @Override - public void setApplicationContext(ApplicationContext applicationContext) throws BeansException - { - this.applicationContext = applicationContext; - } } diff --git a/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java b/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java index 35225914d9..4d6d313465 100644 --- a/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java +++ b/rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java @@ -46,16 +46,6 @@ public class ExtendedActionServiceImpl extends ActionServiceImpl implements Appl /** Application context */ private ApplicationContext extendedApplicationContext; - protected FilePlanService getFilePlanService() - { - if (filePlanService == null) - { - filePlanService = (FilePlanService) extendedApplicationContext.getBean("FilePlanService"); - } - - return filePlanService; - } - /** * @see org.alfresco.repo.action.ActionServiceImpl#setApplicationContext(org.springframework.context.ApplicationContext) */ @@ -108,7 +98,7 @@ public class ExtendedActionServiceImpl extends ActionServiceImpl implements Appl else { // get the file component kind of the node reference - FilePlanComponentKind kind = getFilePlanService().getFilePlanComponentKind(nodeRef); + FilePlanComponentKind kind = filePlanService.getFilePlanComponentKind(nodeRef); result = new ArrayList(actionDefinitions.size()); // check each action definition From 5effcfdec3e9a1d2d11d1c0949ed5c229bef28f9 Mon Sep 17 00:00:00 2001 From: Alexandru Balmus Date: Fri, 16 Oct 2015 14:26:00 +0000 Subject: [PATCH 4/9] Merged DEV to V2.2.1.x 114604: MNT-14900 : Alfresco doesn't work with Records Management - Fixed the circular reference problem from Spring config xml using NonBlockingLazyInitTargetSource git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114608 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../module/org_alfresco_module_rm/rm-service-context.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml index 6de002f343..978d73d381 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml @@ -393,8 +393,12 @@ org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService - - + + + + + + From 1e21cd4e6b4c38eb1b1cfa74ee6826236d2d1fa8 Mon Sep 17 00:00:00 2001 From: Alexandru Balmus Date: Fri, 16 Oct 2015 14:26:34 +0000 Subject: [PATCH 5/9] Update version to 2.2.1.3 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114609 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/module/org_alfresco_module_rm/module.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties index 9de6dd4f47..5b5d6a527e 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties @@ -6,6 +6,6 @@ module.aliases=org_alfresco_module_dod5015 module.title=Records Management module.description=Alfresco Record Management Extension -module.version=2.2.1.2 +module.version=2.2.1.3 module.repo.version.min=4.2 \ No newline at end of file From bb0fa6f8cd95b25b30a26796b1c4b1765dd4e6d0 Mon Sep 17 00:00:00 2001 From: Tatyana Valkevych Date: Mon, 19 Oct 2015 14:39:39 +0000 Subject: [PATCH 6/9] Updated version to 2.2.1.3 and dependency.share.po.version to 4.2.5-SNAPSHOT in pom.xml files git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 2 +- rm-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9bd2bc28c3..296823bfdf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm-parent pom - 2.2.1.2-SNAPSHOT + 2.2.1.3 Alfresco Records Management http://www.alfresco.org/ diff --git a/rm-server/pom.xml b/rm-server/pom.xml index 7169a0eedf..4ce8419000 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-rm-parent - 2.2.1.2-SNAPSHOT + 2.2.1.3 4.0.0 alfresco-rm-server From 2fa3bf1a55a35bef17de2e2ff8e89c62e7f37c09 Mon Sep 17 00:00:00 2001 From: Alexandru Balmus Date: Tue, 20 Oct 2015 13:25:39 +0000 Subject: [PATCH 7/9] RM-2391 : The Audit Log GET requests have to verify first which user is logged in and to which data it has access. - Implemented final fix and added a unit test. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@114786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../RecordsManagementAuditServiceImpl.java | 2 +- ...RecordsManagementAuditServiceImplTest.java | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java index 6c2e81679f..9e804bc72e 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java @@ -921,7 +921,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean return true; } - if( nodeRef != null && + if(nodeRef != null && nodeService.exists(nodeRef) && !AccessStatus.ALLOWED.equals( capabilityService.getCapabilityAccessState(nodeRef, ACCESS_AUDIT_CAPABILITY))) { diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java index 65b0cede07..1a9d8f469c 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java @@ -141,6 +141,55 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase }, ADMIN_USER); } + /** + * Test getAuditTrail method to check that deleted items always show in the audit. + * + * @see RM-2391 (last addressed isue) + */ + public void testGetAuditTrailForDeletedItem() + { + // We have only one entry for the event "audit.start": + List entries = getAuditTrail(1, ADMIN_USER); + + assertEquals(entries.get(0).getEvent(), "audit.start"); + + // Event "audit.view" was generated but will be visible on the next call to getAuditTrail(). + + // Make a change: + updateTitle(filePlan, ADMIN_USER); // event=Update RM Object + + // Show the audit has been updated; at this point we have three entries for the three events up to now: + // "audit.start", "audit.view" and "Update RM Object"; + entries = getAuditTrail(3, ADMIN_USER); + + assertEquals(entries.get(0).getEvent(), "audit.start"); + assertEquals(entries.get(1).getEvent(), "audit.view"); + assertEquals(entries.get(2).getEvent(), "Update RM Object"); + + // New "audit.view" event was generated - will be visible on next getAuditTrail(). + + doTestInTransaction(new Test() + { + @Override + public Void run() throws Exception + { + nodeService.deleteNode(record); + List entries = getAuditTrail(5, ADMIN_USER); + + assertEquals(entries.get(0).getEvent(), "audit.start"); + assertEquals(entries.get(1).getEvent(), "audit.view"); + assertEquals(entries.get(2).getEvent(), "Update RM Object"); + assertEquals(entries.get(3).getEvent(), "audit.view"); + + // Show the audit contains a reference to the deleted item: + assertEquals(entries.get(4).getEvent(), "Delete RM Object"); + assertEquals(entries.get(4).getNodeRef(), record); + + return null; + } + }); + } + /** * Test getAuditTrail method and parameter filters. */ From 26ba2420669999d6b06c42ced3f328bdfc298907 Mon Sep 17 00:00:00 2001 From: Tatyana Valkevych Date: Wed, 21 Oct 2015 12:27:06 +0000 Subject: [PATCH 8/9] Merged V2.2.1.x (2.2.1.3) to V2.2 114608: Merged DEV to V2.2.1.x 114604: MNT-14900 : Alfresco doesn't work with Records Management - Fixed the circular reference problem from Spring config xml using NonBlockingLazyInitTargetSource git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@114900 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../module/org_alfresco_module_rm/rm-service-context.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml index 016ae2361a..4057ea3e2d 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml @@ -393,8 +393,12 @@ org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService - - + + + + + + From 3fd9d0958de603943b5da522d0f662bd111566fd Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 21 Oct 2015 15:03:13 +0000 Subject: [PATCH 9/9] Merged BRANCHES/V2.2.1.x to BRANCHES/V2.2: 114437: Merged DEV to V2.2.1.x 114241: MNT-14900 : Alfresco doesn't work with Records Management - Fixed problem with circular references during Spring dependency injection process 114605: Reverse merged V2.2.1.x <<< Need to use a different approach. >>> Merged DEV to V2.2.1.x 114241: MNT-14900 : Alfresco doesn't work with Records Management - Fixed problem with circular references during Spring dependency injection process 114609: (RECORD ONLY) Update version to 2.2.1.3 114687: (RECORD ONLY) Updated version to 2.2.1.3 and dependency.share.po.version to 4.2.5-SNAPSHOT in pom.xml files git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@114917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 2 +- rm-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 76f272a5d0..0a6b4579b5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm-parent pom - 2.2.1-SNAPSHOT + 2.2.2-SNAPSHOT Alfresco Records Management http://www.alfresco.org/ diff --git a/rm-server/pom.xml b/rm-server/pom.xml index c79a190b9a..60364087b4 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-rm-parent - 2.2.1-SNAPSHOT + 2.2.2-SNAPSHOT 4.0.0 alfresco-rm-server