From eb37d0c08dc27568cdb1419c3b64cafa58aa8ec3 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Mon, 23 Jan 2017 23:01:31 +0000 Subject: [PATCH 01/13] Updated Alfresco dependency for RM Community (Repo -> 5.2.e, Share -> 5.2.d) --- pom.xml | 26 ++++++----------- rm-community/pom.xml | 28 +++++++++++++++++-- rm-community/rm-community-repo/pom.xml | 4 +-- .../rm/rest/api/impl/RMSitesImpl.java | 2 +- 4 files changed, 38 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 4eff6fbd7f..48eb54091a 100644 --- a/pom.xml +++ b/pom.xml @@ -65,23 +65,6 @@ - - - - ${alfresco.groupId} - alfresco-platform-distribution - ${alfresco.version} - pom - import - - - org.reflections - reflections - 0.9.10 - - - - rm-community @@ -117,6 +100,15 @@ + + + junit + junit + 4.12 + test + + + ${project.artifactId}-${project.version} diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 5ade81abbe..ec4af993c7 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -23,8 +23,32 @@ rm-community-share + + + + ${alfresco.groupId} + alfresco-parent + ${alfresco.version} + pom + import + + + ${alfresco.groupId} + alfresco-share-parent + ${share.version} + pom + import + + + org.reflections + reflections + 0.9.10 + + + + - 5.2.b-EA - ${alfresco.version} + 5.2.e + 5.2.d diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 3097d04a65..0aaff805ad 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -19,7 +19,7 @@ alfresco alfresco localhost - alfresco + alfresco-platform 9.1-901.jdbc4 5.1.31 alfresco-rm-community-repo @@ -268,11 +268,11 @@ ${alfresco.groupId} alfresco-remote-api + ${alfresco.version} javax.servlet javax.servlet-api - 3.1.0 provided diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMSitesImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMSitesImpl.java index 569ce2549c..45a8b50cea 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMSitesImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMSitesImpl.java @@ -207,7 +207,7 @@ public class RMSitesImpl extends SitesImpl implements RMSites * @param site * @return */ - private Site validateSite(Site site) + protected Site validateSite(Site site) { // site title - mandatory String siteTitle = site.getTitle(); From c32d34fddb0095d7b418e6cb1ece939855c57d20 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Wed, 25 Jan 2017 14:59:47 +0000 Subject: [PATCH 02/13] RM-4617: Temporary solution to fix an issue on Bamboo --- .../module/org_alfresco_module_rm/rm-service-context.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml index 56d5b0f6af..7e335ec982 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml @@ -1642,4 +1642,9 @@ + + + + + From 793d1ae41aac8cc3088f85ad1b653fbe6983593c Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Wed, 25 Jan 2017 17:35:00 +0000 Subject: [PATCH 03/13] RM-4617: Removed workaround --- .../module/org_alfresco_module_rm/rm-service-context.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml index 7e335ec982..56d5b0f6af 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml @@ -1642,9 +1642,4 @@ - - - - - From 91e73e2bb6568c74a058bc6c9cbeaae9c59fdd4b Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Thu, 26 Jan 2017 23:01:37 +0000 Subject: [PATCH 04/13] RM-4617 (Update Repo/Share dependency for RM Community) --- pom.xml | 8 ++------ rm-community/pom.xml | 5 ----- rm-community/rm-community-repo/pom.xml | 2 ++ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 48eb54091a..b885c3cb8f 100644 --- a/pom.xml +++ b/pom.xml @@ -93,11 +93,8 @@ UTF-8 UTF-8 -Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote - - - true - false - + true + false @@ -324,7 +321,6 @@ - org.codehaus.mojo license-maven-plugin diff --git a/rm-community/pom.xml b/rm-community/pom.xml index ec4af993c7..07497c2900 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -39,11 +39,6 @@ pom import - - org.reflections - reflections - 0.9.10 - diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 0aaff805ad..915bf2897d 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -269,6 +269,7 @@ ${alfresco.groupId} alfresco-remote-api ${alfresco.version} + provided javax.servlet @@ -344,6 +345,7 @@ org.reflections reflections + 0.9.10 test From 87a5859b8759fb150568b5673c4cc7146c0f83b8 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Fri, 27 Jan 2017 17:04:16 +0000 Subject: [PATCH 05/13] RM-4617 (Update Repo/Share dependency for RM Community) --- rm-community/rm-community-repo/pom.xml | 30 ++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 915bf2897d..f61f1bf752 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -146,6 +146,24 @@ org.apache.maven.plugins maven-dependency-plugin + + fetch-share-services-amp + process-test-resources + + copy + + + + + org.alfresco + alfresco-share-services + ${share.version} + amp + + + ${project.build.directory} + + unpack-alfresco prepare-package @@ -188,6 +206,18 @@ install + + install-share-services-amp + + install + + prepare-package + + true + ${project.build.directory}/alfresco-share-services-${share.version}.amp + ${app.amp.client.war.folder} + + From f7622c0231a61648546cfedbc045fee52a75ecc2 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 14 Feb 2017 16:19:45 +0000 Subject: [PATCH 06/13] RM-4681 Add behaviours to restrict where rm items can be created. Record categories can only go in the file plan, or under other record categories. Record folders can only have categories as a primary parent, and holds or transfers as secondary parents. --- .../model/rma/type/RecordCategoryType.java | 7 +++- .../model/rma/type/RecordFolderType.java | 38 +++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java index 4d6d476ebf..b1d7e7a60f 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java @@ -178,13 +178,18 @@ public class RecordCategoryType extends BaseBehaviourBean @Override public Void doWork() { + // Check the parent is either a file plan or a category. + if (!isFilePlan(childAssocRef.getParentRef()) && !isRecordCategory(childAssocRef.getParentRef())) + { + throw new AlfrescoRuntimeException("Operation failed: Record categories must go under file plans or categories."); + } + // setup record category permissions filePlanPermissionService.setupRecordCategoryPermissions(childAssocRef.getChildRef()); return null; } }); - } /** diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java index 2b60c6ff2b..20badd2005 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java @@ -64,6 +64,7 @@ import org.springframework.extensions.surf.util.I18NUtil; ) public class RecordFolderType extends AbstractDisposableItem implements NodeServicePolicies.OnMoveNodePolicy, + NodeServicePolicies.OnCreateNodePolicy, NodeServicePolicies.OnCreateChildAssociationPolicy { /** record service */ @@ -123,6 +124,7 @@ public class RecordFolderType extends AbstractDisposableItem AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork() { + @Override public Object doWork() { // clean record folder @@ -270,4 +272,40 @@ public class RecordFolderType extends AbstractDisposableItem behaviourFilter.enableBehaviour(); } } + + /** {@inheritDoc}} */ + @Override + @Behaviour + ( + kind = BehaviourKind.CLASS, + notificationFrequency = NotificationFrequency.TRANSACTION_COMMIT + ) + public void onCreateNode(final ChildAssociationRef childAssocRef) + { + // execute behaviour code as system user + AuthenticationUtil.runAsSystem(new RunAsWork() + { + @Override + public Void doWork() + { + if (childAssocRef.isPrimary()) + { + // Check the primary parent is a category. + if (!isRecordFolder(childAssocRef.getParentRef())) + { + throw new AlfrescoRuntimeException("Operation failed: Record folders must go under categories."); + } + } + else + { + // Check the secondary parent is a hold or transfer. + if (!isHold(childAssocRef.getParentRef()) && !isTransfer(childAssocRef.getParentRef())) + { + throw new AlfrescoRuntimeException("Operation failed: Record folders can only have secondary parents of holds or transfers."); + } + } + return null; + } + }); + } } From dee7e2d58000d6fceb2b8ecc9def29e81fad0f37 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 15 Feb 2017 04:03:58 +0000 Subject: [PATCH 07/13] RM-4681 Fix typo and add behaviour for moving RM items. --- .../model/rma/type/RecordCategoryType.java | 45 +++++++++-- .../model/rma/type/RecordFolderType.java | 81 +++++++++++-------- 2 files changed, 87 insertions(+), 39 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java index b1d7e7a60f..81dc259b95 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java @@ -59,7 +59,8 @@ import org.alfresco.service.namespace.QName; ) public class RecordCategoryType extends BaseBehaviourBean implements NodeServicePolicies.OnCreateChildAssociationPolicy, - NodeServicePolicies.OnCreateNodePolicy + NodeServicePolicies.OnCreateNodePolicy, + NodeServicePolicies.OnMoveNodePolicy { /** vital record service */ protected VitalRecordService vitalRecordService; @@ -178,11 +179,7 @@ public class RecordCategoryType extends BaseBehaviourBean @Override public Void doWork() { - // Check the parent is either a file plan or a category. - if (!isFilePlan(childAssocRef.getParentRef()) && !isRecordCategory(childAssocRef.getParentRef())) - { - throw new AlfrescoRuntimeException("Operation failed: Record categories must go under file plans or categories."); - } + checkParentType(childAssocRef); // setup record category permissions filePlanPermissionService.setupRecordCategoryPermissions(childAssocRef.getChildRef()); @@ -218,4 +215,40 @@ public class RecordCategoryType extends BaseBehaviourBean } }; } + + /** Record category move behaviour. {@inheritDoc} */ + @Override + @Behaviour + ( + kind = BehaviourKind.CLASS, + notificationFrequency = NotificationFrequency.FIRST_EVENT + ) + public void onMoveNode(ChildAssociationRef oldChildAssocRef, ChildAssociationRef newChildAssocRef) + { + checkParentType(newChildAssocRef); + } + + /** + * Check the parent of a record category. The parent must be a file plan or another category. + * + * @param childAssocRef The parent-child association. + * @throws UnsupportedOperationException If the parent type is invalid. + */ + private void checkParentType(final ChildAssociationRef childAssocRef) + { + // execute behaviour code as system user + AuthenticationUtil.runAsSystem(new RunAsWork() + { + @Override + public Void doWork() + { + // Check the parent is either a file plan or a category. + if (!isFilePlan(childAssocRef.getParentRef()) && !isRecordCategory(childAssocRef.getParentRef())) + { + throw new AlfrescoRuntimeException("Operation failed: Record categories must go under file plans or categories."); + } + return null; + } + }); + } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java index 20badd2005..ddde2471cc 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java @@ -116,41 +116,36 @@ public class RecordFolderType extends AbstractDisposableItem ) public void onMoveNode(ChildAssociationRef oldChildAssocRef, ChildAssociationRef newChildAssocRef) { - if (!nodeService.getType(newChildAssocRef.getParentRef()).equals(TYPE_RECORD_FOLDER)) + checkParentType(newChildAssocRef); + + if (!oldChildAssocRef.getParentRef().equals(newChildAssocRef.getParentRef())) { - if (!oldChildAssocRef.getParentRef().equals(newChildAssocRef.getParentRef())) + final NodeRef newNodeRef = newChildAssocRef.getChildRef(); + + AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork() { - final NodeRef newNodeRef = newChildAssocRef.getChildRef(); - - AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork() + @Override + public Object doWork() { - @Override - public Object doWork() + // clean record folder + cleanDisposableItem(nodeService, newNodeRef); + + // re-initialise the record folder + recordFolderService.setupRecordFolder(newNodeRef); + + // sort out the child records + for (NodeRef record : recordService.getRecords(newNodeRef)) { - // clean record folder - cleanDisposableItem(nodeService, newNodeRef); + // clean record + cleanDisposableItem(nodeService, record); - // re-initialise the record folder - recordFolderService.setupRecordFolder(newNodeRef); - - // sort out the child records - for (NodeRef record : recordService.getRecords(newNodeRef)) - { - // clean record - cleanDisposableItem(nodeService, record); - - // Re-initiate the records in the new folder. - recordService.file(record); - } - - return null; + // Re-initiate the records in the new folder. + recordService.file(record); } - }, AuthenticationUtil.getSystemUserName()); - } - } - else - { - throw new UnsupportedOperationException("Cannot move record folder into another record folder."); + + return null; + } + }, AuthenticationUtil.getSystemUserName()); } } @@ -281,6 +276,17 @@ public class RecordFolderType extends AbstractDisposableItem notificationFrequency = NotificationFrequency.TRANSACTION_COMMIT ) public void onCreateNode(final ChildAssociationRef childAssocRef) + { + checkParentType(childAssocRef); + } + + /** + * Check the parent of a record folder. The primary parent must be a category and a secondary parent may be a hold or a transfer. + * + * @param childAssocRef The parent-child association. + * @throws UnsupportedOperationException If the parent type is invalid. + */ + private void checkParentType(final ChildAssociationRef childAssocRef) { // execute behaviour code as system user AuthenticationUtil.runAsSystem(new RunAsWork() @@ -288,12 +294,19 @@ public class RecordFolderType extends AbstractDisposableItem @Override public Void doWork() { - if (childAssocRef.isPrimary()) + if (nodeService.getType(childAssocRef.getParentRef()).equals(TYPE_RECORD_FOLDER)) + { + // Return slightly more helpful exception in this case. + throw new UnsupportedOperationException("Cannot move record folder into another record folder."); + } + else if (childAssocRef.isPrimary()) { // Check the primary parent is a category. - if (!isRecordFolder(childAssocRef.getParentRef())) + if (!isRecordCategory(childAssocRef.getParentRef())) { - throw new AlfrescoRuntimeException("Operation failed: Record folders must go under categories."); + throw new UnsupportedOperationException( + "Operation failed: Record folders must go under categories, not " + + nodeService.getType(childAssocRef.getParentRef())); } } else @@ -301,7 +314,9 @@ public class RecordFolderType extends AbstractDisposableItem // Check the secondary parent is a hold or transfer. if (!isHold(childAssocRef.getParentRef()) && !isTransfer(childAssocRef.getParentRef())) { - throw new AlfrescoRuntimeException("Operation failed: Record folders can only have secondary parents of holds or transfers."); + throw new UnsupportedOperationException( + "Operation failed: Record folders can only have secondary parents of holds or transfers, not " + + nodeService.getType(childAssocRef.getParentRef())); } } return null; From d97e87c719a4b3262dfd845c6490a30450eff07a Mon Sep 17 00:00:00 2001 From: Tom Page Date: Thu, 16 Feb 2017 11:39:33 +0000 Subject: [PATCH 08/13] Fix plugin repositories to allow running against 5.1.2. Also move the enterprise-related repositories into the enterprise profile. --- pom.xml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2efbbd8b87..f54859f8e5 100644 --- a/pom.xml +++ b/pom.xml @@ -42,8 +42,8 @@ - alfresco-internal - https://artifacts.alfresco.com/nexus/content/groups/private + alfresco-public + https://artifacts.alfresco.com/nexus/content/groups/public @@ -98,6 +98,18 @@ rm-enterprise rm-automation + + + alfresco-internal + https://artifacts.alfresco.com/nexus/content/groups/private + + + + + alfresco-private + https://artifacts.alfresco.com/nexus/content/groups/private + + From a2baaed56466bfd0a03f79821521b16a210a6114 Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Tue, 21 Feb 2017 20:46:14 +0200 Subject: [PATCH 09/13] RM-4186 - loader preloads the records and schedules the events accordingly --- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index d0fef893e8..afdfa6cfc0 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -15,7 +15,7 @@ 1.8 alfresco-rm-community-share alfresco-rm-community-repo - 5.2.0-2 + 5.2.0-5-SNAPSHOT 2.0.0 From 8a14116cf2d394650ecd82b8ed85ea85ffc7a874 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Wed, 22 Feb 2017 15:16:44 +0000 Subject: [PATCH 10/13] Updated source code management tags after moving to the new gitlab server --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 2efbbd8b87..e35cc86de9 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:https://gitlab.alfresco.com/records-management/records-management.git - scm:git:https://gitlab.alfresco.com/records-management/records-management.git - https://gitlab.alfresco.com/records-management/records-management + scm:git:https://git.alfresco.com/records-management/records-management.git + scm:git:https://git.alfresco.com/records-management/records-management.git + https://git.alfresco.com/records-management/records-management HEAD @@ -112,9 +112,9 @@ -Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote - - true - false + + true + false @@ -333,7 +333,7 @@ - + org.codehaus.mojo license-maven-plugin From 00b4d9b1382f8bfe6ce06a99be802939cd222897 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Wed, 22 Feb 2017 15:37:45 +0000 Subject: [PATCH 11/13] [maven-release-plugin] prepare release V2.5.1 --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index e35cc86de9..9b533b52c5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.5.1-SNAPSHOT + 2.5.1 Alfresco Records Management @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - HEAD + V2.5.1 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 6ddc73f194..aa36ce1bee 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.1-SNAPSHOT + 2.5.1 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index e5ad0a3c57..50778964f4 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.1-SNAPSHOT + 2.5.1 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 1d4b089e99..64098c280e 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.5.1-SNAPSHOT + 2.5.1 From 2243ff1c0903ee0ca42ec4b7237b98a1ebd1ab5f Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Wed, 22 Feb 2017 15:37:47 +0000 Subject: [PATCH 12/13] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 9b533b52c5..efad0cc23e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.5.1 + 2.5.2-SNAPSHOT Alfresco Records Management @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - V2.5.1 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index aa36ce1bee..98e1f6832f 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.1 + 2.5.2-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 50778964f4..43bb9e188a 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.1 + 2.5.2-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 64098c280e..3d1fa7be44 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.5.1 + 2.5.2-SNAPSHOT From 39cf937e4d80972092a9887c943ed09f9635b6f4 Mon Sep 17 00:00:00 2001 From: David Webster Date: Wed, 22 Feb 2017 16:21:20 +0000 Subject: [PATCH 13/13] Update versions ready for 2.5.1.1 work --- pom.xml | 2 +- rm-automation/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index efad0cc23e..5c8ce751b6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.5.2-SNAPSHOT + 2.5.1.1-SNAPSHOT Alfresco Records Management diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 98e1f6832f..c20b54295a 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-SNAPSHOT + 2.5.1.1-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 43bb9e188a..1290c86b62 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-SNAPSHOT + 2.5.1.1-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 3d1fa7be44..719ec4407d 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.5.2-SNAPSHOT + 2.5.1.1-SNAPSHOT