From 4f1ebf1b5c180c22f3fcac94073118cceb7a936a Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Wed, 21 Jun 2017 13:36:54 +0100 Subject: [PATCH 1/4] [maven-release-plugin] prepare release V2.5.2-EA2 --- 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 57e6bdd1d7..126e91ea4f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.5.2-SNAPSHOT + 2.5.2-EA2 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.2-EA2 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 1e82d8ca5a..80d7ad9b5d 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.2-EA2 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 08dc021dd4..9cebd55edb 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.2-EA2 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 3d1fa7be44..0251e28bd4 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.2-EA2 From ef2d053d75470613ba40291cd5a374a09bc9147d Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Wed, 21 Jun 2017 13:36:58 +0100 Subject: [PATCH 2/4] [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 126e91ea4f..57e6bdd1d7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.5.2-EA2 + 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.2-EA2 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 80d7ad9b5d..1e82d8ca5a 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-EA2 + 2.5.2-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 9cebd55edb..08dc021dd4 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-EA2 + 2.5.2-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 0251e28bd4..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.2-EA2 + 2.5.2-SNAPSHOT From 6349f27056a12d04418fc56d1de134b6c4a1bc97 Mon Sep 17 00:00:00 2001 From: Silviu Dinuta Date: Thu, 22 Jun 2017 11:43:08 +0300 Subject: [PATCH 3/4] RM-5033: excluded destroyed records with metadata from search query --- .../job/NotifyOfRecordsDueForReviewJobExecuter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java index 61a04ca070..35f5db78c0 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java @@ -93,6 +93,8 @@ public class NotifyOfRecordsDueForReviewJobExecuter extends RecordsManagementJob StringBuilder queryBuffer = new StringBuilder(); queryBuffer.append("ASPECT:\"rma:vitalRecord\" "); queryBuffer.append("AND @rma\\:reviewAsOf:[MIN TO NOW] "); + // exclude destroyed records with metadata + queryBuffer.append("AND (ISNOTNULL:\"cm:content\" OR TYPE:\"rma:nonElectronicDocument\")"); String query = queryBuffer.toString(); ResultSet results = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, SearchService.LANGUAGE_FTS_ALFRESCO, query); From 5dd5d278673669b1e0fa8063f10ac66e06c95408 Mon Sep 17 00:00:00 2001 From: Silviu Dinuta Date: Fri, 23 Jun 2017 13:01:40 +0300 Subject: [PATCH 4/4] RM-5033: used aspect rma:ghosted to exclude destroyed records with kept metadata --- .../job/NotifyOfRecordsDueForReviewJobExecuter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java index 35f5db78c0..f611606969 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java @@ -93,8 +93,8 @@ public class NotifyOfRecordsDueForReviewJobExecuter extends RecordsManagementJob StringBuilder queryBuffer = new StringBuilder(); queryBuffer.append("ASPECT:\"rma:vitalRecord\" "); queryBuffer.append("AND @rma\\:reviewAsOf:[MIN TO NOW] "); - // exclude destroyed records with metadata - queryBuffer.append("AND (ISNOTNULL:\"cm:content\" OR TYPE:\"rma:nonElectronicDocument\")"); + // exclude destroyed electronic records and destroyed nonElectronic records with kept metadata + queryBuffer.append("AND -ASPECT:\"rma:ghosted\" "); String query = queryBuffer.toString(); ResultSet results = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, SearchService.LANGUAGE_FTS_ALFRESCO, query);