From 2660da2dcbb4d367d2ed6baae5d8348d0364d9b2 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 14 Oct 2022 10:32:29 +0000 Subject: [PATCH 01/26] [maven-release-plugin][skip ci] prepare release 17.168 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 83deb04622..af63445dd2 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 17.168-SNAPSHOT + 17.168 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 4bf00182cb..6989cd3341 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.168-SNAPSHOT + 17.168 diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 13e42dc239..67bd97def6 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 17.168-SNAPSHOT + 17.168 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 71fc2e7679..8bd5682425 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.168-SNAPSHOT + 17.168 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 24e4b78a2d..48d9279203 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.168-SNAPSHOT + 17.168 diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 272ccf8b91..597bec362f 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.168-SNAPSHOT + 17.168 diff --git a/amps/pom.xml b/amps/pom.xml index ab6c36336c..086ec6bf5f 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.168-SNAPSHOT + 17.168 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 4b605bce90..c1f45d68db 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 17.168-SNAPSHOT + 17.168 diff --git a/core/pom.xml b/core/pom.xml index a72c930705..03bb6fdd31 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.168-SNAPSHOT + 17.168 diff --git a/data-model/pom.xml b/data-model/pom.xml index f9edb31f9f..732071d75f 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.168-SNAPSHOT + 17.168 diff --git a/mmt/pom.xml b/mmt/pom.xml index 9a4c7d5c7d..1d92521905 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.168-SNAPSHOT + 17.168 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 7558bb139b..286b79a883 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 17.168-SNAPSHOT + 17.168 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 590fb7075f..fb4d9a65f5 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.168-SNAPSHOT + 17.168 diff --git a/packaging/pom.xml b/packaging/pom.xml index edfdcd5d7b..60899ecd1f 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.168-SNAPSHOT + 17.168 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 8a91294859..688ffcca73 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 17.168-SNAPSHOT + 17.168 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index a6e5acf81d..fb37047344 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 17.168-SNAPSHOT + 17.168 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index a494e80474..5fcadb83ce 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.168-SNAPSHOT + 17.168 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 29b864805e..c15f0d1a1c 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.168-SNAPSHOT + 17.168 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index c4ceeb4f05..6a6a378ce1 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.168-SNAPSHOT + 17.168 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index bd2cb530bc..4535eb09b4 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.168-SNAPSHOT + 17.168 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 91883a16e2..8839a9d815 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.168-SNAPSHOT + 17.168 diff --git a/pom.xml b/pom.xml index be9540f831..9f5a1f22a8 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 17.168-SNAPSHOT + 17.168 pom Alfresco Community Repo Parent @@ -149,7 +149,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 17.168 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index c7a7e347f8..f33faf3a9b 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.168-SNAPSHOT + 17.168 diff --git a/repository/pom.xml b/repository/pom.xml index e76d625e02..d7617392f2 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.168-SNAPSHOT + 17.168 From d1079890f721c34df9c3a4586d4936794cd955ba Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 14 Oct 2022 10:32:32 +0000 Subject: [PATCH 02/26] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index af63445dd2..509a8e7d11 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 17.168 + 17.169-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 6989cd3341..8afa4941a9 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.168 + 17.169-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 67bd97def6..9619c74902 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 17.168 + 17.169-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 8bd5682425..37c329eb3d 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.168 + 17.169-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 48d9279203..f6c90d97e9 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.168 + 17.169-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 597bec362f..e4ff0db4e7 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.168 + 17.169-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 086ec6bf5f..fac232a914 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.168 + 17.169-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index c1f45d68db..2980b47b78 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 17.168 + 17.169-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 03bb6fdd31..c428d5d396 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.168 + 17.169-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 732071d75f..af9017afd8 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.168 + 17.169-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 1d92521905..7dc6cde698 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.168 + 17.169-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 286b79a883..4b70bd966e 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 17.168 + 17.169-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index fb4d9a65f5..0e0dfaeaf8 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.168 + 17.169-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 60899ecd1f..6a270477cd 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.168 + 17.169-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 688ffcca73..a4e633b17d 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 17.168 + 17.169-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index fb37047344..dbea9cb86b 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 17.168 + 17.169-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 5fcadb83ce..6908313f6f 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.168 + 17.169-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index c15f0d1a1c..ffeced20c8 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.168 + 17.169-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 6a6a378ce1..3c17c6b741 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.168 + 17.169-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 4535eb09b4..cf1c12ddb9 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.168 + 17.169-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 8839a9d815..b46a812af0 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.168 + 17.169-SNAPSHOT diff --git a/pom.xml b/pom.xml index 9f5a1f22a8..3793d92997 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 17.168 + 17.169-SNAPSHOT pom Alfresco Community Repo Parent @@ -149,7 +149,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 17.168 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index f33faf3a9b..afd45f9546 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.168 + 17.169-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index d7617392f2..a1457a7ea2 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.168 + 17.169-SNAPSHOT From fe1233791d8fac0a0dd3ee8efb477258e7a4bb3e Mon Sep 17 00:00:00 2001 From: rrajoria Date: Fri, 14 Oct 2022 18:44:52 +0530 Subject: [PATCH 03/26] Updating GoogleDrive and AOS Dependencies --- .../webscripts/org/alfresco/slingshot/search/search.get.js | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.get.js b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.get.js index 01935ec327..3a188f70e2 100644 --- a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.get.js +++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/search/search.get.js @@ -14,7 +14,7 @@ function main() maxResults: (args.maxResults !== null) ? parseInt(args.maxResults, 10) : DEFAULT_MAX_RESULTS, pageSize: (args.pageSize !== null) ? parseInt(args.pageSize, 10) : DEFAULT_PAGE_SIZE, startIndex: (args.startIndex !== null) ? parseInt(args.startIndex, 10) : 0, - facetFields: args.facetFields.replace( /(<([^>]+)>)/ig, ''), + facetFields: args.facetFields !== null ? args.facetFields.replace( /(<([^>]+)>)/ig, '') : null, filters: args.filters, encodedFilters: args.encodedFilters, spell: (args.spellcheck !== null) ? (args.spellcheck == "true") : false diff --git a/pom.xml b/pom.xml index 3793d92997..6818180a64 100644 --- a/pom.xml +++ b/pom.xml @@ -109,8 +109,8 @@ 2.7.0 1.1.4 - 3.2.3-A3 - 1.4.1 + 3.3.0-A1 + 1.5.0-A4 7.3.0-A1 2.2.0 From 2ab1023eb737f06f6fe2cad0b5d1be593415943e Mon Sep 17 00:00:00 2001 From: rrajoria <88024787+rrajoria@users.noreply.github.com> Date: Fri, 14 Oct 2022 18:59:36 +0530 Subject: [PATCH 04/26] Reverting AOS Dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6818180a64..c3629837ff 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 1.1.4 3.3.0-A1 - 1.5.0-A4 + 1.4.1 7.3.0-A1 2.2.0 From 6eb80bf64e0c4eee8f82a8097af9af983e7e1649 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 14 Oct 2022 14:05:17 +0000 Subject: [PATCH 05/26] [maven-release-plugin][skip ci] prepare release 17.169 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 509a8e7d11..6fb8805ffe 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 17.169-SNAPSHOT + 17.169 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 8afa4941a9..4b63e7b63d 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.169-SNAPSHOT + 17.169 diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 9619c74902..8a12d033c4 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 17.169-SNAPSHOT + 17.169 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 37c329eb3d..59c9762b88 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.169-SNAPSHOT + 17.169 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index f6c90d97e9..d9b69d6553 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.169-SNAPSHOT + 17.169 diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index e4ff0db4e7..238d70fdeb 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.169-SNAPSHOT + 17.169 diff --git a/amps/pom.xml b/amps/pom.xml index fac232a914..b90264db3b 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.169-SNAPSHOT + 17.169 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 2980b47b78..434bf9e548 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 17.169-SNAPSHOT + 17.169 diff --git a/core/pom.xml b/core/pom.xml index c428d5d396..01baf79880 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.169-SNAPSHOT + 17.169 diff --git a/data-model/pom.xml b/data-model/pom.xml index af9017afd8..dd3b1b90e5 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.169-SNAPSHOT + 17.169 diff --git a/mmt/pom.xml b/mmt/pom.xml index 7dc6cde698..64c6b9d611 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.169-SNAPSHOT + 17.169 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 4b70bd966e..5d789d836c 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 17.169-SNAPSHOT + 17.169 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 0e0dfaeaf8..11cefbb7bc 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.169-SNAPSHOT + 17.169 diff --git a/packaging/pom.xml b/packaging/pom.xml index 6a270477cd..79d5d6eb1f 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.169-SNAPSHOT + 17.169 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index a4e633b17d..4551538df4 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 17.169-SNAPSHOT + 17.169 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index dbea9cb86b..324bc3c74a 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 17.169-SNAPSHOT + 17.169 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 6908313f6f..b672580ced 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.169-SNAPSHOT + 17.169 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index ffeced20c8..f7899b7010 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.169-SNAPSHOT + 17.169 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 3c17c6b741..2797ffa863 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.169-SNAPSHOT + 17.169 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index cf1c12ddb9..6b84baf62c 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.169-SNAPSHOT + 17.169 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index b46a812af0..effdba0a2a 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.169-SNAPSHOT + 17.169 diff --git a/pom.xml b/pom.xml index c3629837ff..c2b1083911 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 17.169-SNAPSHOT + 17.169 pom Alfresco Community Repo Parent @@ -149,7 +149,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 17.169 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index afd45f9546..a557b76fdb 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.169-SNAPSHOT + 17.169 diff --git a/repository/pom.xml b/repository/pom.xml index a1457a7ea2..a18919f468 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.169-SNAPSHOT + 17.169 From 1f844ce199f6ba5954ba3284312be873c53cb150 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 14 Oct 2022 14:05:20 +0000 Subject: [PATCH 06/26] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 6fb8805ffe..6b25e0841f 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 17.169 + 17.170-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 4b63e7b63d..6bc7f800c8 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.169 + 17.170-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 8a12d033c4..4de6cafecc 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 17.169 + 17.170-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 59c9762b88..838826d035 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.169 + 17.170-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index d9b69d6553..f01e30a7c8 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.169 + 17.170-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 238d70fdeb..088120a886 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.169 + 17.170-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index b90264db3b..2bcd1a6263 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.169 + 17.170-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 434bf9e548..0a6564ba14 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 17.169 + 17.170-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 01baf79880..840e87aced 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.169 + 17.170-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index dd3b1b90e5..46a097cbd5 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.169 + 17.170-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 64c6b9d611..856a072eb4 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.169 + 17.170-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 5d789d836c..951e9d8992 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 17.169 + 17.170-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 11cefbb7bc..476d49e8d5 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.169 + 17.170-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 79d5d6eb1f..20f9ea6f01 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.169 + 17.170-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 4551538df4..7445ce65d6 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 17.169 + 17.170-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 324bc3c74a..31d29bc69b 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 17.169 + 17.170-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index b672580ced..0f2b073626 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.169 + 17.170-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index f7899b7010..46e878a644 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.169 + 17.170-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 2797ffa863..363551eef8 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.169 + 17.170-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 6b84baf62c..fb01ee4be9 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.169 + 17.170-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index effdba0a2a..31e7b3ff65 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.169 + 17.170-SNAPSHOT diff --git a/pom.xml b/pom.xml index c2b1083911..fa1a5e049f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 17.169 + 17.170-SNAPSHOT pom Alfresco Community Repo Parent @@ -149,7 +149,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 17.169 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index a557b76fdb..c76a907268 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.169 + 17.170-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index a18919f468..b5292c0acc 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.169 + 17.170-SNAPSHOT From b369538a618466edd6a1717b83e2c9cc9c742869 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Fri, 14 Oct 2022 16:37:58 +0100 Subject: [PATCH 07/26] ACS-3651 Update rule util initialisation to be on request. This avoids creating data before env is ready and in cases where we want an ootb repo. --- .../alfresco/rest/rules/RulesTestsUtils.java | 77 +++++++++++-------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java index 7399ef259f..443addb1bd 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java @@ -51,12 +51,11 @@ import org.alfresco.utility.data.DataUserAIS; import org.alfresco.utility.model.FolderModel; import org.alfresco.utility.model.SiteModel; import org.alfresco.utility.model.UserModel; -import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class RulesTestsUtils implements InitializingBean +public class RulesTestsUtils { static final String RULE_NAME_DEFAULT = "ruleName"; static final String RULE_DESCRIPTION_DEFAULT = "rule description"; @@ -87,39 +86,15 @@ public class RulesTestsUtils implements InitializingBean @Autowired private DataContent dataContent; - private SiteModel site; + /** Public site used by these helper methods. This is populated by the getter and should not be accessed directly. */ + private SiteModel publicSite; + /** Script node used by these helper methods. This is populated by the getter and should not be accessed directly. */ private String reviewAndApproveWorkflowNode; - + /** Destination folder for copy action used by these helper methods. This is populated by the getter and should not be accessed directly. */ private FolderModel copyDestinationFolder; - + /** Destination folder for check out action used by these helper methods. This is populated by the getter and should not be accessed directly. */ private FolderModel checkOutDestinationFolder; - /** - * Initialise the util class. - */ - @Override - public void afterPropertiesSet() - { - UserModel admin = dataUser.getAdminUser(); - // Obtain the node ref for the review and approve workflow. - RestActionDefinitionModel actionDef = restClient.authenticateUser(admin).withCoreAPI().usingActions().getActionDefinitionById(RULE_SCRIPT_ID); - RestParameterDefinitionModel paramDef = actionDef.getParameterDefinitions().stream().filter(param -> param.getName().equals(RULE_SCRIPT_PARAM_ID)).findFirst().get(); - String constraintName = paramDef.getParameterConstraintName(); - RestActionConstraintModel constraintDef = restClient.authenticateUser(admin).withCoreAPI().usingActions().getActionConstraintByName(constraintName); - RestActionConstraintDataModel reviewAndApprove = constraintDef.getConstraintValues().stream().filter(constraintValue -> constraintValue.getLabel().equals(RULE_ERROR_SCRIPT_LABEL)).findFirst().get(); - reviewAndApproveWorkflowNode = reviewAndApprove.getValue(); - - // Create a couple of public folders to be used as action destinations. - site = dataSite.usingUser(admin).createPublicRandomSite(); - copyDestinationFolder = dataContent.usingUser(admin).usingSite(site).createFolder(); - checkOutDestinationFolder = dataContent.usingUser(admin).usingSite(site).createFolder(); - } - - public RestRuleModel createRuleModelWithModifiedValues() - { - return createRuleModelWithModifiedValues(List.of(createAddAudioAspectAction())); - } - /** * Get the review and approve workflow node (throwing an exception if this utility class has not been initialised). * @@ -127,19 +102,55 @@ public class RulesTestsUtils implements InitializingBean */ public String getReviewAndApproveWorkflowNode() { + if (reviewAndApproveWorkflowNode == null) + { + UserModel admin = dataUser.getAdminUser(); + // Obtain the node ref for the review and approve workflow. + RestActionDefinitionModel actionDef = restClient.authenticateUser(admin).withCoreAPI().usingActions().getActionDefinitionById(RULE_SCRIPT_ID); + RestParameterDefinitionModel paramDef = actionDef.getParameterDefinitions().stream().filter(param -> param.getName().equals(RULE_SCRIPT_PARAM_ID)).findFirst().get(); + String constraintName = paramDef.getParameterConstraintName(); + RestActionConstraintModel constraintDef = restClient.authenticateUser(admin).withCoreAPI().usingActions().getActionConstraintByName(constraintName); + RestActionConstraintDataModel reviewAndApprove = constraintDef.getConstraintValues().stream().filter(constraintValue -> constraintValue.getLabel().equals(RULE_ERROR_SCRIPT_LABEL)).findFirst().get(); + reviewAndApproveWorkflowNode = reviewAndApprove.getValue(); + } return reviewAndApproveWorkflowNode; } + public SiteModel getPublicSite() + { + if (publicSite == null) + { + UserModel admin = dataUser.getAdminUser(); + publicSite = dataSite.usingUser(admin).createPublicRandomSite(); + } + return publicSite; + } + public FolderModel getCopyDestinationFolder() { + if (copyDestinationFolder == null) + { + UserModel admin = dataUser.getAdminUser(); + copyDestinationFolder = dataContent.usingUser(admin).usingSite(getPublicSite()).createFolder(); + } return copyDestinationFolder; } public FolderModel getCheckOutDestinationFolder() { + if (checkOutDestinationFolder == null) + { + UserModel admin = dataUser.getAdminUser(); + checkOutDestinationFolder = dataContent.usingUser(admin).usingSite(getPublicSite()).createFolder(); + } return checkOutDestinationFolder; } + public RestRuleModel createRuleModelWithModifiedValues() + { + return createRuleModelWithModifiedValues(List.of(createAddAudioAspectAction())); + } + /** * Create a rule model filled with custom constant values. * @@ -239,10 +250,10 @@ public class RulesTestsUtils implements InitializingBean public RestRuleModel createVariousActions() { final Map copyParams = - Map.of("destination-folder", copyDestinationFolder.getNodeRef(), "deep-copy", true); + Map.of("destination-folder", getCopyDestinationFolder().getNodeRef(), "deep-copy", true); final RestActionBodyExecTemplateModel copyAction = createCustomActionModel("copy", copyParams); final Map checkOutParams = - Map.of("destination-folder", checkOutDestinationFolder.getNodeRef(), "assoc-name", "cm:checkout", + Map.of("destination-folder", getCheckOutDestinationFolder().getNodeRef(), "assoc-name", "cm:checkout", "assoc-type", "cm:contains"); final RestActionBodyExecTemplateModel checkOutAction = createCustomActionModel("check-out", checkOutParams); // The counter action takes no parameters, so check we can omit the "params" entry. From 37f5b637ddffe880f0eb4c753b929d3a42e29449 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 14 Oct 2022 16:28:16 +0000 Subject: [PATCH 08/26] [maven-release-plugin][skip ci] prepare release 17.170 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 6b25e0841f..d8b156c5d6 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 17.170-SNAPSHOT + 17.170 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 6bc7f800c8..da8c7d625e 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.170-SNAPSHOT + 17.170 diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 4de6cafecc..af0127252b 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 17.170-SNAPSHOT + 17.170 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 838826d035..8fa13ceef4 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.170-SNAPSHOT + 17.170 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index f01e30a7c8..4a71780680 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.170-SNAPSHOT + 17.170 diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 088120a886..7d07caafe3 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.170-SNAPSHOT + 17.170 diff --git a/amps/pom.xml b/amps/pom.xml index 2bcd1a6263..fa9ac28636 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.170-SNAPSHOT + 17.170 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 0a6564ba14..aca8e90bf5 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 17.170-SNAPSHOT + 17.170 diff --git a/core/pom.xml b/core/pom.xml index 840e87aced..6de5b5bdae 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.170-SNAPSHOT + 17.170 diff --git a/data-model/pom.xml b/data-model/pom.xml index 46a097cbd5..223629f027 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.170-SNAPSHOT + 17.170 diff --git a/mmt/pom.xml b/mmt/pom.xml index 856a072eb4..ff5ec6f43f 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.170-SNAPSHOT + 17.170 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 951e9d8992..ba43234d78 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 17.170-SNAPSHOT + 17.170 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 476d49e8d5..a44a770a76 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.170-SNAPSHOT + 17.170 diff --git a/packaging/pom.xml b/packaging/pom.xml index 20f9ea6f01..ea70d75622 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.170-SNAPSHOT + 17.170 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 7445ce65d6..34da97a325 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 17.170-SNAPSHOT + 17.170 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 31d29bc69b..f4de1fc95d 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 17.170-SNAPSHOT + 17.170 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 0f2b073626..e776392ffc 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.170-SNAPSHOT + 17.170 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 46e878a644..4aad95ae03 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.170-SNAPSHOT + 17.170 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 363551eef8..16d241cf1e 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.170-SNAPSHOT + 17.170 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index fb01ee4be9..50d2df3bb0 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.170-SNAPSHOT + 17.170 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 31e7b3ff65..8d5f74b38f 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.170-SNAPSHOT + 17.170 diff --git a/pom.xml b/pom.xml index fa1a5e049f..0a8f906c2f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 17.170-SNAPSHOT + 17.170 pom Alfresco Community Repo Parent @@ -149,7 +149,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 17.170 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index c76a907268..794207dd3f 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.170-SNAPSHOT + 17.170 diff --git a/repository/pom.xml b/repository/pom.xml index b5292c0acc..152f6045a4 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.170-SNAPSHOT + 17.170 From 8757f0ff2ba25e7a1aeb963e5f21231643d65cf2 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 14 Oct 2022 16:28:19 +0000 Subject: [PATCH 09/26] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index d8b156c5d6..28bd73b6f6 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 17.170 + 17.171-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index da8c7d625e..d1ac923c18 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.170 + 17.171-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index af0127252b..a731bfb41a 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 17.170 + 17.171-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 8fa13ceef4..b855403019 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.170 + 17.171-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 4a71780680..27f03b41e3 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.170 + 17.171-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 7d07caafe3..3075aef3d7 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.170 + 17.171-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index fa9ac28636..40c8e8c735 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.170 + 17.171-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index aca8e90bf5..4dd7a9f0ea 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 17.170 + 17.171-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 6de5b5bdae..6373547010 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.170 + 17.171-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 223629f027..0d86746c12 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.170 + 17.171-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index ff5ec6f43f..3d0aa0ed73 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.170 + 17.171-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index ba43234d78..7fc8eb6490 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 17.170 + 17.171-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index a44a770a76..593770f6fa 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.170 + 17.171-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index ea70d75622..ae0b98280c 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.170 + 17.171-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 34da97a325..475ea85a87 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 17.170 + 17.171-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index f4de1fc95d..0acfa8163d 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 17.170 + 17.171-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index e776392ffc..fd79bb13ed 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.170 + 17.171-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 4aad95ae03..1435b2a348 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.170 + 17.171-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 16d241cf1e..ee85443753 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.170 + 17.171-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 50d2df3bb0..6ef6e3dc9b 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.170 + 17.171-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 8d5f74b38f..9a284441cc 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.170 + 17.171-SNAPSHOT diff --git a/pom.xml b/pom.xml index 0a8f906c2f..8a27793af4 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 17.170 + 17.171-SNAPSHOT pom Alfresco Community Repo Parent @@ -149,7 +149,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 17.170 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 794207dd3f..613278a961 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.170 + 17.171-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 152f6045a4..6853606344 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.170 + 17.171-SNAPSHOT From ee1ac25bf60d981571432d0a48cdd1741f8e9726 Mon Sep 17 00:00:00 2001 From: Jared Ottley Date: Fri, 14 Oct 2022 13:22:07 -0600 Subject: [PATCH 10/26] Test AOS version 1.5.0-A4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8a27793af4..06f6914bfb 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 1.1.4 3.3.0-A1 - 1.4.1 + 1.5.0-A4 7.3.0-A1 2.2.0 From a7ae83bbeeb02ff21c22cc85421d6bca39dacfd0 Mon Sep 17 00:00:00 2001 From: MohinishSah <88024811+MohinishSah@users.noreply.github.com> Date: Sat, 15 Oct 2022 12:02:09 +0530 Subject: [PATCH 11/26] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 06f6914bfb..aa28dd73a4 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 1.1.4 3.3.0-A1 - 1.5.0-A4 + 1.5.0-A6 7.3.0-A1 2.2.0 From f64d0a1b59900c9a0480b88c4d428f6f79e77659 Mon Sep 17 00:00:00 2001 From: MohinishSah <88024811+MohinishSah@users.noreply.github.com> Date: Sat, 15 Oct 2022 15:41:59 +0530 Subject: [PATCH 12/26] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa28dd73a4..8a27793af4 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 1.1.4 3.3.0-A1 - 1.5.0-A6 + 1.4.1 7.3.0-A1 2.2.0 From 9b779facd910672cfb26a4c864aa81bed5a3b52c Mon Sep 17 00:00:00 2001 From: MohinishSah <88024811+MohinishSah@users.noreply.github.com> Date: Sat, 15 Oct 2022 16:10:29 +0530 Subject: [PATCH 13/26] updating Aos alpha version A6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8a27793af4..aa28dd73a4 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 1.1.4 3.3.0-A1 - 1.4.1 + 1.5.0-A6 7.3.0-A1 2.2.0 From c7227d19c415daf4f2b44dbc326257fd5b683b46 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Sat, 15 Oct 2022 11:15:01 +0000 Subject: [PATCH 14/26] [maven-release-plugin][skip ci] prepare release 17.171 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 28bd73b6f6..cfd70cf065 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 17.171-SNAPSHOT + 17.171 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index d1ac923c18..e1a313fae6 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.171-SNAPSHOT + 17.171 diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index a731bfb41a..b37b214936 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 17.171-SNAPSHOT + 17.171 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index b855403019..cb7c399259 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.171-SNAPSHOT + 17.171 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 27f03b41e3..66ba5341dd 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.171-SNAPSHOT + 17.171 diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 3075aef3d7..4051d28681 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.171-SNAPSHOT + 17.171 diff --git a/amps/pom.xml b/amps/pom.xml index 40c8e8c735..b20b98a44a 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.171-SNAPSHOT + 17.171 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 4dd7a9f0ea..54e45fb2ab 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 17.171-SNAPSHOT + 17.171 diff --git a/core/pom.xml b/core/pom.xml index 6373547010..dc3041c19b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.171-SNAPSHOT + 17.171 diff --git a/data-model/pom.xml b/data-model/pom.xml index 0d86746c12..2ecd6b5e8d 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.171-SNAPSHOT + 17.171 diff --git a/mmt/pom.xml b/mmt/pom.xml index 3d0aa0ed73..780d43ee83 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.171-SNAPSHOT + 17.171 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 7fc8eb6490..acac4e0bf3 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 17.171-SNAPSHOT + 17.171 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 593770f6fa..709bea6b79 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.171-SNAPSHOT + 17.171 diff --git a/packaging/pom.xml b/packaging/pom.xml index ae0b98280c..23b42fe4f3 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.171-SNAPSHOT + 17.171 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 475ea85a87..ae17f64396 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 17.171-SNAPSHOT + 17.171 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 0acfa8163d..c15f463ae3 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 17.171-SNAPSHOT + 17.171 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index fd79bb13ed..68cd4aafcd 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.171-SNAPSHOT + 17.171 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 1435b2a348..b2d077b795 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.171-SNAPSHOT + 17.171 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index ee85443753..e98978512b 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.171-SNAPSHOT + 17.171 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 6ef6e3dc9b..c50443423b 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.171-SNAPSHOT + 17.171 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 9a284441cc..97758f8160 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.171-SNAPSHOT + 17.171 diff --git a/pom.xml b/pom.xml index aa28dd73a4..85ee149230 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 17.171-SNAPSHOT + 17.171 pom Alfresco Community Repo Parent @@ -149,7 +149,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 17.171 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 613278a961..d27d84bade 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.171-SNAPSHOT + 17.171 diff --git a/repository/pom.xml b/repository/pom.xml index 6853606344..714bcfe8c8 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.171-SNAPSHOT + 17.171 From dfb6f50056159062c05b4b6eaa2b97bd2a0f35dc Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Sat, 15 Oct 2022 11:15:03 +0000 Subject: [PATCH 15/26] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index cfd70cf065..5b568b74f4 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 17.171 + 17.172-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index e1a313fae6..80684b725a 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.171 + 17.172-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index b37b214936..5603bac71d 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 17.171 + 17.172-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index cb7c399259..45b1bf9dce 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.171 + 17.172-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 66ba5341dd..4b36832976 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.171 + 17.172-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 4051d28681..993a149cc3 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.171 + 17.172-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index b20b98a44a..4a5229f1ac 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.171 + 17.172-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 54e45fb2ab..1365184c7b 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 17.171 + 17.172-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index dc3041c19b..4c561c982a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.171 + 17.172-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 2ecd6b5e8d..d50006ce3f 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.171 + 17.172-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 780d43ee83..4ffc95f2b5 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.171 + 17.172-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index acac4e0bf3..62e25a6273 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 17.171 + 17.172-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 709bea6b79..c13b4ceaef 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.171 + 17.172-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 23b42fe4f3..8b451bd782 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.171 + 17.172-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index ae17f64396..eca36c2fd7 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 17.171 + 17.172-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index c15f463ae3..158a433fbd 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 17.171 + 17.172-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 68cd4aafcd..9eafcf2252 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.171 + 17.172-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index b2d077b795..b09867576b 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.171 + 17.172-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index e98978512b..0a2838c70c 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.171 + 17.172-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index c50443423b..d1a26f674a 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.171 + 17.172-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 97758f8160..9f7d3b8d61 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.171 + 17.172-SNAPSHOT diff --git a/pom.xml b/pom.xml index 85ee149230..7135b761fa 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 17.171 + 17.172-SNAPSHOT pom Alfresco Community Repo Parent @@ -149,7 +149,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 17.171 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index d27d84bade..314955142e 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.171 + 17.172-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 714bcfe8c8..949344e5f6 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.171 + 17.172-SNAPSHOT From f4f5fd41822a326377d678867edf79ebaa847a56 Mon Sep 17 00:00:00 2001 From: Alfresco CI User Date: Sun, 16 Oct 2022 00:05:13 +0000 Subject: [PATCH 16/26] [force] Force release for 2022-10-16. From 4bf29ca69cfdf3bbb7c4e7fa4e9a885b7a69ab33 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 16 Oct 2022 00:12:13 +0000 Subject: [PATCH 17/26] [maven-release-plugin][skip ci] prepare release 17.172 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 5b568b74f4..f39efddcfe 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 17.172-SNAPSHOT + 17.172 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 80684b725a..5c84da2dbb 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.172-SNAPSHOT + 17.172 diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 5603bac71d..88c3f10a90 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 17.172-SNAPSHOT + 17.172 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 45b1bf9dce..e711b40ca2 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.172-SNAPSHOT + 17.172 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 4b36832976..304cfb4d69 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.172-SNAPSHOT + 17.172 diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 993a149cc3..88d13bf96c 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.172-SNAPSHOT + 17.172 diff --git a/amps/pom.xml b/amps/pom.xml index 4a5229f1ac..58f8f0a869 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.172-SNAPSHOT + 17.172 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 1365184c7b..4dc9394ab3 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 17.172-SNAPSHOT + 17.172 diff --git a/core/pom.xml b/core/pom.xml index 4c561c982a..1bbb06c248 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.172-SNAPSHOT + 17.172 diff --git a/data-model/pom.xml b/data-model/pom.xml index d50006ce3f..8a45d73974 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.172-SNAPSHOT + 17.172 diff --git a/mmt/pom.xml b/mmt/pom.xml index 4ffc95f2b5..b6080734bd 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.172-SNAPSHOT + 17.172 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 62e25a6273..ee5b49f0cb 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 17.172-SNAPSHOT + 17.172 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index c13b4ceaef..8c77febbb8 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.172-SNAPSHOT + 17.172 diff --git a/packaging/pom.xml b/packaging/pom.xml index 8b451bd782..bcb522d256 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.172-SNAPSHOT + 17.172 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index eca36c2fd7..8ee31919e0 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 17.172-SNAPSHOT + 17.172 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 158a433fbd..32af1d4e72 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 17.172-SNAPSHOT + 17.172 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 9eafcf2252..647419c99b 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.172-SNAPSHOT + 17.172 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index b09867576b..a272ed8cca 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.172-SNAPSHOT + 17.172 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 0a2838c70c..d79b1414af 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.172-SNAPSHOT + 17.172 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index d1a26f674a..c104933a82 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.172-SNAPSHOT + 17.172 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 9f7d3b8d61..f26ab6e256 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.172-SNAPSHOT + 17.172 diff --git a/pom.xml b/pom.xml index 7135b761fa..455d007700 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 17.172-SNAPSHOT + 17.172 pom Alfresco Community Repo Parent @@ -149,7 +149,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 17.172 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 314955142e..88d842345d 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.172-SNAPSHOT + 17.172 diff --git a/repository/pom.xml b/repository/pom.xml index 949344e5f6..003aa9c53c 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.172-SNAPSHOT + 17.172 From e6bdd5738c75eb707d5642df846333b28ebecea2 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 16 Oct 2022 00:12:16 +0000 Subject: [PATCH 18/26] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index f39efddcfe..3d929026d7 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 17.172 + 17.173-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 5c84da2dbb..60fec014cb 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.172 + 17.173-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 88c3f10a90..b2bb6cafde 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 17.172 + 17.173-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index e711b40ca2..da0b84309c 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.172 + 17.173-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 304cfb4d69..63bb8eb682 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.172 + 17.173-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 88d13bf96c..917ff57623 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.172 + 17.173-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 58f8f0a869..34039325e4 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.172 + 17.173-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 4dc9394ab3..5989c39336 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 17.172 + 17.173-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 1bbb06c248..0006dbfefa 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.172 + 17.173-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 8a45d73974..8a3ef333bc 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.172 + 17.173-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index b6080734bd..8c37c07c87 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.172 + 17.173-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index ee5b49f0cb..d10535a4b2 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 17.172 + 17.173-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 8c77febbb8..40592b732d 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.172 + 17.173-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index bcb522d256..8db4c15e3e 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.172 + 17.173-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 8ee31919e0..a87306f313 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 17.172 + 17.173-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 32af1d4e72..bae4b52175 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 17.172 + 17.173-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 647419c99b..4b5dbee5da 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.172 + 17.173-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index a272ed8cca..ece84703ad 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.172 + 17.173-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index d79b1414af..2351904e6e 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.172 + 17.173-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index c104933a82..6de5851d59 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.172 + 17.173-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index f26ab6e256..e2a6e81580 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.172 + 17.173-SNAPSHOT diff --git a/pom.xml b/pom.xml index 455d007700..49f8607d76 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 17.172 + 17.173-SNAPSHOT pom Alfresco Community Repo Parent @@ -149,7 +149,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 17.172 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 88d842345d..a945e8808e 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.172 + 17.173-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 003aa9c53c..20b30f930f 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.172 + 17.173-SNAPSHOT From 12bfb1ada3073426004c39023c1ebdb0c41fdf5c Mon Sep 17 00:00:00 2001 From: mpichura Date: Mon, 17 Oct 2022 17:29:00 +0200 Subject: [PATCH 19/26] ACS-3652: Adding E2E tests. --- .../alfresco/rest/rules/CreateRulesTests.java | 45 ++++++++++++++----- .../alfresco/rest/rules/RulesTestsUtils.java | 2 + 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/CreateRulesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/CreateRulesTests.java index ef6cd9eb34..01d3a8f0c5 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/CreateRulesTests.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/CreateRulesTests.java @@ -26,15 +26,14 @@ package org.alfresco.rest.rules; import static java.util.stream.Collectors.toList; - import static org.alfresco.rest.actions.access.AccessRestrictionUtil.ERROR_MESSAGE_ACCESS_RESTRICTED; import static org.alfresco.rest.actions.access.AccessRestrictionUtil.MAIL_ACTION; +import static org.alfresco.rest.rules.RulesTestsUtils.CHECKIN_ACTION; import static org.alfresco.rest.rules.RulesTestsUtils.ID; import static org.alfresco.rest.rules.RulesTestsUtils.INVERTED; import static org.alfresco.rest.rules.RulesTestsUtils.IS_SHARED; import static org.alfresco.rest.rules.RulesTestsUtils.RULE_NAME_DEFAULT; -import static org.alfresco.rest.rules.RulesTestsUtils.RULE_SCRIPT_ID; -import static org.alfresco.rest.rules.RulesTestsUtils.RULE_SCRIPT_PARAM_ID; +import static org.alfresco.rest.rules.RulesTestsUtils.TEMPLATE_PARAM; import static org.alfresco.utility.constants.UserRole.SiteCollaborator; import static org.alfresco.utility.constants.UserRole.SiteConsumer; import static org.alfresco.utility.constants.UserRole.SiteContributor; @@ -58,6 +57,7 @@ import java.util.stream.IntStream; import org.alfresco.rest.RestTest; import org.alfresco.rest.model.RestActionBodyExecTemplateModel; +import org.alfresco.rest.model.RestActionConstraintModel; import org.alfresco.rest.model.RestActionDefinitionModel; import org.alfresco.rest.model.RestCompositeConditionDefinitionModel; import org.alfresco.rest.model.RestParameterDefinitionModel; @@ -388,6 +388,23 @@ public class CreateRulesTests extends RestTest .assertThat().field(IS_SHARED).isNull(); } + /** + * Check we can create a rule with check in action with empty description parameter. + */ + @Test(groups = {TestGroup.REST_API, TestGroup.RULES}) + public void createRuleWithCheckInActionAndEmptyCheckInDescription() + { + final RestRuleModel ruleModel = rulesUtils.createRuleModelWithDefaultValues(); + final RestActionBodyExecTemplateModel checkinAction = new RestActionBodyExecTemplateModel(); + checkinAction.setActionDefinitionId(CHECKIN_ACTION); + checkinAction.setParams(Map.of("description", "")); + ruleModel.setActions(Arrays.asList(checkinAction)); + + restClient.authenticateUser(user).withPrivateAPI().usingNode(ruleFolder).usingDefaultRuleSet().createSingleRule(ruleModel); + + restClient.assertStatusCodeIs(CREATED); + } + /** Check that a normal user cannot create rules that use private actions. */ @Test public void createRuleWithActions_userCannotUsePrivateAction() @@ -409,7 +426,9 @@ public class CreateRulesTests extends RestTest restClient.assertStatusCodeIs(CREATED); } - /** Check that an administrator can create rules that use private actions. */ + /** + * Check that an administrator can create rules with email (private) action with reference to an email template. + */ @Test public void createRuleWithActions_adminCanUseMailActionWithTemplate() { @@ -422,16 +441,20 @@ public class CreateRulesTests extends RestTest params.put("from", sender.getEmailAddress()); params.put("to", recipient.getEmailAddress()); params.put("subject", "Test"); - final RestActionDefinitionModel actionDef = restClient.authenticateUser(user).withCoreAPI().usingActions().getActionDefinitionById(RULE_SCRIPT_ID); - final RestParameterDefinitionModel - paramDef = actionDef.getParameterDefinitions().stream().filter(param -> param.getName().equals(RULE_SCRIPT_PARAM_ID)).findFirst().get(); - final String templateScriptRef = paramDef.getParameterConstraintName(); - params.put("template", templateScriptRef); + final RestActionDefinitionModel actionDef = + restClient.authenticateUser(user).withCoreAPI().usingActions().getActionDefinitionById(MAIL_ACTION); + final RestParameterDefinitionModel paramDef = + actionDef.getParameterDefinitions().stream().filter(param -> param.getName().equals(TEMPLATE_PARAM)).findFirst().get(); + final String constraintName = paramDef.getParameterConstraintName(); + final RestActionConstraintModel constraint = + restClient.authenticateUser(user).withCoreAPI().usingActions().getActionConstraintByName(constraintName); + String templateScriptRef = constraint.getConstraintValues().stream().findFirst().get().getValue(); + params.put(TEMPLATE_PARAM, templateScriptRef); mailAction.setParams(params); ruleModel.setActions(Arrays.asList(mailAction)); restClient.authenticateUser(dataUser.getAdminUser()).withPrivateAPI().usingNode(ruleFolder).usingDefaultRuleSet() - .createSingleRule(rulesUtils.createRuleWithPrivateAction()); + .createSingleRule(ruleModel); restClient.assertStatusCodeIs(CREATED); } @@ -666,7 +689,7 @@ public class CreateRulesTests extends RestTest params.put("to", recipient.getEmailAddress()); params.put("subject", "Test"); final String mailTemplate = "non-existing-node-id"; - params.put("template", mailTemplate); + params.put(TEMPLATE_PARAM, mailTemplate); mailAction.setParams(params); ruleModel.setActions(Arrays.asList(mailAction)); diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java index a7383f6f83..9bf722a65f 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/rules/RulesTestsUtils.java @@ -67,6 +67,7 @@ public class RulesTestsUtils implements InitializingBean static final String RULE_SCRIPT_ID = "script"; static final String RULE_SCRIPT_PARAM_ID = "script-ref"; static final String RULE_ERROR_SCRIPT_LABEL = "Start Pooled Review and Approve Workflow"; + public static final String CHECKIN_ACTION = "check-in"; static final String INBOUND = "inbound"; static final String UPDATE = "update"; static final String OUTBOUND = "outbound"; @@ -77,6 +78,7 @@ public class RulesTestsUtils implements InitializingBean static final String IS_SHARED = "isShared"; static final String AUDIO_ASPECT = "audio:audio"; static final String LOCKABLE_ASPECT = "cm:lockable"; + public static final String TEMPLATE_PARAM = "template"; @Autowired private RestWrapper restClient; From 50b9f5c61218170f782e7af42458386f6f194394 Mon Sep 17 00:00:00 2001 From: Maciej Pichura <41297682+mpichura@users.noreply.github.com> Date: Mon, 17 Oct 2022 18:07:32 +0200 Subject: [PATCH 20/26] ACS-3759: Fixing bug for empty action parameter values (#1501) * ACS-3759: Fixing bug for empty action parameter values * ACS-3759: Fixing missing import --- .../rest/api/impl/mapper/rules/RestRuleActionModelMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/mapper/rules/RestRuleActionModelMapper.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/mapper/rules/RestRuleActionModelMapper.java index 84a070812f..ac82ad09d0 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/mapper/rules/RestRuleActionModelMapper.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/mapper/rules/RestRuleActionModelMapper.java @@ -32,10 +32,10 @@ import static org.alfresco.repo.action.access.ActionAccessRestriction.ACTION_CON import java.io.Serializable; import java.util.Collection; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.stream.Collectors; import org.alfresco.repo.action.ActionImpl; import org.alfresco.repo.action.CompositeActionImpl; @@ -80,7 +80,7 @@ public class RestRuleActionModelMapper implements RestModelMapper convertedParams = actionModel.getParameterValues() .entrySet() .stream() - .collect(Collectors.toMap(Map.Entry::getKey, e -> parameterConverter.convertParamFromServiceModel(e.getValue()))); + .collect(HashMap::new, (m, v) -> m.put(v.getKey(), parameterConverter.convertParamFromServiceModel(v.getValue())), HashMap::putAll); convertedParams.remove(ACTION_CONTEXT_PARAM_NAME); builder.params(convertedParams); } From fd889628c62fb4531e587af0a3c039e36c3fe105 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 17 Oct 2022 16:54:11 +0000 Subject: [PATCH 21/26] [maven-release-plugin][skip ci] prepare release 17.173 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 3d929026d7..9373268e1f 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 17.173-SNAPSHOT + 17.173 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 60fec014cb..e9913adee8 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.173-SNAPSHOT + 17.173 diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index b2bb6cafde..ac3e556e96 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 17.173-SNAPSHOT + 17.173 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index da0b84309c..e1e1074b28 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.173-SNAPSHOT + 17.173 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 63bb8eb682..feaf19bbbb 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.173-SNAPSHOT + 17.173 diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 917ff57623..1646278885 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.173-SNAPSHOT + 17.173 diff --git a/amps/pom.xml b/amps/pom.xml index 34039325e4..f347a0611b 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.173-SNAPSHOT + 17.173 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 5989c39336..5c6537a5db 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 17.173-SNAPSHOT + 17.173 diff --git a/core/pom.xml b/core/pom.xml index 0006dbfefa..41fa68d9f2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.173-SNAPSHOT + 17.173 diff --git a/data-model/pom.xml b/data-model/pom.xml index 8a3ef333bc..bdbf7a04c7 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.173-SNAPSHOT + 17.173 diff --git a/mmt/pom.xml b/mmt/pom.xml index 8c37c07c87..00f7e3c56f 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.173-SNAPSHOT + 17.173 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index d10535a4b2..d9f5f0a182 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 17.173-SNAPSHOT + 17.173 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 40592b732d..3b02c11248 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.173-SNAPSHOT + 17.173 diff --git a/packaging/pom.xml b/packaging/pom.xml index 8db4c15e3e..f271df7ac9 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.173-SNAPSHOT + 17.173 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index a87306f313..cf558b7e13 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 17.173-SNAPSHOT + 17.173 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index bae4b52175..f4e4c9affb 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 17.173-SNAPSHOT + 17.173 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 4b5dbee5da..b725308e70 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.173-SNAPSHOT + 17.173 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index ece84703ad..f4c90c0a66 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.173-SNAPSHOT + 17.173 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 2351904e6e..4f35da3598 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.173-SNAPSHOT + 17.173 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 6de5851d59..add14244ad 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.173-SNAPSHOT + 17.173 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index e2a6e81580..f0239b7a04 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.173-SNAPSHOT + 17.173 diff --git a/pom.xml b/pom.xml index 49f8607d76..88b9fdd6f1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 17.173-SNAPSHOT + 17.173 pom Alfresco Community Repo Parent @@ -149,7 +149,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 17.173 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index a945e8808e..7ceafac33d 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.173-SNAPSHOT + 17.173 diff --git a/repository/pom.xml b/repository/pom.xml index 20b30f930f..47ea5b623a 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.173-SNAPSHOT + 17.173 From 8ba67497e14aefbe1da6f510b991620b1652fe90 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 17 Oct 2022 16:54:14 +0000 Subject: [PATCH 22/26] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 9373268e1f..29ef8e213c 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 17.173 + 17.174-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index e9913adee8..ac043d0b69 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.173 + 17.174-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index ac3e556e96..a068755262 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 17.173 + 17.174-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index e1e1074b28..bbeb8cf98f 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.173 + 17.174-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index feaf19bbbb..9898ce8fa7 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.173 + 17.174-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 1646278885..28d9e881a9 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.173 + 17.174-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index f347a0611b..f4dd892282 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.173 + 17.174-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 5c6537a5db..5b3396818e 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 17.173 + 17.174-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 41fa68d9f2..21d8fb4585 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.173 + 17.174-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index bdbf7a04c7..f39d80a5c8 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.173 + 17.174-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 00f7e3c56f..5d19bfc6d9 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.173 + 17.174-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index d9f5f0a182..1572cb9ce7 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 17.173 + 17.174-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 3b02c11248..4df9aba11b 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.173 + 17.174-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index f271df7ac9..0e65369451 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.173 + 17.174-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index cf558b7e13..c0996df72a 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 17.173 + 17.174-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index f4e4c9affb..d1d4a81b5a 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 17.173 + 17.174-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index b725308e70..38e4716887 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.173 + 17.174-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index f4c90c0a66..7474b39787 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.173 + 17.174-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 4f35da3598..e40d9f5888 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.173 + 17.174-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index add14244ad..606ffdf72c 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.173 + 17.174-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index f0239b7a04..9a7ff9a8b0 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.173 + 17.174-SNAPSHOT diff --git a/pom.xml b/pom.xml index 88b9fdd6f1..b8bd4bf8e1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 17.173 + 17.174-SNAPSHOT pom Alfresco Community Repo Parent @@ -149,7 +149,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 17.173 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 7ceafac33d..3799ff2464 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.173 + 17.174-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 47ea5b623a..8487bda287 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.173 + 17.174-SNAPSHOT From 1d9d6ad0bbc2bd3ccfe580beaee5125c77225393 Mon Sep 17 00:00:00 2001 From: MohinishSah <88024811+MohinishSah@users.noreply.github.com> Date: Mon, 17 Oct 2022 23:35:20 +0530 Subject: [PATCH 23/26] updating AOS alpha version A7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8bd4bf8e1..6915fb0573 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ 1.1.4 3.3.0-A1 - 1.5.0-A6 + 1.5.0-A7 7.3.0-A1 2.2.0 From a996cf184202d9c83f11bd56ae065259417ffe27 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 18 Oct 2022 03:51:46 +0000 Subject: [PATCH 24/26] [maven-release-plugin][skip ci] prepare release 17.174 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 29ef8e213c..a56238419b 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 17.174-SNAPSHOT + 17.174 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index ac043d0b69..14f1572558 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.174-SNAPSHOT + 17.174 diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index a068755262..1c8a0e2d23 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 17.174-SNAPSHOT + 17.174 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index bbeb8cf98f..088ed969ea 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.174-SNAPSHOT + 17.174 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 9898ce8fa7..55f805820c 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.174-SNAPSHOT + 17.174 diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 28d9e881a9..56e60bb000 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.174-SNAPSHOT + 17.174 diff --git a/amps/pom.xml b/amps/pom.xml index f4dd892282..60dece8e5e 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.174-SNAPSHOT + 17.174 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 5b3396818e..43c168fb36 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 17.174-SNAPSHOT + 17.174 diff --git a/core/pom.xml b/core/pom.xml index 21d8fb4585..46c40dcfb5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.174-SNAPSHOT + 17.174 diff --git a/data-model/pom.xml b/data-model/pom.xml index f39d80a5c8..2253bc11ef 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.174-SNAPSHOT + 17.174 diff --git a/mmt/pom.xml b/mmt/pom.xml index 5d19bfc6d9..9e9f053d51 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.174-SNAPSHOT + 17.174 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 1572cb9ce7..bd6deeabe8 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 17.174-SNAPSHOT + 17.174 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 4df9aba11b..22830e9fe5 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.174-SNAPSHOT + 17.174 diff --git a/packaging/pom.xml b/packaging/pom.xml index 0e65369451..10b7f193e9 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.174-SNAPSHOT + 17.174 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index c0996df72a..741947e6fc 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 17.174-SNAPSHOT + 17.174 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index d1d4a81b5a..5800d9a6cf 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 17.174-SNAPSHOT + 17.174 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 38e4716887..f7d8366147 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.174-SNAPSHOT + 17.174 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 7474b39787..49b99efe88 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.174-SNAPSHOT + 17.174 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index e40d9f5888..0b43a8b8db 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.174-SNAPSHOT + 17.174 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 606ffdf72c..6d41aeea25 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.174-SNAPSHOT + 17.174 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 9a7ff9a8b0..c31efa02b7 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.174-SNAPSHOT + 17.174 diff --git a/pom.xml b/pom.xml index 6915fb0573..1d06e3099e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 17.174-SNAPSHOT + 17.174 pom Alfresco Community Repo Parent @@ -149,7 +149,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - HEAD + 17.174 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 3799ff2464..e86d72e0d4 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.174-SNAPSHOT + 17.174 diff --git a/repository/pom.xml b/repository/pom.xml index 8487bda287..7ec318d756 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.174-SNAPSHOT + 17.174 From 7a300dc9c9b431a3a940ef8073ba74001952de28 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 18 Oct 2022 03:51:49 +0000 Subject: [PATCH 25/26] [maven-release-plugin][skip ci] prepare for next development iteration --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index a56238419b..6bcd11e242 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 17.174 + 17.175-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 14f1572558..ba7424448d 100644 --- a/amps/ags/rm-automation/pom.xml +++ b/amps/ags/rm-automation/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.174 + 17.175-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 1c8a0e2d23..2786bb29de 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-automation-community-repo - 17.174 + 17.175-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 088ed969ea..d2eb117b7a 100644 --- a/amps/ags/rm-community/pom.xml +++ b/amps/ags/rm-community/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-parent - 17.174 + 17.175-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 55f805820c..ba5a16da98 100644 --- a/amps/ags/rm-community/rm-community-repo/pom.xml +++ b/amps/ags/rm-community/rm-community-repo/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.174 + 17.175-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 56e60bb000..6555f5c234 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community-repo-parent - 17.174 + 17.175-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 60dece8e5e..e1951666b8 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.174 + 17.175-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 43c168fb36..cf6d37d83b 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 17.174 + 17.175-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 46c40dcfb5..a17b9295a7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.174 + 17.175-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 2253bc11ef..66cabf471c 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.174 + 17.175-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 9e9f053d51..611122f622 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.174 + 17.175-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index bd6deeabe8..d0a070d4d5 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 17.174 + 17.175-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 22830e9fe5..cc46259c15 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.174 + 17.175-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 10b7f193e9..fd9652995b 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.174 + 17.175-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 741947e6fc..fc964a36dd 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 17.174 + 17.175-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 5800d9a6cf..41fd608644 100644 --- a/packaging/tests/tas-cmis/pom.xml +++ b/packaging/tests/tas-cmis/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-tests - 17.174 + 17.175-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index f7d8366147..258e58d82a 100644 --- a/packaging/tests/tas-email/pom.xml +++ b/packaging/tests/tas-email/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.174 + 17.175-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 49b99efe88..7dd3c38c47 100644 --- a/packaging/tests/tas-integration/pom.xml +++ b/packaging/tests/tas-integration/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.174 + 17.175-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 0b43a8b8db..95f3ec6a86 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.174 + 17.175-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 6d41aeea25..5713d4187f 100644 --- a/packaging/tests/tas-webdav/pom.xml +++ b/packaging/tests/tas-webdav/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-community-repo-tests - 17.174 + 17.175-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index c31efa02b7..5d267432f1 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 17.174 + 17.175-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1d06e3099e..a6ab21a7be 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 17.174 + 17.175-SNAPSHOT pom Alfresco Community Repo Parent @@ -149,7 +149,7 @@ scm:git:https://github.com/Alfresco/alfresco-community-repo.git scm:git:https://github.com/Alfresco/alfresco-community-repo.git https://github.com/Alfresco/alfresco-community-repo - 17.174 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index e86d72e0d4..b4cf0df5c2 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.174 + 17.175-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 7ec318d756..84066bea21 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 17.174 + 17.175-SNAPSHOT From f65886d44848f00a1f90cee0737312f594f97113 Mon Sep 17 00:00:00 2001 From: mpichura Date: Tue, 18 Oct 2022 13:41:50 +0200 Subject: [PATCH 26/26] ACS-3652: Removing unnecessary code. --- .../validator/actions/ActionParameterDefinitionValidator.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/validator/actions/ActionParameterDefinitionValidator.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/validator/actions/ActionParameterDefinitionValidator.java index 90cca29b46..19f96de839 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/validator/actions/ActionParameterDefinitionValidator.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/validator/actions/ActionParameterDefinitionValidator.java @@ -27,7 +27,6 @@ package org.alfresco.rest.api.impl.validator.actions; import java.io.Serializable; -import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -49,8 +48,6 @@ import org.apache.commons.collections.MapUtils; public class ActionParameterDefinitionValidator implements ActionValidator { private static final boolean IS_ENABLED = true; - private static final String BASE_PACKAGE = "org/alfresco/repo/action/executer"; - private static final String NAME = "NAME"; static final String INVALID_PARAMETER_VALUE = "Action parameter: %s has invalid value (%s). Look up possible values for constraint name %s"; @@ -60,7 +57,6 @@ public class ActionParameterDefinitionValidator implements ActionValidator "Action parameters should not be null or empty for this action. See Action Definition for action of: %s"; static final String INVALID_ACTION_DEFINITION = "Invalid action definition requested %s"; - private final List actionDefinitionIds = new ArrayList<>(); private final Actions actions; public ActionParameterDefinitionValidator(Actions actions)