From 78cd26c8a8a5c61e0a3fdd0cd1a4c26ce15da65a Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 6 May 2020 12:34:57 +0300 Subject: [PATCH 1/5] Check if a node has been automatically cut off by the job before executing the Cut off action on it. Try to fix: [ERROR] SearchByDeclassificationReviewTest.setupSearchByDeclassificationReviewTest:120->lambda$setupSearchByDeclassificationReviewTest$1:121 POST request to http://35.180.136.204:8080/alfresco/service/api/rma/actions/ExecutionQueue was not successful. expected:<200> but was:<500> --- .../model/fileplancomponents/FilePlanComponentAspects.java | 7 +++++-- .../recordcategories/AutomaticDispositionTest.java | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAspects.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAspects.java index 06c7493f17..78fa8ebe49 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAspects.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAspects.java @@ -41,10 +41,10 @@ public class FilePlanComponentAspects // aspect present on completed records public static final String ASPECTS_COMPLETED_RECORD = "rma:declaredRecord"; - + // aspect present on record folders/categories with vital records public static final String ASPECTS_VITAL_RECORD_DEFINITION= "rma:vitalRecordDefinition"; - + // aspect present on vital records public static final String ASPECTS_VITAL_RECORD = "rma:vitalRecord"; @@ -53,4 +53,7 @@ public class FilePlanComponentAspects // recordSearch aspect public static final String RECORD_SEARCH_ASPECT = "rma:recordSearch"; + + // retention schedule cut off aspect + public static final String CUT_OFF_ASPECT = "rma:cutOff"; } diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/AutomaticDispositionTest.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/AutomaticDispositionTest.java index 56e904c0d5..075eeedc3a 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/AutomaticDispositionTest.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/AutomaticDispositionTest.java @@ -26,6 +26,7 @@ */ package org.alfresco.rest.rm.community.recordcategories; +import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.CUT_OFF_ASPECT; import static org.alfresco.utility.data.RandomData.getRandomName; import static org.alfresco.utility.report.log.Step.STEP; import static org.testng.Assert.assertTrue; @@ -45,8 +46,6 @@ import org.testng.annotations.Test; public class AutomaticDispositionTest extends BaseRMRestTest { - private static final String CUT_OFF_ASPECT = "rma:cutOff"; - @Autowired private DispositionScheduleService dispositionScheduleService; From 5abc1262aa68ff4efba51cd98c04be9de534e3c2 Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Fri, 8 May 2020 15:25:44 +0300 Subject: [PATCH 2/5] Updates to the version ACS 6.2.1-RC7 and Share RC2 (#1133) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index de4488d61c..e3d70c333a 100644 --- a/pom.xml +++ b/pom.xml @@ -558,7 +558,7 @@ 3.1.0 8080 - 2.10.3 + 2.10.2 2.10.1 0.31.0 1.10.19 From bd42aa09973d3c713d1e71e5d810a3f509f344e1 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Mon, 11 May 2020 09:35:03 +0100 Subject: [PATCH 3/5] [maven-release-plugin] prepare release V3.3.1 --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index e3d70c333a..c998db8d58 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-governance-services pom - 3.3.1-SNAPSHOT + 3.3.1 Alfresco Governance Services http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:ssh://git@github.com/Alfresco/governance-services.git scm:git:ssh://git@github.com/Alfresco/governance-services.git scm:git:ssh://git@github.com/Alfresco/governance-services.git - HEAD + V3.3.1 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 481f1e14dc..7d8e37701b 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.3.1-SNAPSHOT + 3.3.1 diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 679ce45abb..346df351be 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-automation - 3.3.1-SNAPSHOT + 3.3.1 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 6ccdcb7ed0..81bd8e1d47 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.3.1-SNAPSHOT + 3.3.1 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 8658e81f86..38e64cd266 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-governance-services-community - 3.3.1-SNAPSHOT + 3.3.1 diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 435f7e40e0..8be9c4bc50 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community - 3.3.1-SNAPSHOT + 3.3.1 From 16c39fd705b0de472cbd5c2667d5dc728ca7eacd Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Mon, 11 May 2020 09:35:14 +0100 Subject: [PATCH 4/5] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index c998db8d58..2028509836 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-governance-services pom - 3.3.1 + 3.3.2-SNAPSHOT Alfresco Governance Services http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:ssh://git@github.com/Alfresco/governance-services.git scm:git:ssh://git@github.com/Alfresco/governance-services.git scm:git:ssh://git@github.com/Alfresco/governance-services.git - V3.3.1 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 7d8e37701b..087cae3046 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.3.1 + 3.3.2-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 346df351be..2d99c2bae8 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-automation - 3.3.1 + 3.3.2-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 81bd8e1d47..257f1025b6 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.3.1 + 3.3.2-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 38e64cd266..06e451f71e 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-governance-services-community - 3.3.1 + 3.3.2-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 8be9c4bc50..f1c7f25308 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community - 3.3.1 + 3.3.2-SNAPSHOT From df30ee6394fccca4d05af5469da409f6e0bd417f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 11 May 2020 12:24:07 +0300 Subject: [PATCH 5/5] Update version to 3.3.1.1-SNAPSHOT --- pom.xml | 2 +- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index c998db8d58..8871ca43d5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-governance-services pom - 3.3.1 + 3.3.1.1-SNAPSHOT Alfresco Governance Services http://www.alfresco.org/ diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 7d8e37701b..e7e2ad5932 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.3.1 + 3.3.1.1-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 346df351be..8cb0ce0f88 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-automation - 3.3.1 + 3.3.1.1-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 81bd8e1d47..c9d5daae79 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.3.1 + 3.3.1.1-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 38e64cd266..c6c00abc6a 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-governance-services-community - 3.3.1 + 3.3.1.1-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 8be9c4bc50..99d5d2570c 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community - 3.3.1 + 3.3.1.1-SNAPSHOT