From 2da46a6659f55bd95cf33fc1c26f70146509c7cd Mon Sep 17 00:00:00 2001 From: rrajoria <88024787+rrajoria@users.noreply.github.com> Date: Thu, 27 Feb 2025 14:50:15 +0530 Subject: [PATCH 01/29] Revert Unlock Document Changes (#3212) --- .../documentlibrary/action/unlock-document.post.json.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js index 314e1e1b29..c5e909d740 100644 --- a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js +++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js @@ -23,10 +23,6 @@ function runAction(p_params) if (p_params.destNode.hasAspect("cm:lockable") && !p_params.destNode.hasAspect("trx:transferred")) { p_params.destNode.unlock(); - if(p_params.destNode.hasAspect("gd2:editingInGoogle")) - { - p_params.destNode.removeAspect("gd2:editingInGoogle"); - } } var resultId = originalDoc.name, From 078195379d6c7d4c2e6957281dfa591ed66ba0f3 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 27 Feb 2025 10:32:13 +0000 Subject: [PATCH 02/29] [maven-release-plugin][skip ci] prepare release 25.1.0.61 --- 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 141fd41d81..90ddf909aa 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 090c1b8bba..2f2e2a2eec 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 - 25.1.0.61-SNAPSHOT + 25.1.0.61 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 691fae9704..77bd7fc42e 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 - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 2a8e19f5fa..a542c15df7 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 - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index e33e379e04..320b2b0217 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 - 25.1.0.61-SNAPSHOT + 25.1.0.61 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 730e9a42e7..638151d198 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 - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/amps/pom.xml b/amps/pom.xml index 8f58fe3618..c51c6d2c2b 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 4c5441cbcb..910eeab507 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/core/pom.xml b/core/pom.xml index 2c6fd6bddb..d03de5e800 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/data-model/pom.xml b/data-model/pom.xml index 2e6970001e..f6ddb01477 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/mmt/pom.xml b/mmt/pom.xml index ccc2e911d4..8b6326b5be 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 86e563d230..b02c498631 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 26fff79e35..5f359fd3b2 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/packaging/pom.xml b/packaging/pom.xml index b010f42adb..110f40ceb1 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index ba59f7322e..d5b7e5ce42 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 20d37ebf7b..7fe22d4bb4 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 - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index ec3f68d2ee..811e743f68 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 - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 015e2149ff..3cd91a3d69 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 - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 73c125f226..843982be12 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index dee3e38e6d..b16179e8af 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 - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 3cea4e4a84..bf1b16dc5f 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/pom.xml b/pom.xml index 4d0c3457b3..1cbe50c270 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.61-SNAPSHOT + 25.1.0.61 pom Alfresco Community Repo Parent @@ -155,7 +155,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 + 25.1.0.61 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 873b1c30e1..688a6c87a5 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.61-SNAPSHOT + 25.1.0.61 diff --git a/repository/pom.xml b/repository/pom.xml index f0b3f3ab08..95b182078d 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.61-SNAPSHOT + 25.1.0.61 From c6f957d0051d5b7c04dcec4beaf3a81fc441eb97 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 27 Feb 2025 10:32:16 +0000 Subject: [PATCH 03/29] [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 90ddf909aa..55680f63c0 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 2f2e2a2eec..622555e52b 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 - 25.1.0.61 + 25.1.0.62-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 77bd7fc42e..47dfd0c46a 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 - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index a542c15df7..ecab4ba58e 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 - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 320b2b0217..aaef1909e4 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 - 25.1.0.61 + 25.1.0.62-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 638151d198..2673aaecb5 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 - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index c51c6d2c2b..f121f7ab3d 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 910eeab507..775ee4ef41 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index d03de5e800..9fecf622da 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index f6ddb01477..8e223373a8 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 8b6326b5be..ff5d756c8d 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index b02c498631..f920392be0 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 5f359fd3b2..26967a639e 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 110f40ceb1..b42f1d8d72 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index d5b7e5ce42..b19fd0463d 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 7fe22d4bb4..e6859158a3 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 - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 811e743f68..a5425cdde7 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 - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 3cd91a3d69..901fbd45f5 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 - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 843982be12..c5d7bec32f 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index b16179e8af..8254c9488b 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 - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index bf1b16dc5f..35f2b764c0 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1cbe50c270..902739bc8a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.61 + 25.1.0.62-SNAPSHOT pom Alfresco Community Repo Parent @@ -155,7 +155,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 - 25.1.0.61 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 688a6c87a5..e797b908a7 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.61 + 25.1.0.62-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 95b182078d..e8edca6e63 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.61 + 25.1.0.62-SNAPSHOT From c00d1a2f38ac23f9ce17b44c31247bae6572c067 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Feb 2025 09:53:03 +0100 Subject: [PATCH 04/29] Bump net.minidev:json-smart from 2.5.1 to 2.5.2 (#3197) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 902739bc8a..aa04db475c 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 2.1.3 1.1.7 2.9.0 - 2.5.1 + 2.5.2 4.1.0 3.2.0 25.1.0-A1 From 102a442c66623aee91717e258d552835bf728205 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 28 Feb 2025 10:02:58 +0000 Subject: [PATCH 05/29] [maven-release-plugin][skip ci] prepare release 25.1.0.62 --- 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 55680f63c0..e50d9eb64c 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 622555e52b..4f4483dede 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 - 25.1.0.62-SNAPSHOT + 25.1.0.62 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 47dfd0c46a..b9ef10568e 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 - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index ecab4ba58e..93eb40a8af 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 - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index aaef1909e4..839405d8b8 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 - 25.1.0.62-SNAPSHOT + 25.1.0.62 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 2673aaecb5..d8bda93c6d 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 - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/amps/pom.xml b/amps/pom.xml index f121f7ab3d..f21ecf30c2 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 775ee4ef41..77ecaba4ae 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/core/pom.xml b/core/pom.xml index 9fecf622da..11a7fba01e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/data-model/pom.xml b/data-model/pom.xml index 8e223373a8..ef1ed0fa3e 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/mmt/pom.xml b/mmt/pom.xml index ff5d756c8d..565cb6c035 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index f920392be0..7e1a81c750 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 26967a639e..6ce62194c6 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/packaging/pom.xml b/packaging/pom.xml index b42f1d8d72..9af77f7b44 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index b19fd0463d..865ec91e45 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index e6859158a3..18e542b74d 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 - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index a5425cdde7..d111c35479 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 - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 901fbd45f5..d18527fb91 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 - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index c5d7bec32f..536aa6550b 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 8254c9488b..d818017765 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 - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 35f2b764c0..095477b3b9 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/pom.xml b/pom.xml index aa04db475c..a5f18c87b7 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.62-SNAPSHOT + 25.1.0.62 pom Alfresco Community Repo Parent @@ -155,7 +155,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 + 25.1.0.62 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index e797b908a7..f9500e561f 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.62-SNAPSHOT + 25.1.0.62 diff --git a/repository/pom.xml b/repository/pom.xml index e8edca6e63..f76b595f5c 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.62-SNAPSHOT + 25.1.0.62 From c44ff3b5cb1e9140920ebe9be4f37c8c231b0b0a Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 28 Feb 2025 10:03:00 +0000 Subject: [PATCH 06/29] [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 e50d9eb64c..a7d46e1fec 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 4f4483dede..e6217596f3 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 - 25.1.0.62 + 25.1.0.63-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 b9ef10568e..f38c3a492d 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 - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 93eb40a8af..ae97da1fcc 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 - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 839405d8b8..3215bfc90c 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 - 25.1.0.62 + 25.1.0.63-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 d8bda93c6d..585b19ceb4 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 - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index f21ecf30c2..9c40532e65 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 77ecaba4ae..c0a5bb760a 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 11a7fba01e..e4b0e69c26 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index ef1ed0fa3e..950816fbfe 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 565cb6c035..b2e3500b86 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 7e1a81c750..e010f0d396 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 6ce62194c6..c518cbfd9e 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 9af77f7b44..eaf2b9e66e 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 865ec91e45..6acf15c64e 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 18e542b74d..8aaee91ee4 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 - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index d111c35479..7fc33e8d25 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 - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index d18527fb91..3fa843f1af 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 - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 536aa6550b..2642dbb5b3 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index d818017765..781781fc67 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 - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 095477b3b9..4a60c31778 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/pom.xml b/pom.xml index a5f18c87b7..6cba43d3a3 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.62 + 25.1.0.63-SNAPSHOT pom Alfresco Community Repo Parent @@ -155,7 +155,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 - 25.1.0.62 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index f9500e561f..c71a7d5d68 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.62 + 25.1.0.63-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index f76b595f5c..afd196d84f 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.62 + 25.1.0.63-SNAPSHOT From ca0c0b54b584d07bb4de1bf4f4a2207cbb6bbe1e Mon Sep 17 00:00:00 2001 From: Alfresco CI User Date: Sun, 2 Mar 2025 00:04:43 +0000 Subject: [PATCH 07/29] [force] Force release for 2025-03-02. From 8260867f496bec58f3a1ca10b7bb08d3a817e09b Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 2 Mar 2025 00:07:49 +0000 Subject: [PATCH 08/29] [maven-release-plugin][skip ci] prepare release 25.1.0.63 --- 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 a7d46e1fec..f2d171e75f 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index e6217596f3..6d9b2b5f3a 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 - 25.1.0.63-SNAPSHOT + 25.1.0.63 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 f38c3a492d..d5b519bc98 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 - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index ae97da1fcc..c67f92625d 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 - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 3215bfc90c..59a6fff225 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 - 25.1.0.63-SNAPSHOT + 25.1.0.63 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 585b19ceb4..6e77d96240 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 - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/amps/pom.xml b/amps/pom.xml index 9c40532e65..034d2c74bc 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index c0a5bb760a..dd2c70b755 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/core/pom.xml b/core/pom.xml index e4b0e69c26..f54b7e8cc2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/data-model/pom.xml b/data-model/pom.xml index 950816fbfe..9731a274d1 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/mmt/pom.xml b/mmt/pom.xml index b2e3500b86..8643284177 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index e010f0d396..43a160d1eb 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index c518cbfd9e..8bdd3a0a7c 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/packaging/pom.xml b/packaging/pom.xml index eaf2b9e66e..79a92dbd69 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 6acf15c64e..b43694f306 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 8aaee91ee4..9a731cd99a 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 - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 7fc33e8d25..9eda3fccee 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 - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 3fa843f1af..7e51f9cc79 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 - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 2642dbb5b3..963fc84bbb 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 781781fc67..93fa214c2e 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 - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 4a60c31778..93c4d91e8a 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/pom.xml b/pom.xml index 6cba43d3a3..1214a5577f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.63-SNAPSHOT + 25.1.0.63 pom Alfresco Community Repo Parent @@ -155,7 +155,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 + 25.1.0.63 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index c71a7d5d68..d49a632e0a 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.63-SNAPSHOT + 25.1.0.63 diff --git a/repository/pom.xml b/repository/pom.xml index afd196d84f..19efd227b4 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.63-SNAPSHOT + 25.1.0.63 From b618aaf874a36c688a7ce8146a663965ac10236c Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 2 Mar 2025 00:07:51 +0000 Subject: [PATCH 09/29] [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 f2d171e75f..654cc5e0e3 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 6d9b2b5f3a..76a0c96bf3 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 - 25.1.0.63 + 25.1.0.64-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 d5b519bc98..1de93481b7 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 - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index c67f92625d..d2b1c71534 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 - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 59a6fff225..0f61dc35e9 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 - 25.1.0.63 + 25.1.0.64-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 6e77d96240..257489bac4 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 - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 034d2c74bc..823fc2fc4a 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index dd2c70b755..e3f1c8aefe 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index f54b7e8cc2..70d403b0f3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 9731a274d1..83f34633a5 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 8643284177..dc5ac7f266 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 43a160d1eb..fe4fe1a452 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 8bdd3a0a7c..0e405ce068 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 79a92dbd69..8e4e4fce96 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index b43694f306..e7a43ac6a0 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 9a731cd99a..516d223aba 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 - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 9eda3fccee..2df25414d6 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 - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 7e51f9cc79..8d361ee6b1 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 - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 963fc84bbb..35765150c2 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 93fa214c2e..5b0c26a7eb 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 - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 93c4d91e8a..0b8104e9a0 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1214a5577f..a4acc500a0 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.63 + 25.1.0.64-SNAPSHOT pom Alfresco Community Repo Parent @@ -155,7 +155,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 - 25.1.0.63 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index d49a632e0a..bb18b53698 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.63 + 25.1.0.64-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 19efd227b4..2f2de09196 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.63 + 25.1.0.64-SNAPSHOT From e5559d544fb250dd7ca6d315ffde1c22d828324f Mon Sep 17 00:00:00 2001 From: Kacper Magdziarz <95610011+kmagdziarz@users.noreply.github.com> Date: Mon, 3 Mar 2025 09:12:10 +0100 Subject: [PATCH 10/29] [ACS-9356] Bump Solr to 2.0.15-A.1 (#3233) --- amps/ags/rm-community/rm-community-repo/.env | 2 +- packaging/tests/environment/.env | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/amps/ags/rm-community/rm-community-repo/.env b/amps/ags/rm-community/rm-community-repo/.env index 358fd679fc..5f29532305 100644 --- a/amps/ags/rm-community/rm-community-repo/.env +++ b/amps/ags/rm-community/rm-community-repo/.env @@ -1,3 +1,3 @@ -SOLR6_TAG=2.0.14 +SOLR6_TAG=2.0.15-A.1 POSTGRES_TAG=16.6 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8 diff --git a/packaging/tests/environment/.env b/packaging/tests/environment/.env index 358fd679fc..5f29532305 100644 --- a/packaging/tests/environment/.env +++ b/packaging/tests/environment/.env @@ -1,3 +1,3 @@ -SOLR6_TAG=2.0.14 +SOLR6_TAG=2.0.15-A.1 POSTGRES_TAG=16.6 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8 From 68ff2e8b4303a031faf806d6a50f6be717e20092 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 3 Mar 2025 08:58:20 +0000 Subject: [PATCH 11/29] [maven-release-plugin][skip ci] prepare release 25.1.0.64 --- 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 654cc5e0e3..1fec4fed5d 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 76a0c96bf3..c80b86101e 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 - 25.1.0.64-SNAPSHOT + 25.1.0.64 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 1de93481b7..11a4024f0e 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 - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index d2b1c71534..84a951ce6c 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 - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 0f61dc35e9..37b399b44a 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 - 25.1.0.64-SNAPSHOT + 25.1.0.64 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 257489bac4..7e6a7bcfc4 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 - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/amps/pom.xml b/amps/pom.xml index 823fc2fc4a..a7f918ca33 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index e3f1c8aefe..4def465e76 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/core/pom.xml b/core/pom.xml index 70d403b0f3..6de748cc34 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/data-model/pom.xml b/data-model/pom.xml index 83f34633a5..32f2b956de 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/mmt/pom.xml b/mmt/pom.xml index dc5ac7f266..0a9d0a1f5e 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index fe4fe1a452..3ca3117e05 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 0e405ce068..1cb5d0d149 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/packaging/pom.xml b/packaging/pom.xml index 8e4e4fce96..a25765ec82 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index e7a43ac6a0..d2fb51e8c0 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 516d223aba..017813c72a 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 - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 2df25414d6..68980e1142 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 - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 8d361ee6b1..cc5e0c0e78 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 - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 35765150c2..8b1a2a1efb 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 5b0c26a7eb..d90d358ff9 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 - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 0b8104e9a0..6bf60c9be0 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/pom.xml b/pom.xml index a4acc500a0..df9de10278 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.64-SNAPSHOT + 25.1.0.64 pom Alfresco Community Repo Parent @@ -155,7 +155,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 + 25.1.0.64 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index bb18b53698..b545f7b92f 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.64-SNAPSHOT + 25.1.0.64 diff --git a/repository/pom.xml b/repository/pom.xml index 2f2de09196..9fe459d7e0 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.64-SNAPSHOT + 25.1.0.64 From b1f689ed42d6886e11e6a6fe799a766a8c782b7b Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 3 Mar 2025 08:58:23 +0000 Subject: [PATCH 12/29] [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 1fec4fed5d..ff396d1e40 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index c80b86101e..1efab11e30 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 - 25.1.0.64 + 25.1.0.65-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 11a4024f0e..17d118da7d 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 - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 84a951ce6c..b947fb59f2 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 - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 37b399b44a..b150556fcd 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 - 25.1.0.64 + 25.1.0.65-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 7e6a7bcfc4..c208e6a3e4 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 - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index a7f918ca33..70e38c12fd 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 4def465e76..2135b3dd73 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 6de748cc34..308e5c138c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 32f2b956de..0a1824fefc 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 0a9d0a1f5e..c593616628 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 3ca3117e05..c427acc378 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 1cb5d0d149..30701d67ad 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index a25765ec82..a109809a0a 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index d2fb51e8c0..9551f39f8f 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 017813c72a..311eb3364a 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 - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 68980e1142..1716e21f3c 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 - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index cc5e0c0e78..152d5f83c4 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 - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 8b1a2a1efb..a4081551ff 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index d90d358ff9..e901554287 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 - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 6bf60c9be0..e935edc81f 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/pom.xml b/pom.xml index df9de10278..eec507e81c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.64 + 25.1.0.65-SNAPSHOT pom Alfresco Community Repo Parent @@ -155,7 +155,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 - 25.1.0.64 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index b545f7b92f..22f6bf0d45 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.64 + 25.1.0.65-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 9fe459d7e0..0e37039b73 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.64 + 25.1.0.65-SNAPSHOT From 58902c77f13e8c0e264a44993733fca9acaa4558 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Mar 2025 10:39:37 +0100 Subject: [PATCH 13/29] Bump org.alfresco:alfresco-transform-model from 5.1.7-A.3 to 5.1.7-A.4 (#3242) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eec507e81c..2e6cef817e 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ 7.0.1 5.23.0 5.23.0 - 5.1.7-A.3 + 5.1.7-A.4 4.1.7-A.1 7.1 1.0.2 From 1cec73b176634f0818c739534d251ca9aab048fd Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 6 Mar 2025 10:25:55 +0000 Subject: [PATCH 14/29] [maven-release-plugin][skip ci] prepare release 25.1.0.65 --- 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 ff396d1e40..62593d8e1f 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 1efab11e30..e4106e4c53 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 - 25.1.0.65-SNAPSHOT + 25.1.0.65 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 17d118da7d..3957511723 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 - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index b947fb59f2..9c348f27db 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 - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index b150556fcd..d569228839 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 - 25.1.0.65-SNAPSHOT + 25.1.0.65 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 c208e6a3e4..916c78da0b 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 - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/amps/pom.xml b/amps/pom.xml index 70e38c12fd..39b97186e2 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 2135b3dd73..fb96d5cc4b 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/core/pom.xml b/core/pom.xml index 308e5c138c..6a99f75e3c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/data-model/pom.xml b/data-model/pom.xml index 0a1824fefc..cad2178215 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/mmt/pom.xml b/mmt/pom.xml index c593616628..6741739f2e 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index c427acc378..e2755bfa5e 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 30701d67ad..05067a4860 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/packaging/pom.xml b/packaging/pom.xml index a109809a0a..5ab1865efb 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 9551f39f8f..4d399a7ca6 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 311eb3364a..ef9c6545e8 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 - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 1716e21f3c..2e54161dbd 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 - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 152d5f83c4..059fe51c93 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 - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index a4081551ff..8e1adca9a1 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index e901554287..e84452b09c 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 - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index e935edc81f..2edfdb094e 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/pom.xml b/pom.xml index 2e6cef817e..107f7373f7 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.65-SNAPSHOT + 25.1.0.65 pom Alfresco Community Repo Parent @@ -155,7 +155,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 + 25.1.0.65 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 22f6bf0d45..ae398a80cc 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.65-SNAPSHOT + 25.1.0.65 diff --git a/repository/pom.xml b/repository/pom.xml index 0e37039b73..e2d2de9cb4 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.65-SNAPSHOT + 25.1.0.65 From 7749f7b80d1615efc8a6f8a446be0d601ffe5c33 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 6 Mar 2025 10:25:57 +0000 Subject: [PATCH 15/29] [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 62593d8e1f..dee364bf9d 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index e4106e4c53..3f1f5e6a91 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 - 25.1.0.65 + 25.1.0.66-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 3957511723..1b381c07c6 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 - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 9c348f27db..18674bb704 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 - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index d569228839..294440587b 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 - 25.1.0.65 + 25.1.0.66-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 916c78da0b..6a54d2e329 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 - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 39b97186e2..7ad6267180 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index fb96d5cc4b..7ac9154979 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 6a99f75e3c..f910eba349 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index cad2178215..88331ba772 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 6741739f2e..e361d74865 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index e2755bfa5e..690793fd70 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 05067a4860..2b5f150e8b 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 5ab1865efb..e55c1bbe83 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 4d399a7ca6..bc2c92c094 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index ef9c6545e8..432201e975 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 - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 2e54161dbd..1f0cea3a0b 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 - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 059fe51c93..3ac13bac5a 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 - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 8e1adca9a1..769893cd03 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index e84452b09c..164330eeac 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 - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 2edfdb094e..60fb24987e 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/pom.xml b/pom.xml index 107f7373f7..840f89be56 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.65 + 25.1.0.66-SNAPSHOT pom Alfresco Community Repo Parent @@ -155,7 +155,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 - 25.1.0.65 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index ae398a80cc..6cdd750fa7 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.65 + 25.1.0.66-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index e2d2de9cb4..5d7258d9d0 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.65 + 25.1.0.66-SNAPSHOT From ec78a1486c99f1482b13d5c745cf129ab63a3dae Mon Sep 17 00:00:00 2001 From: Tiago Salvado <9038083+tiagosalvado10@users.noreply.github.com> Date: Thu, 6 Mar 2025 12:35:03 +0000 Subject: [PATCH 16/29] [MNT-24913] Added fallback method to obtain deployment category in order to check if workflow is secure (#3236) --- .../activiti/script/ActivitiScriptBase.java | 174 ++++++++++++++---- 1 file changed, 137 insertions(+), 37 deletions(-) diff --git a/repository/src/main/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java b/repository/src/main/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java index 1dfee2d75f..1123ca1542 100644 --- a/repository/src/main/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java +++ b/repository/src/main/java/org/alfresco/repo/workflow/activiti/script/ActivitiScriptBase.java @@ -28,11 +28,17 @@ package org.alfresco.repo.workflow.activiti.script; import java.util.Map; +import org.activiti.engine.RepositoryService; import org.activiti.engine.delegate.VariableScope; import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl; import org.activiti.engine.impl.context.Context; import org.activiti.engine.impl.el.Expression; import org.activiti.engine.impl.persistence.entity.DeploymentEntity; +import org.activiti.engine.impl.persistence.entity.ExecutionEntity; +import org.activiti.engine.repository.ProcessDefinition; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; import org.alfresco.repo.workflow.WorkflowDeployer; @@ -45,13 +51,12 @@ import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.workflow.WorkflowException; /** - * Base class for execution scripts, using {@link ScriptService} as part of - * activiti workflow. + * Base class for execution scripts, using {@link ScriptService} as part of activiti workflow. * * @author Frederik Heremans * @since 3.4.e */ -public class ActivitiScriptBase +public class ActivitiScriptBase { protected static final String PERSON_BINDING_NAME = "person"; protected static final String USERHOME_BINDING_NAME = "userhome"; @@ -61,17 +66,19 @@ public class ActivitiScriptBase protected Expression runAs; protected Expression scriptProcessor; + private static final Logger LOGGER = LoggerFactory.getLogger(ActivitiScriptBase.class); + protected Object executeScript(String theScript, Map model, String scriptProcessorName, String runAsUser) { String user = AuthenticationUtil.getFullyAuthenticatedUser(); - + Object scriptResult = null; if (runAsUser == null && user != null) { // Just execute the script using the current user scriptResult = executeScript(theScript, model, scriptProcessorName); } - else + else { if (runAsUser != null) { @@ -87,26 +94,25 @@ public class ActivitiScriptBase } return scriptResult; } - + protected Object executeScriptAsUser(final String theScript, final Map model, final String scriptProcessorName, final String runAsUser) { // execute as specified runAsUser - return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork() - { + return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<>() { public Object doWork() throws Exception { return executeScript(theScript, model, scriptProcessorName); } }, runAsUser); } - + protected Object executeScript(String theScript, Map model, String scriptProcessorName) { // Execute the script using the appropriate processor Object scriptResult = null; // Checks if current workflow is secure - boolean secure = isSecure(); + boolean secure = isSecure(model); if (scriptProcessorName != null) { @@ -117,11 +123,11 @@ public class ActivitiScriptBase // Use default script-processor scriptResult = getServiceRegistry().getScriptService().executeScriptString(theScript, model, secure); } - + return scriptResult; } - - protected String getStringValue(Expression expression, VariableScope scope) + + protected String getStringValue(Expression expression, VariableScope scope) { if (expression != null) { @@ -133,15 +139,15 @@ public class ActivitiScriptBase protected ServiceRegistry getServiceRegistry() { ProcessEngineConfigurationImpl config = Context.getProcessEngineConfiguration(); - if (config != null) + if (config != null) { // Fetch the registry that is injected in the activiti spring-configuration ServiceRegistry registry = (ServiceRegistry) config.getBeans().get(ActivitiConstants.SERVICE_REGISTRY_BEAN_KEY); if (registry == null) { throw new RuntimeException( - "Service-registry not present in ProcessEngineConfiguration beans, expected ServiceRegistry with key" + - ActivitiConstants.SERVICE_REGISTRY_BEAN_KEY); + "Service-registry not present in ProcessEngineConfiguration beans, expected ServiceRegistry with key" + + ActivitiConstants.SERVICE_REGISTRY_BEAN_KEY); } return registry; } @@ -149,42 +155,136 @@ public class ActivitiScriptBase } /** - * Checks whether the workflow must be considered secure or not - based on {@link DeploymentEntity} category. - * If it is not considered secure, the workflow will be executed in sandbox context with more restrictions + * Checks whether the workflow must be considered secure or not - based on {@link DeploymentEntity} category. If it is not considered secure, the workflow will be executed in sandbox context with more restrictions * * @return true if workflow is considered secure, false otherwise */ - private boolean isSecure() + private boolean isSecure(Map model) + { + String category = getDeploymentCategory(model); + + // iF The deployment category matches the condition (either internal or full access) the workflow is considered secure + return category != null && (WorkflowDeployer.CATEGORY_ALFRESCO_INTERNAL.equals(category) || WorkflowDeployer.CATEGORY_FULL_ACCESS.equals(category)); + } + + /** + * Gets the deployment category from the execution context. If no execution context is available, a query to obtain the deployment is performed so the category can be returned. + * + * @param model + * a map with workflow model + * @return the deployment category + */ + private String getDeploymentCategory(Map model) + { + String category = getDeploymentCategoryFromContext(); + + if (category == null) + { + String deploymentId = null; + String processDefinitionId = null; + + if (model != null && model.containsKey(EXECUTION_BINDING_NAME) && model.get(EXECUTION_BINDING_NAME) instanceof ExecutionEntity) + { + ExecutionEntity executionEntity = (ExecutionEntity) model.get(EXECUTION_BINDING_NAME); + deploymentId = executionEntity.getDeploymentId(); + processDefinitionId = executionEntity.getProcessDefinitionId(); + } + + category = getDeploymentCategoryFromQuery(deploymentId, processDefinitionId); + } + + return category; + } + + /** + * Obtains the deployment category from current execution context + * + * @return the category for current execution deployment, otherwise null + */ + private String getDeploymentCategoryFromContext() { String category = null; - try { if (Context.isExecutionContextActive()) { category = Context.getExecutionContext().getDeployment().getCategory(); } + else + { + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug("No execution context available"); + } + } } catch (Exception e) { - // No action required + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug("Could not obtain deployment category from execution context: {}", e.getMessage()); + } } - // If the workflow is considered secure, the deployment entity category matches the condition (either internal or full access) - return category != null && (WorkflowDeployer.CATEGORY_ALFRESCO_INTERNAL.equals(category) || WorkflowDeployer.CATEGORY_FULL_ACCESS.equals(category)); + return category; } /** - * Checks that the specified 'runAs' field - * specifies a valid username. + * Obtains the deployment category through a query + * + * @param deploymentId + * the deployment id to obtain the category from + * @param processDefinitionId + * if no deployment id is provided, the process definition id can be used to obtain the deployment + * @return the category for the obtained deployment, otherwise null */ - private void validateRunAsUser(final String runAsUser) + private String getDeploymentCategoryFromQuery(String deploymentId, String processDefinitionId) { - Boolean runAsExists = AuthenticationUtil.runAs(new RunAsWork() + String category = null; + + try { + RepositoryService repositoryService = Context.getProcessEngineConfiguration().getRepositoryService(); + + if (deploymentId == null && processDefinitionId != null) + { + ProcessDefinition processDefnition = repositoryService.getProcessDefinition(processDefinitionId); + if (processDefnition != null) + { + deploymentId = processDefnition.getDeploymentId(); + } + } + + if (deploymentId != null) + { + DeploymentEntity deployment = (DeploymentEntity) repositoryService.createDeploymentQuery().deploymentId(deploymentId).singleResult(); + if (deployment != null) + { + category = deployment.getCategory(); + } + } + } + catch (Exception e) + { + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug("Could not obtain deployment category through a query: {}", e.getMessage()); + } + } + + return category; + } + + /** + * Checks that the specified 'runAs' field specifies a valid username. + */ + private void validateRunAsUser(final String runAsUser) + { + Boolean runAsExists = AuthenticationUtil.runAs(new RunAsWork<>() { // Validate using System user to ensure sufficient permissions available to access person node. - public Boolean doWork() throws Exception + @Override + public Boolean doWork() throws Exception { return getServiceRegistry().getPersonService().personExists(runAsUser); } @@ -195,21 +295,21 @@ public class ActivitiScriptBase throw new WorkflowException("runas user '" + runAsUser + "' does not exist."); } } - + protected ActivitiScriptNode getPersonNode(String runAsUser) { String userName = null; - if (runAsUser != null) + if (runAsUser != null) { userName = runAsUser; } - else + else { userName = AuthenticationUtil.getFullyAuthenticatedUser(); } - + // The "System" user is a special case, which has no person object associated with it. - if(userName != null && !AuthenticationUtil.SYSTEM_USER_NAME.equals(userName)) + if (userName != null && !AuthenticationUtil.SYSTEM_USER_NAME.equals(userName)) { ServiceRegistry services = getServiceRegistry(); PersonService personService = services.getPersonService(); @@ -221,18 +321,18 @@ public class ActivitiScriptBase } return null; } - - public void setScript(Expression script) + + public void setScript(Expression script) { this.script = script; } - public void setRunAs(Expression runAs) + public void setRunAs(Expression runAs) { this.runAs = runAs; } - public void setScriptProcessor(Expression scriptProcessor) + public void setScriptProcessor(Expression scriptProcessor) { this.scriptProcessor = scriptProcessor; } From 41db40b6a2e225b26f26f313e3805871f7f07d38 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 6 Mar 2025 13:28:59 +0000 Subject: [PATCH 17/29] [maven-release-plugin][skip ci] prepare release 25.1.0.66 --- 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 dee364bf9d..4d9fd8ef3d 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 3f1f5e6a91..3019f663c3 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 - 25.1.0.66-SNAPSHOT + 25.1.0.66 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 1b381c07c6..2aefc00d61 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 - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 18674bb704..11cd2d007a 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 - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 294440587b..405badb290 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 - 25.1.0.66-SNAPSHOT + 25.1.0.66 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 6a54d2e329..51705f6d8b 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 - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/amps/pom.xml b/amps/pom.xml index 7ad6267180..8e5fc55018 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 7ac9154979..9350a8836e 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/core/pom.xml b/core/pom.xml index f910eba349..282a78c95a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/data-model/pom.xml b/data-model/pom.xml index 88331ba772..84846192d0 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/mmt/pom.xml b/mmt/pom.xml index e361d74865..33a2f7ab50 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 690793fd70..7ab94ab85f 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 2b5f150e8b..c22e5cd7c3 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/packaging/pom.xml b/packaging/pom.xml index e55c1bbe83..553af45e88 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index bc2c92c094..02e780156f 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 432201e975..4fce30d4a9 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 - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 1f0cea3a0b..8e40e0049a 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 - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 3ac13bac5a..bb30a28291 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 - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 769893cd03..cb94d76bcb 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 164330eeac..60aeae4052 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 - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 60fb24987e..7d903e65f2 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/pom.xml b/pom.xml index 840f89be56..044db2a9be 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.66-SNAPSHOT + 25.1.0.66 pom Alfresco Community Repo Parent @@ -155,7 +155,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 + 25.1.0.66 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 6cdd750fa7..04cbc8374c 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.66-SNAPSHOT + 25.1.0.66 diff --git a/repository/pom.xml b/repository/pom.xml index 5d7258d9d0..618d95f6f8 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.66-SNAPSHOT + 25.1.0.66 From 0c0a95d095d20c74ee3d4d22b7613c9bd931c9c9 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 6 Mar 2025 13:29:01 +0000 Subject: [PATCH 18/29] [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 4d9fd8ef3d..4b5e3d03c5 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 3019f663c3..0a725c3e90 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 - 25.1.0.66 + 25.1.0.67-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 2aefc00d61..2668b95b1e 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 - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 11cd2d007a..40ca404935 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 - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 405badb290..f4a73907f8 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 - 25.1.0.66 + 25.1.0.67-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 51705f6d8b..dfbb1fd172 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 - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 8e5fc55018..ceb814f76b 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 9350a8836e..78d81c3b1a 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 282a78c95a..4aca63493f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 84846192d0..13a154f9d6 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 33a2f7ab50..635df13dff 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 7ab94ab85f..799249d5d8 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index c22e5cd7c3..685e54a785 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 553af45e88..9b7215742c 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 02e780156f..170f6b9959 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 4fce30d4a9..bf3535a115 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 - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 8e40e0049a..d9fb036592 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 - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index bb30a28291..acb503a438 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 - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index cb94d76bcb..7246e5cc30 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 60aeae4052..2e3ac4ae7e 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 - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 7d903e65f2..0df92f0874 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/pom.xml b/pom.xml index 044db2a9be..273893e106 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.66 + 25.1.0.67-SNAPSHOT pom Alfresco Community Repo Parent @@ -155,7 +155,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 - 25.1.0.66 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 04cbc8374c..7d2dcbc0be 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.66 + 25.1.0.67-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 618d95f6f8..847e20c61b 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.66 + 25.1.0.67-SNAPSHOT From 28307d7c91c7ee489effd5f368a2fd4501a2096c Mon Sep 17 00:00:00 2001 From: Alfresco CI User Date: Sun, 9 Mar 2025 00:03:54 +0000 Subject: [PATCH 19/29] [force] Force release for 2025-03-09. From 1ef208546f49fcfdb982c4cf52cf94889511ffd0 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 9 Mar 2025 00:07:00 +0000 Subject: [PATCH 20/29] [maven-release-plugin][skip ci] prepare release 25.1.0.67 --- 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 4b5e3d03c5..7579d4062b 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 0a725c3e90..a5ddafe54e 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 - 25.1.0.67-SNAPSHOT + 25.1.0.67 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 2668b95b1e..353517568e 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 - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 40ca404935..e6489aefa3 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 - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index f4a73907f8..1c1d7a123e 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 - 25.1.0.67-SNAPSHOT + 25.1.0.67 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 dfbb1fd172..bceec7f04e 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 - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/amps/pom.xml b/amps/pom.xml index ceb814f76b..5016ea76f5 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 78d81c3b1a..82e3ade4b7 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/core/pom.xml b/core/pom.xml index 4aca63493f..6b587e5729 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/data-model/pom.xml b/data-model/pom.xml index 13a154f9d6..4d87de1c41 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/mmt/pom.xml b/mmt/pom.xml index 635df13dff..a981f3fe65 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 799249d5d8..cf29ce10a1 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 685e54a785..6f4c8a659d 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/packaging/pom.xml b/packaging/pom.xml index 9b7215742c..bf16da0e30 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 170f6b9959..656952bfa9 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index bf3535a115..ebfa959373 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 - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index d9fb036592..411bef62a6 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 - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index acb503a438..861557704a 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 - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 7246e5cc30..c94da53078 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 2e3ac4ae7e..34df15a430 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 - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 0df92f0874..660605749c 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/pom.xml b/pom.xml index 273893e106..35e27cbb9d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.67-SNAPSHOT + 25.1.0.67 pom Alfresco Community Repo Parent @@ -155,7 +155,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 + 25.1.0.67 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 7d2dcbc0be..9eaccfb681 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.67-SNAPSHOT + 25.1.0.67 diff --git a/repository/pom.xml b/repository/pom.xml index 847e20c61b..c4d41fef2c 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.67-SNAPSHOT + 25.1.0.67 From e58df0ab6fbe03be5beef2af4c9e36f81ee9bc91 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 9 Mar 2025 00:07:02 +0000 Subject: [PATCH 21/29] [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 7579d4062b..cb51dc3ff0 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index a5ddafe54e..efeb76f7d7 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 - 25.1.0.67 + 25.1.0.68-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 353517568e..374e98f23d 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 - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index e6489aefa3..e5abb5fbe2 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 - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 1c1d7a123e..d83b7ff8c5 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 - 25.1.0.67 + 25.1.0.68-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 bceec7f04e..fb8a867cb3 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 - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 5016ea76f5..1f3f6e7203 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 82e3ade4b7..74dddaf0b2 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 6b587e5729..a087947f51 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 4d87de1c41..897b9ed34b 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index a981f3fe65..7d8c589f38 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index cf29ce10a1..03ba359010 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 6f4c8a659d..9ca659727e 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index bf16da0e30..7c6531393e 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 656952bfa9..032d9145fb 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index ebfa959373..acbeca3244 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 - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 411bef62a6..3617ee08ac 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 - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 861557704a..81311f5bbf 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 - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index c94da53078..e6f4f491bd 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 34df15a430..58866f92b3 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 - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 660605749c..6179190ae5 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/pom.xml b/pom.xml index 35e27cbb9d..72e5a77927 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.67 + 25.1.0.68-SNAPSHOT pom Alfresco Community Repo Parent @@ -155,7 +155,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 - 25.1.0.67 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 9eaccfb681..1ea9bff2d4 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.67 + 25.1.0.68-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index c4d41fef2c..1682293264 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.67 + 25.1.0.68-SNAPSHOT From f9da66c6e4ed406c2b2a00247ebadc9811c1c1e4 Mon Sep 17 00:00:00 2001 From: Damian Ujma <92095156+damianujma@users.noreply.github.com> Date: Mon, 10 Mar 2025 14:32:09 +0100 Subject: [PATCH 22/29] ACS-9357 Bump IE/SS to 2.0.15 (#3251) --- amps/ags/rm-community/rm-community-repo/.env | 2 +- packaging/tests/environment/.env | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/amps/ags/rm-community/rm-community-repo/.env b/amps/ags/rm-community/rm-community-repo/.env index 5f29532305..fb842fec56 100644 --- a/amps/ags/rm-community/rm-community-repo/.env +++ b/amps/ags/rm-community/rm-community-repo/.env @@ -1,3 +1,3 @@ -SOLR6_TAG=2.0.15-A.1 +SOLR6_TAG=2.0.15 POSTGRES_TAG=16.6 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8 diff --git a/packaging/tests/environment/.env b/packaging/tests/environment/.env index 5f29532305..fb842fec56 100644 --- a/packaging/tests/environment/.env +++ b/packaging/tests/environment/.env @@ -1,3 +1,3 @@ -SOLR6_TAG=2.0.15-A.1 +SOLR6_TAG=2.0.15 POSTGRES_TAG=16.6 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8 From e3fff187033ed418212aad79dd20cb4bc9e6c854 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 11 Mar 2025 06:55:07 +0000 Subject: [PATCH 23/29] [maven-release-plugin][skip ci] prepare release 25.1.0.68 --- 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 cb51dc3ff0..6ebb6f1656 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index efeb76f7d7..23102c6358 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 - 25.1.0.68-SNAPSHOT + 25.1.0.68 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 374e98f23d..c5b6ea3105 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 - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index e5abb5fbe2..7fde222516 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 - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index d83b7ff8c5..163040fbcf 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 - 25.1.0.68-SNAPSHOT + 25.1.0.68 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 fb8a867cb3..bc3ffed811 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 - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/amps/pom.xml b/amps/pom.xml index 1f3f6e7203..8b4e414eae 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 74dddaf0b2..e262486e82 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/core/pom.xml b/core/pom.xml index a087947f51..3d992bb385 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/data-model/pom.xml b/data-model/pom.xml index 897b9ed34b..83ae9fa972 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/mmt/pom.xml b/mmt/pom.xml index 7d8c589f38..368f7117e9 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 03ba359010..4ae1de6147 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 9ca659727e..88cec07fd0 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/packaging/pom.xml b/packaging/pom.xml index 7c6531393e..bda3303568 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 032d9145fb..ed6e22b5ec 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index acbeca3244..7092bc07b1 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 - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 3617ee08ac..582781cccd 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 - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 81311f5bbf..7b0ce752b9 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 - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index e6f4f491bd..65996056e4 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 58866f92b3..c0b8d2b3ee 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 - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 6179190ae5..c5c4deba24 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/pom.xml b/pom.xml index 72e5a77927..9913ad9dc1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.68-SNAPSHOT + 25.1.0.68 pom Alfresco Community Repo Parent @@ -155,7 +155,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 + 25.1.0.68 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 1ea9bff2d4..a41ccc6c9c 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.68-SNAPSHOT + 25.1.0.68 diff --git a/repository/pom.xml b/repository/pom.xml index 1682293264..dfb643e1bb 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.68-SNAPSHOT + 25.1.0.68 From 200a8a2d4cf5c9596481dc864d41bd452521940b Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 11 Mar 2025 06:55:11 +0000 Subject: [PATCH 24/29] [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 6ebb6f1656..4edb1ee9cf 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 23102c6358..c88070fbcf 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 - 25.1.0.68 + 25.1.0.69-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 c5b6ea3105..a97b994b65 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 - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 7fde222516..ed4d35d129 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 - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 163040fbcf..5cf2bd856b 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 - 25.1.0.68 + 25.1.0.69-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 bc3ffed811..7829a601d5 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 - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 8b4e414eae..1711acc730 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index e262486e82..0b1abdebf4 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 3d992bb385..2473f5b4f8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 83ae9fa972..444d1c480d 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 368f7117e9..6c75f9e8cd 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 4ae1de6147..8774a9b4f0 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 88cec07fd0..8275c8cc1c 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index bda3303568..3fc3f53adc 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index ed6e22b5ec..afa8d9ad73 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 7092bc07b1..587fede3e5 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 - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 582781cccd..352ebf93e7 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 - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 7b0ce752b9..996f20c3df 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 - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 65996056e4..62a2a48c2a 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index c0b8d2b3ee..1a0b5b808f 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 - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index c5c4deba24..7ad6d14d29 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/pom.xml b/pom.xml index 9913ad9dc1..39875a9046 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.68 + 25.1.0.69-SNAPSHOT pom Alfresco Community Repo Parent @@ -155,7 +155,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 - 25.1.0.68 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index a41ccc6c9c..72920e5fab 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.68 + 25.1.0.69-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index dfb643e1bb..38a5051adf 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.68 + 25.1.0.69-SNAPSHOT From fc3eb2e55f0767f3027c8c84045755eca27d5657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Tue, 11 Mar 2025 08:50:13 +0100 Subject: [PATCH 25/29] ACS-9330 Bump REST API Explorer --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 39875a9046..c15d599951 100644 --- a/pom.xml +++ b/pom.xml @@ -115,7 +115,7 @@ 2.5.2 4.1.0 3.2.0 - 25.1.0-A1 + 25.1.0 2.2.0 2.4.0 From 9d25c6dcd55f1facae3fa243f4256f7a262e31e4 Mon Sep 17 00:00:00 2001 From: Kacper Magdziarz <95610011+kmagdziarz@users.noreply.github.com> Date: Tue, 11 Mar 2025 11:00:45 +0100 Subject: [PATCH 26/29] [ACS-9353] Bump ATS to 4.1.7 (#3254) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c15d599951..8f169cb17c 100644 --- a/pom.xml +++ b/pom.xml @@ -51,8 +51,8 @@ 7.0.1 5.23.0 5.23.0 - 5.1.7-A.4 - 4.1.7-A.1 + 5.1.7 + 4.1.7 7.1 1.0.2 From 51395de70724cf7dc4b937625e0ec98a7326313d Mon Sep 17 00:00:00 2001 From: Gerard Olenski <31597546+gerardolenski@users.noreply.github.com> Date: Tue, 11 Mar 2025 11:13:57 +0100 Subject: [PATCH 27/29] ACS-9259 Improve stability of HazelcastLockStoreTxTest test (#3248) --- .../lock/mem/AbstractLockStoreTxTest.java | 983 +++++++++--------- 1 file changed, 489 insertions(+), 494 deletions(-) diff --git a/repository/src/test/java/org/alfresco/repo/lock/mem/AbstractLockStoreTxTest.java b/repository/src/test/java/org/alfresco/repo/lock/mem/AbstractLockStoreTxTest.java index 484b2d50e4..8e386388c5 100644 --- a/repository/src/test/java/org/alfresco/repo/lock/mem/AbstractLockStoreTxTest.java +++ b/repository/src/test/java/org/alfresco/repo/lock/mem/AbstractLockStoreTxTest.java @@ -1,494 +1,489 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2023 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - * #L% - */ -package org.alfresco.repo.lock.mem; - -import java.util.Date; - -import jakarta.transaction.NotSupportedException; -import jakarta.transaction.SystemException; -import jakarta.transaction.UserTransaction; - -import org.alfresco.repo.security.authentication.AuthenticationUtil; -import org.alfresco.service.cmr.lock.LockType; -import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.ApplicationContextHelper; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.dao.ConcurrencyFailureException; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; - -/** - * Integration tests that check transaction related functionality of {@link LockStore} implementations. - * @author Matt Ward - */ -public abstract class AbstractLockStoreTxTest -{ - /** - * Instance of the Class Under Test. - */ - protected T lockStore; - - protected static ApplicationContext ctx; - protected static TransactionService transactionService; - - /** - * Concrete subclasses must implement this method to provide the tests with a LockStore instance. - * - * @return LockStore to test - */ - protected abstract T createLockStore(); - - @BeforeClass - public static void setUpSpringContext() - { - ctx = ApplicationContextHelper.getApplicationContext(); - transactionService = (TransactionService) ctx.getBean("TransactionService"); - } - - @Before - public void setUpLockStore() - { - lockStore = createLockStore(); - } - - /** - *
    - *
  • Start outer txn
    • - *
  • Modify lock in outer txn
    • - *
  • Start inner txn
    • - *
  • Modify lock in inner txn
    • - *
- * Inner transaction should fail while outer succeeds - */ - @Test - public void testRepeatableRead_01() throws Exception - { - - } - - @Test - public void testRepeatableReadsInTransaction() throws NotSupportedException, SystemException - { - final TransactionService txService = (TransactionService) ctx.getBean("TransactionService"); - UserTransaction txA = txService.getUserTransaction(); - - final NodeRef nodeRef = new NodeRef("workspace://SpacesStore/UUID-1"); - final NodeRef nodeRef2 = new NodeRef("workspace://SpacesStore/UUID-2"); - Date now = new Date(); - Date expires = new Date(now.getTime() + 180000); - final LockState lockState1 = LockState.createLock(nodeRef, LockType.WRITE_LOCK, - "jbloggs", expires, Lifetime.EPHEMERAL, null); - - - Thread txB = new Thread("TxB") - { - @Override - public void run() - { - Object main = AbstractLockStoreTxTest.this; - UserTransaction tx = txService.getUserTransaction(); - try - { - tx.begin(); - try - { - // txB read lock state - LockState lockState = lockStore.get(nodeRef); - assertEquals("jbloggs", lockState.getOwner()); - assertEquals(Lifetime.EPHEMERAL, lockState.getLifetime()); - - // Wait, while txA changes the lock state - passControl(this, main); - - // assert txB still sees state A - lockState = lockStore.get(nodeRef); - assertEquals("jbloggs", lockState.getOwner()); - - // Wait, while txA checks whether it can see lock for nodeRef2 (though it doesn't exist yet) - passControl(this, main); - - // txB sets a value, already seen as non-existent lock by txA - lockStore.set(nodeRef2, LockState.createLock(nodeRef2, LockType.WRITE_LOCK, - "csmith", null, Lifetime.EPHEMERAL, null)); - } - finally - { - tx.rollback(); - } - } - catch (Throwable e) - { - throw new RuntimeException("Error in transaction B", e); - } - finally - { - // Stop 'main' from waiting - synchronized(main) - { - main.notifyAll(); - } - } - } - }; - - txA.begin(); - try - { - // txA set lock state 1 - lockStore.set(nodeRef, lockState1); - - // Wait while txB reads and checks the LockState - txB.setDaemon(true); - txB.start(); - passControl(this, txB); - - // txA set different lock state - AuthenticationUtil.setFullyAuthenticatedUser("jbloggs"); // Current lock owner needed to change lock. - final LockState lockState2 = LockState.createWithOwner(lockState1, "another"); - lockStore.set(nodeRef, lockState2); - - // Wait while txB reads/checks the LockState again for nodeRef - passControl(this, txB); - - // Another update - AuthenticationUtil.setFullyAuthenticatedUser("another"); // Current lock owner needed to change lock. - final LockState lockState3 = LockState.createWithOwner(lockState2, "bsmith"); - lockStore.set(nodeRef, lockState3); - // Check we can see the update. - assertEquals("bsmith", lockStore.get(nodeRef).getOwner()); - - // Perform a read, that we know will retrieve a null value - assertNull("nodeRef2 LockState", lockStore.get(nodeRef2)); - - // Wait while txB populates the store with a value for nodeRef2 - passControl(this, txB); - - // Perform the read again - update should not be visible in this transaction - assertNull("nodeRef2 LockState", lockStore.get(nodeRef2)); - } - finally - { - txA.rollback(); - } - } - - protected void passControl(Object from, Object to) - { - synchronized(to) - { - to.notifyAll(); - } - synchronized(from) - { - try - { - // TODO: wait should be called in a loop with repeated wait condition check, - // but what's the condition we're waiting on? - from.wait(10000); - } - catch (InterruptedException error) - { - throw new RuntimeException(error); - } - } - } - - @Test - public void testCannotSetLockWhenChangedByAnotherTx() throws NotSupportedException, SystemException - { - final TransactionService txService = (TransactionService) ctx.getBean("TransactionService"); - UserTransaction txA = txService.getUserTransaction(); - final NodeRef nodeRef = new NodeRef("workspace://SpacesStore/UUID-1"); - Date now = new Date(); - Date expires = new Date(now.getTime() + 180000); - final LockState lockState1 = LockState.createLock(nodeRef, LockType.WRITE_LOCK, - "jbloggs", expires, Lifetime.EPHEMERAL, null); - - - Thread txB = new Thread("TxB") - { - @Override - public void run() - { - Object main = AbstractLockStoreTxTest.this; - UserTransaction tx = txService.getUserTransaction(); - try - { - tx.begin(); - try - { - // txB read lock state - LockState lockState = lockStore.get(nodeRef); - assertEquals("jbloggs", lockState.getOwner()); - assertEquals(Lifetime.EPHEMERAL, lockState.getLifetime()); - - // Wait, while txA changes the lock state - passControl(this, main); - - try - { - // Attempt to change the lock state for a NodeRef should fail - // when it has been modified by another tx since this tx last inspected it. - AuthenticationUtil.setFullyAuthenticatedUser("jbloggs"); // Current lock owner - lockStore.set(nodeRef, LockState.createLock(nodeRef, LockType.WRITE_LOCK, - "csmith", null, Lifetime.EPHEMERAL, null)); - fail("Exception should have been thrown but was not."); - } - catch (ConcurrencyFailureException e) - { - // Good! - } - } - finally - { - tx.rollback(); - } - } - catch (Throwable e) - { - throw new RuntimeException("Error in transaction B", e); - } - finally - { - // Stop 'main' from waiting - synchronized(main) - { - main.notifyAll(); - } - } - } - }; - - txA.begin(); - try - { - // txA set lock state 1 - lockStore.set(nodeRef, lockState1); - - // Wait while txB reads and checks the LockState - txB.setDaemon(true); - txB.start(); - passControl(this, txB); - - // txA set different lock state - AuthenticationUtil.setFullyAuthenticatedUser("jbloggs"); // Current lock owner needed to change lock. - final LockState lockState2 = LockState.createWithOwner(lockState1, "another"); - lockStore.set(nodeRef, lockState2); - - // Wait while txB attempts to modify the lock info - passControl(this, txB); - - // Lock shouldn't have changed since this tx updated it. - assertEquals(lockState2, lockStore.get(nodeRef)); - } - finally - { - txA.rollback(); - } - } - - @Test - public void testCanChangeLockIfLatestValueIsHeldEvenIfAlreadyChangedByAnotherTx() throws NotSupportedException, SystemException - { - final TransactionService txService = (TransactionService) ctx.getBean("TransactionService"); - UserTransaction txA = txService.getUserTransaction(); - final NodeRef nodeRef = new NodeRef("workspace://SpacesStore/UUID-1"); - final Date now = new Date(); - Date expired = new Date(now.getTime() - 180000); - final LockState lockState1 = LockState.createLock(nodeRef, LockType.WRITE_LOCK, - "jbloggs", expired, Lifetime.EPHEMERAL, null); - - final LockState lockState2 = LockState.createWithOwner(lockState1, "another"); - - Thread txB = new Thread("TxB") - { - @Override - public void run() - { - Object main = AbstractLockStoreTxTest.this; - UserTransaction tx = txService.getUserTransaction(); - try - { - tx.begin(); - try - { - AuthenticationUtil.setFullyAuthenticatedUser("new-user"); - - // txB read lock state - LockState readLockState = lockStore.get(nodeRef); - assertEquals(lockState2, readLockState); - - // Set new value, even though txA has already set new values - // (but not since this tx's initial read) - Date expiresFuture = new Date(now.getTime() + 180000); - final LockState newUserLockState = LockState.createLock(nodeRef, LockType.WRITE_LOCK, - "new-user", expiresFuture, Lifetime.EPHEMERAL, null); - lockStore.set(nodeRef, newUserLockState); - - // Read - assertEquals(newUserLockState, lockStore.get(nodeRef)); - } - finally - { - tx.rollback(); - } - } - catch (Throwable e) - { - throw new RuntimeException("Error in transaction B", e); - } - finally - { - // Stop 'main' from waiting - synchronized(main) - { - main.notifyAll(); - } - } - } - }; - - txA.begin(); - try - { - AuthenticationUtil.setFullyAuthenticatedUser("jbloggs"); // Current lock owner needed to change lock. - - // txA set lock state 1 - lockStore.set(nodeRef, lockState1); - assertEquals(lockState1, lockStore.get(nodeRef)); - - // txA set different lock state - lockStore.set(nodeRef, lockState2); - assertEquals(lockState2, lockStore.get(nodeRef)); - - // Wait while txB modifies the lock info - txB.setDaemon(true); - txB.start(); - passControl(this, txB); - - // This tx should still see the same state, though it has been changed by txB. - assertEquals(lockState2, lockStore.get(nodeRef)); - } - finally - { - txA.rollback(); - } - } - - - @Test - public void testNotOnlyCurrentLockOwnerCanChangeInfo() throws NotSupportedException, SystemException - { - final TransactionService txService = (TransactionService) ctx.getBean("TransactionService"); - UserTransaction txA = txService.getUserTransaction(); - final NodeRef nodeRef = new NodeRef("workspace://SpacesStore/UUID-1"); - Date now = new Date(); - Date expires = new Date(now.getTime() + 180000); - final LockState lockState1 = LockState.createLock(nodeRef, LockType.WRITE_LOCK, - "jbloggs", expires, Lifetime.EPHEMERAL, null); - - txA.begin(); - try - { - AuthenticationUtil.setFullyAuthenticatedUser("jbloggs"); - - // Set initial lock state - lockStore.set(nodeRef, lockState1); - - // Set different lock state - // Current lock owner is still authenticated (jbloggs) - final LockState lockState2 = LockState.createWithOwner(lockState1, "csmith"); - lockStore.set(nodeRef, lockState2); - - // Check update - assertEquals(lockState2, lockStore.get(nodeRef)); - - // Incorrect lock owner - this shouldn't fail. See ACE-2181 - final LockState lockState3 = LockState.createWithOwner(lockState1, "dsmithers"); - - lockStore.set(nodeRef, lockState3); - - // Check update. - assertEquals(lockState3, lockStore.get(nodeRef)); - } - finally - { - txA.rollback(); - } - } - - @Test - public void testOtherUserCanChangeLockInfoOnceExpired() throws NotSupportedException, SystemException - { - final TransactionService txService = (TransactionService) ctx.getBean("TransactionService"); - UserTransaction txA = txService.getUserTransaction(); - final NodeRef nodeRef = new NodeRef("workspace://SpacesStore/UUID-1"); - Date now = new Date(); - Date expired = new Date(now.getTime() - 900); - final LockState lockState1 = LockState.createLock(nodeRef, LockType.WRITE_LOCK, - "jbloggs", expired, Lifetime.EPHEMERAL, null); - - txA.begin(); - try - { - AuthenticationUtil.setFullyAuthenticatedUser("jbloggs"); - - // Set initial lock state - lockStore.set(nodeRef, lockState1); - - // Set different lock state - AuthenticationUtil.setFullyAuthenticatedUser("csmith"); - Date expiresFuture = new Date(now.getTime() + 180000); - final LockState lockState2 = LockState.createLock(nodeRef, LockType.WRITE_LOCK, - "csmith", expiresFuture, Lifetime.EPHEMERAL, null); - lockStore.set(nodeRef, lockState2); - - // Updated, since lock had expired. - assertEquals(lockState2, lockStore.get(nodeRef)); - - // Incorrect lock owner - this shouldn't fail - // LockStore does not check for lock owning - // and is owned by csmith. - AuthenticationUtil.setFullyAuthenticatedUser("dsmithers"); - final LockState lockState3 = LockState.createWithOwner(lockState2, "dsmithers"); - - lockStore.set(nodeRef, lockState3); - - // Check update. - assertEquals(lockState3, lockStore.get(nodeRef)); - } - finally - { - txA.rollback(); - } - } -} +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2023 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.repo.lock.mem; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; + +import java.util.Date; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.SystemException; +import jakarta.transaction.UserTransaction; + +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.dao.ConcurrencyFailureException; + +import org.alfresco.repo.security.authentication.AuthenticationUtil; +import org.alfresco.service.cmr.lock.LockType; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.transaction.TransactionService; +import org.alfresco.util.ApplicationContextHelper; + +/** + * Integration tests that check transaction related functionality of {@link LockStore} implementations. + * + * @author Matt Ward + */ +public abstract class AbstractLockStoreTxTest +{ + /** + * Instance of the Class Under Test. + */ + protected T lockStore; + + protected static ApplicationContext ctx; + protected static TransactionService transactionService; + + /** + * Concrete subclasses must implement this method to provide the tests with a LockStore instance. + * + * @return LockStore to test + */ + protected abstract T createLockStore(); + + @BeforeClass + public static void setUpSpringContext() + { + ctx = ApplicationContextHelper.getApplicationContext(); + transactionService = (TransactionService) ctx.getBean("TransactionService"); + } + + @Before + public void setUpLockStore() + { + lockStore = createLockStore(); + } + + /** + *
    + *
  • Start outer txn
    • + *
  • Modify lock in outer txn
    • + *
  • Start inner txn
    • + *
  • Modify lock in inner txn
    • + *
+ * Inner transaction should fail while outer succeeds + */ + @Test + public void testRepeatableRead_01() throws Exception + { + + } + + @Test + public void testRepeatableReadsInTransaction() throws NotSupportedException, SystemException + { + final TransactionService txService = (TransactionService) ctx.getBean("TransactionService"); + UserTransaction txA = txService.getUserTransaction(); + + final NodeRef nodeRef = new NodeRef("workspace://SpacesStore/UUID-1"); + final NodeRef nodeRef2 = new NodeRef("workspace://SpacesStore/UUID-2"); + Date now = new Date(); + Date expires = new Date(now.getTime() + 180000); + final LockState lockState1 = LockState.createLock(nodeRef, LockType.WRITE_LOCK, + "jbloggs", expires, Lifetime.EPHEMERAL, null); + + Thread txB = new Thread("TxB") { + @Override + public void run() + { + Object main = AbstractLockStoreTxTest.this; + UserTransaction tx = txService.getUserTransaction(); + try + { + tx.begin(); + try + { + // txB read lock state + LockState lockState = lockStore.get(nodeRef); + assertEquals("jbloggs", lockState.getOwner()); + assertEquals(Lifetime.EPHEMERAL, lockState.getLifetime()); + + // Wait, while txA changes the lock state + passControl(this, main); + + // assert txB still sees state A + lockState = lockStore.get(nodeRef); + assertEquals("jbloggs", lockState.getOwner()); + + // Wait, while txA checks whether it can see lock for nodeRef2 (though it doesn't exist yet) + passControl(this, main); + + // txB sets a value, already seen as non-existent lock by txA + lockStore.set(nodeRef2, LockState.createLock(nodeRef2, LockType.WRITE_LOCK, + "csmith", null, Lifetime.EPHEMERAL, null)); + } + finally + { + tx.rollback(); + } + } + catch (Throwable e) + { + throw new RuntimeException("Error in transaction B", e); + } + finally + { + // Stop 'main' from waiting + synchronized (main) + { + main.notifyAll(); + } + } + } + }; + + txA.begin(); + try + { + // txA set lock state 1 + lockStore.set(nodeRef, lockState1); + + // Perform a read, that we know will retrieve a null value (and null will be cached for this transaction) + assertNull("nodeRef2 LockState", lockStore.get(nodeRef2)); + + // Wait while txB reads and checks the LockState + txB.setDaemon(true); + txB.start(); + passControl(this, txB); + + // txA set different lock state + AuthenticationUtil.setFullyAuthenticatedUser("jbloggs"); // Current lock owner needed to change lock. + final LockState lockState2 = LockState.createWithOwner(lockState1, "another"); + lockStore.set(nodeRef, lockState2); + + // Wait while txB reads/checks the LockState again for nodeRef + passControl(this, txB); + + // Another update + AuthenticationUtil.setFullyAuthenticatedUser("another"); // Current lock owner needed to change lock. + final LockState lockState3 = LockState.createWithOwner(lockState2, "bsmith"); + lockStore.set(nodeRef, lockState3); + // Check we can see the update. + assertEquals("bsmith", lockStore.get(nodeRef).getOwner()); + + // Wait while txB populates the store with a value for nodeRef2 + passControl(this, txB); + + // Perform the read again - update should not be visible in this transaction (was already cached) + assertNull("nodeRef2 LockState", lockStore.get(nodeRef2)); + } + finally + { + txA.rollback(); + } + } + + protected void passControl(Object from, Object to) + { + synchronized (to) + { + to.notifyAll(); + } + synchronized (from) + { + try + { + // TODO: wait should be called in a loop with repeated wait condition check, + // but what's the condition we're waiting on? + from.wait(10000); + } + catch (InterruptedException error) + { + throw new RuntimeException(error); + } + } + } + + @Test + public void testCannotSetLockWhenChangedByAnotherTx() throws NotSupportedException, SystemException + { + final TransactionService txService = (TransactionService) ctx.getBean("TransactionService"); + UserTransaction txA = txService.getUserTransaction(); + final NodeRef nodeRef = new NodeRef("workspace://SpacesStore/UUID-1"); + Date now = new Date(); + Date expires = new Date(now.getTime() + 180000); + final LockState lockState1 = LockState.createLock(nodeRef, LockType.WRITE_LOCK, + "jbloggs", expires, Lifetime.EPHEMERAL, null); + + Thread txB = new Thread("TxB") { + @Override + public void run() + { + Object main = AbstractLockStoreTxTest.this; + UserTransaction tx = txService.getUserTransaction(); + try + { + tx.begin(); + try + { + // txB read lock state + LockState lockState = lockStore.get(nodeRef); + assertEquals("jbloggs", lockState.getOwner()); + assertEquals(Lifetime.EPHEMERAL, lockState.getLifetime()); + + // Wait, while txA changes the lock state + passControl(this, main); + + try + { + // Attempt to change the lock state for a NodeRef should fail + // when it has been modified by another tx since this tx last inspected it. + AuthenticationUtil.setFullyAuthenticatedUser("jbloggs"); // Current lock owner + lockStore.set(nodeRef, LockState.createLock(nodeRef, LockType.WRITE_LOCK, + "csmith", null, Lifetime.EPHEMERAL, null)); + fail("Exception should have been thrown but was not."); + } + catch (ConcurrencyFailureException e) + { + // Good! + } + } + finally + { + tx.rollback(); + } + } + catch (Throwable e) + { + throw new RuntimeException("Error in transaction B", e); + } + finally + { + // Stop 'main' from waiting + synchronized (main) + { + main.notifyAll(); + } + } + } + }; + + txA.begin(); + try + { + // txA set lock state 1 + lockStore.set(nodeRef, lockState1); + + // Wait while txB reads and checks the LockState + txB.setDaemon(true); + txB.start(); + passControl(this, txB); + + // txA set different lock state + AuthenticationUtil.setFullyAuthenticatedUser("jbloggs"); // Current lock owner needed to change lock. + final LockState lockState2 = LockState.createWithOwner(lockState1, "another"); + lockStore.set(nodeRef, lockState2); + + // Wait while txB attempts to modify the lock info + passControl(this, txB); + + // Lock shouldn't have changed since this tx updated it. + assertEquals(lockState2, lockStore.get(nodeRef)); + } + finally + { + txA.rollback(); + } + } + + @Test + public void testCanChangeLockIfLatestValueIsHeldEvenIfAlreadyChangedByAnotherTx() throws NotSupportedException, SystemException + { + final TransactionService txService = (TransactionService) ctx.getBean("TransactionService"); + UserTransaction txA = txService.getUserTransaction(); + final NodeRef nodeRef = new NodeRef("workspace://SpacesStore/UUID-1"); + final Date now = new Date(); + Date expired = new Date(now.getTime() - 180000); + final LockState lockState1 = LockState.createLock(nodeRef, LockType.WRITE_LOCK, + "jbloggs", expired, Lifetime.EPHEMERAL, null); + + final LockState lockState2 = LockState.createWithOwner(lockState1, "another"); + + Thread txB = new Thread("TxB") { + @Override + public void run() + { + Object main = AbstractLockStoreTxTest.this; + UserTransaction tx = txService.getUserTransaction(); + try + { + tx.begin(); + try + { + AuthenticationUtil.setFullyAuthenticatedUser("new-user"); + + // txB read lock state + LockState readLockState = lockStore.get(nodeRef); + assertEquals(lockState2, readLockState); + + // Set new value, even though txA has already set new values + // (but not since this tx's initial read) + Date expiresFuture = new Date(now.getTime() + 180000); + final LockState newUserLockState = LockState.createLock(nodeRef, LockType.WRITE_LOCK, + "new-user", expiresFuture, Lifetime.EPHEMERAL, null); + lockStore.set(nodeRef, newUserLockState); + + // Read + assertEquals(newUserLockState, lockStore.get(nodeRef)); + } + finally + { + tx.rollback(); + } + } + catch (Throwable e) + { + throw new RuntimeException("Error in transaction B", e); + } + finally + { + // Stop 'main' from waiting + synchronized (main) + { + main.notifyAll(); + } + } + } + }; + + txA.begin(); + try + { + AuthenticationUtil.setFullyAuthenticatedUser("jbloggs"); // Current lock owner needed to change lock. + + // txA set lock state 1 + lockStore.set(nodeRef, lockState1); + assertEquals(lockState1, lockStore.get(nodeRef)); + + // txA set different lock state + lockStore.set(nodeRef, lockState2); + assertEquals(lockState2, lockStore.get(nodeRef)); + + // Wait while txB modifies the lock info + txB.setDaemon(true); + txB.start(); + passControl(this, txB); + + // This tx should still see the same state, though it has been changed by txB. + assertEquals(lockState2, lockStore.get(nodeRef)); + } + finally + { + txA.rollback(); + } + } + + @Test + public void testNotOnlyCurrentLockOwnerCanChangeInfo() throws NotSupportedException, SystemException + { + final TransactionService txService = (TransactionService) ctx.getBean("TransactionService"); + UserTransaction txA = txService.getUserTransaction(); + final NodeRef nodeRef = new NodeRef("workspace://SpacesStore/UUID-1"); + Date now = new Date(); + Date expires = new Date(now.getTime() + 180000); + final LockState lockState1 = LockState.createLock(nodeRef, LockType.WRITE_LOCK, + "jbloggs", expires, Lifetime.EPHEMERAL, null); + + txA.begin(); + try + { + AuthenticationUtil.setFullyAuthenticatedUser("jbloggs"); + + // Set initial lock state + lockStore.set(nodeRef, lockState1); + + // Set different lock state + // Current lock owner is still authenticated (jbloggs) + final LockState lockState2 = LockState.createWithOwner(lockState1, "csmith"); + lockStore.set(nodeRef, lockState2); + + // Check update + assertEquals(lockState2, lockStore.get(nodeRef)); + + // Incorrect lock owner - this shouldn't fail. See ACE-2181 + final LockState lockState3 = LockState.createWithOwner(lockState1, "dsmithers"); + + lockStore.set(nodeRef, lockState3); + + // Check update. + assertEquals(lockState3, lockStore.get(nodeRef)); + } + finally + { + txA.rollback(); + } + } + + @Test + public void testOtherUserCanChangeLockInfoOnceExpired() throws NotSupportedException, SystemException + { + final TransactionService txService = (TransactionService) ctx.getBean("TransactionService"); + UserTransaction txA = txService.getUserTransaction(); + final NodeRef nodeRef = new NodeRef("workspace://SpacesStore/UUID-1"); + Date now = new Date(); + Date expired = new Date(now.getTime() - 900); + final LockState lockState1 = LockState.createLock(nodeRef, LockType.WRITE_LOCK, + "jbloggs", expired, Lifetime.EPHEMERAL, null); + + txA.begin(); + try + { + AuthenticationUtil.setFullyAuthenticatedUser("jbloggs"); + + // Set initial lock state + lockStore.set(nodeRef, lockState1); + + // Set different lock state + AuthenticationUtil.setFullyAuthenticatedUser("csmith"); + Date expiresFuture = new Date(now.getTime() + 180000); + final LockState lockState2 = LockState.createLock(nodeRef, LockType.WRITE_LOCK, + "csmith", expiresFuture, Lifetime.EPHEMERAL, null); + lockStore.set(nodeRef, lockState2); + + // Updated, since lock had expired. + assertEquals(lockState2, lockStore.get(nodeRef)); + + // Incorrect lock owner - this shouldn't fail + // LockStore does not check for lock owning + // and is owned by csmith. + AuthenticationUtil.setFullyAuthenticatedUser("dsmithers"); + final LockState lockState3 = LockState.createWithOwner(lockState2, "dsmithers"); + + lockStore.set(nodeRef, lockState3); + + // Check update. + assertEquals(lockState3, lockStore.get(nodeRef)); + } + finally + { + txA.rollback(); + } + } +} From f467e982c2c42feee5cc5eeb91e693d7a7284d68 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 11 Mar 2025 11:14:40 +0000 Subject: [PATCH 28/29] [maven-release-plugin][skip ci] prepare release 25.1.0.69 --- 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 4edb1ee9cf..305cb03849 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index c88070fbcf..5b1751ec1c 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 - 25.1.0.69-SNAPSHOT + 25.1.0.69 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 a97b994b65..ff290def80 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 - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index ed4d35d129..c1dbf8a0b8 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 - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 5cf2bd856b..9bcbbdbc76 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 - 25.1.0.69-SNAPSHOT + 25.1.0.69 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 7829a601d5..8a875c6cce 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 - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/amps/pom.xml b/amps/pom.xml index 1711acc730..f7260aa3d1 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 0b1abdebf4..46c558bf5e 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/core/pom.xml b/core/pom.xml index 2473f5b4f8..64e0306ffb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/data-model/pom.xml b/data-model/pom.xml index 444d1c480d..eb185e27c6 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/mmt/pom.xml b/mmt/pom.xml index 6c75f9e8cd..96a9c1b4dd 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 8774a9b4f0..488cbebcf0 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 8275c8cc1c..60e278fa45 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/packaging/pom.xml b/packaging/pom.xml index 3fc3f53adc..d54ce02dd0 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index afa8d9ad73..b39712ce79 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 587fede3e5..9707aacb53 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 - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 352ebf93e7..ce3e2f838d 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 - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 996f20c3df..c3944a74ed 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 - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 62a2a48c2a..ad13f1ab08 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 1a0b5b808f..dcba6cf9d1 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 - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 7ad6d14d29..e7e05d21d3 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/pom.xml b/pom.xml index 8f169cb17c..3e564a0e91 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.69-SNAPSHOT + 25.1.0.69 pom Alfresco Community Repo Parent @@ -155,7 +155,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 + 25.1.0.69 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 72920e5fab..bd1b15c1b7 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.69-SNAPSHOT + 25.1.0.69 diff --git a/repository/pom.xml b/repository/pom.xml index 38a5051adf..b0a6506376 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.69-SNAPSHOT + 25.1.0.69 From 3967bd1295207637bef2a3205af346cfc45ad4fe Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 11 Mar 2025 11:14:42 +0000 Subject: [PATCH 29/29] [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 305cb03849..f289a0fc1c 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 5b1751ec1c..30336f8fda 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 - 25.1.0.69 + 25.1.0.70-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 ff290def80..73ba74c272 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 - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index c1dbf8a0b8..cfca1c253d 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 - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 9bcbbdbc76..f1a2cd0987 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 - 25.1.0.69 + 25.1.0.70-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 8a875c6cce..b668184f47 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 - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index f7260aa3d1..0738e02077 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 46c558bf5e..1691d76325 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 64e0306ffb..3344c3e60e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index eb185e27c6..9e9be3629d 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 96a9c1b4dd..514d5fe2ae 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 488cbebcf0..4bdfbb4aef 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 60e278fa45..9a3e0aedc6 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index d54ce02dd0..afb7c5aecc 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index b39712ce79..c0b8fdf84d 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 9707aacb53..316ca4e799 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 - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index ce3e2f838d..a10bc5ded3 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 - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index c3944a74ed..5e604b956f 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 - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index ad13f1ab08..0ef72b41f5 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-tests - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index dcba6cf9d1..9b8276dd8b 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 - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index e7e05d21d3..7f4764e900 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/pom.xml b/pom.xml index 3e564a0e91..5fc22ca55f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.69 + 25.1.0.70-SNAPSHOT pom Alfresco Community Repo Parent @@ -155,7 +155,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 - 25.1.0.69 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index bd1b15c1b7..79b065dfd5 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.69 + 25.1.0.70-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index b0a6506376..f7e409a4ad 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.69 + 25.1.0.70-SNAPSHOT