From 80a84870f17b7385b76d857ac7f0e1c9edfe8304 Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Fri, 4 Nov 2016 16:40:30 +0000 Subject: [PATCH 1/3] 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 54d673c1768eb16ce67f82bd608687592e02e954) (cherry picked from commit 3d7a93e3cefdd15164e5664af6ab7c622f4cbea1) --- .../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 03488378e8dc5e7342dcd3de5a6425ea0982e2ea Mon Sep 17 00:00:00 2001 From: Tom Page Date: Thu, 13 Apr 2017 14:11:51 +0100 Subject: [PATCH 2/3] 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 c7d6bc4850f828a10d41cc7dc0c3de1311652119 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Thu, 13 Apr 2017 14:47:41 +0100 Subject: [PATCH 3/3] 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