From 2d6b9b964e084399957a8d899f203768ddebcff7 Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Fri, 4 Nov 2016 16:40:30 +0000 Subject: [PATCH 1/4] RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'" Hotfix 2.5/mnt 17007 solr query 2.5.0.1 hotfix will contain the fix for the SOLR issue and Audit issue MNT-17007 - Cannot login with other user than admin, after RM 2.5 was installed RM-4249 - RM Audit doesn't work with alfresco 5.2 See merge request !602 Nb. This does not copy across the updates to the automation tests. (cherry picked from commit f19ece35388d75a6d0eb2a7efb854e13fc3b1763) (cherry picked from commit 1822c418f70f5f2dc93c53588ceb5ba9a9251f42) --- .../job/NotifyOfRecordsDueForReviewJobExecuter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java index 0838a31372..a1be90c032 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java @@ -84,8 +84,8 @@ public class NotifyOfRecordsDueForReviewJobExecuter extends RecordsManagementJob // notification has not been sent. StringBuilder queryBuffer = new StringBuilder(); queryBuffer.append("+ASPECT:\"rma:vitalRecord\" "); - queryBuffer.append("+(@rma\\:reviewAsOf:[MIN TO NOW] ) "); - queryBuffer.append("+( "); + queryBuffer.append("AND @rma\\:reviewAsOf:[MIN TO NOW] "); + queryBuffer.append("AND ( "); queryBuffer.append("@rma\\:notificationIssued:false "); queryBuffer.append("OR ISNULL:\"rma:notificationIssued\" "); queryBuffer.append(") "); From 8ca8fd101339d69f46ff59e61da74a19a294a074 Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Fri, 4 Nov 2016 16:40:30 +0000 Subject: [PATCH 2/4] RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'" Hotfix 2.5/mnt 17007 solr query 2.5.0.1 hotfix will contain the fix for the SOLR issue and Audit issue MNT-17007 - Cannot login with other user than admin, after RM 2.5 was installed RM-4249 - RM Audit doesn't work with alfresco 5.2 See merge request !602 Nb. This does not copy across the updates to the automation tests. (cherry picked from commit f19ece35388d75a6d0eb2a7efb854e13fc3b1763) (cherry picked from commit 1822c418f70f5f2dc93c53588ceb5ba9a9251f42) --- .../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 8159c50f37..aa659f6a84 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 @@ -92,8 +92,8 @@ public class NotifyOfRecordsDueForReviewJobExecuter extends RecordsManagementJob // notification has not been sent. StringBuilder queryBuffer = new StringBuilder(); queryBuffer.append("+ASPECT:\"rma:vitalRecord\" "); - queryBuffer.append("+(@rma\\:reviewAsOf:[MIN TO NOW] ) "); - queryBuffer.append("+( "); + queryBuffer.append("AND @rma\\:reviewAsOf:[MIN TO NOW] "); + queryBuffer.append("AND ( "); queryBuffer.append("@rma\\:notificationIssued:false "); queryBuffer.append("OR ISNULL:\"rma:notificationIssued\" "); queryBuffer.append(") "); From daffe519a0e130a90a8729dfcde63409786e0667 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Thu, 13 Apr 2017 14:11:51 +0100 Subject: [PATCH 3/4] Update version to 2.3.1.1. --- pom.xml | 2 +- rm-automation/pom.xml | 2 +- rm-server/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1a202ae62d..1edcc99204 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm-parent pom - 2.3.1.1-SNAPSHOT + 2.3.1.1 Alfresco Records Management http://www.alfresco.org/ diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 94d74c0504..97d1593ccf 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-parent - 2.3.1.1-SNAPSHOT + 2.3.1.1 diff --git a/rm-server/pom.xml b/rm-server/pom.xml index 63783bd4c6..d8da8824ea 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-rm-parent - 2.3.1.1-SNAPSHOT + 2.3.1.1 4.0.0 alfresco-rm-server From dfddbe840ed1abb3bb5b9d843a55666bc54b9476 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Thu, 13 Apr 2017 14:47:41 +0100 Subject: [PATCH 4/4] Update version to 2.3.1.2-SNAPSHOT. --- pom.xml | 2 +- rm-automation/pom.xml | 2 +- rm-server/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1edcc99204..0225557fb3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm-parent pom - 2.3.1.1 + 2.3.1.2-SNAPSHOT Alfresco Records Management http://www.alfresco.org/ diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 97d1593ccf..34fc301880 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm-parent - 2.3.1.1 + 2.3.1.2-SNAPSHOT diff --git a/rm-server/pom.xml b/rm-server/pom.xml index d8da8824ea..6639997ed8 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-rm-parent - 2.3.1.1 + 2.3.1.2-SNAPSHOT 4.0.0 alfresco-rm-server