From 60a0d6a492bac53399b983c8fed375b31d642fe7 Mon Sep 17 00:00:00 2001 From: mohit-singh4 <158050587+mohit-singh4@users.noreply.github.com> Date: Thu, 9 Jan 2025 12:08:33 +0530 Subject: [PATCH 01/15] [APPS-3154] fix for number of file field in response (#3108) * [fix/APPS-3154] Rectifying number of Files field in response. * [fix/APPS-3154] Rectifying number of Files field in response. * [fix/APPS-3154] Rectifying number of Files field in response. * [fix/APPS-3154-fixForNumberOfFileFieldInResponse] fix for NumberOfFiles field in response * [fix/APPS-3154-fixForNumberOfFileFieldInResponse] Updating numberOfFiles field in response --------- Co-authored-by: mohit-singh4 --- .../repo/node/sizedetails/NodeSizeDetailsServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/repository/src/main/java/org/alfresco/repo/node/sizedetails/NodeSizeDetailsServiceImpl.java b/repository/src/main/java/org/alfresco/repo/node/sizedetails/NodeSizeDetailsServiceImpl.java index eff0e0035a..69c519a1d7 100644 --- a/repository/src/main/java/org/alfresco/repo/node/sizedetails/NodeSizeDetailsServiceImpl.java +++ b/repository/src/main/java/org/alfresco/repo/node/sizedetails/NodeSizeDetailsServiceImpl.java @@ -191,9 +191,8 @@ public class NodeSizeDetailsServiceImpl implements NodeSizeDetailsService, Initi } Date calculationDate = new Date(System.currentTimeMillis()); NodeSizeDetails nodeSizeDetails = new NodeSizeDetails(nodeRef.getId(), totalSizeFromFacet, calculationDate, - results.getNodeRefs() - .size(), - STATUS.COMPLETED, jobId); + (int) results.getNumberFound(), STATUS.COMPLETED, + jobId); return nodeSizeDetails; } catch (Exception e) @@ -396,5 +395,4 @@ public class NodeSizeDetailsServiceImpl implements NodeSizeDetailsService, Initi } } - -} \ No newline at end of file +} From dc458fd54e8ea313e0debe3e4ada3e154dcfe3eb Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 9 Jan 2025 07:19:53 +0000 Subject: [PATCH 02/15] [maven-release-plugin][skip ci] prepare release 25.1.0.22 --- 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 556b2d3096..a9edb8bce2 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.22-SNAPSHOT + 25.1.0.22 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index f42e04ac64..f2f296be86 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.22-SNAPSHOT + 25.1.0.22 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 e7f10ce270..bf2790d5d8 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.22-SNAPSHOT + 25.1.0.22 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 774c034fad..ec08fc4e2b 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.22-SNAPSHOT + 25.1.0.22 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 6f8d1d02e3..f9bb8b88d4 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.22-SNAPSHOT + 25.1.0.22 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 fe0412254e..dd10701dd6 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.22-SNAPSHOT + 25.1.0.22 diff --git a/amps/pom.xml b/amps/pom.xml index ca041aacdd..7e718cfd04 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.22-SNAPSHOT + 25.1.0.22 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 850815c404..3f10679356 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.22-SNAPSHOT + 25.1.0.22 diff --git a/core/pom.xml b/core/pom.xml index 398dd5fcac..13cfb637ce 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.22-SNAPSHOT + 25.1.0.22 diff --git a/data-model/pom.xml b/data-model/pom.xml index b0cfafb6b2..f607c883ea 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.22-SNAPSHOT + 25.1.0.22 diff --git a/mmt/pom.xml b/mmt/pom.xml index 1bfbabfa0b..5450d1df4e 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.22-SNAPSHOT + 25.1.0.22 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index d03b01bd14..9ecce8eaf3 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.22-SNAPSHOT + 25.1.0.22 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 14ea05ce9a..5ae2a0d9df 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.22-SNAPSHOT + 25.1.0.22 diff --git a/packaging/pom.xml b/packaging/pom.xml index 7fbcc74ad9..5ea10b8639 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.22-SNAPSHOT + 25.1.0.22 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index e2d964e37c..6aed269d61 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.22-SNAPSHOT + 25.1.0.22 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 7b132bb17f..66f2942317 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.22-SNAPSHOT + 25.1.0.22 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index f96e0bb481..23f819dddd 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.22-SNAPSHOT + 25.1.0.22 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 30e6c87f44..b31cad2b55 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.22-SNAPSHOT + 25.1.0.22 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index faa183eb9c..7b17876b33 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.22-SNAPSHOT + 25.1.0.22 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 5b68aeb36a..9b559b58d4 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.22-SNAPSHOT + 25.1.0.22 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index d642a981c7..3dd3da008c 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.22-SNAPSHOT + 25.1.0.22 diff --git a/pom.xml b/pom.xml index 2bd4af97ea..225770995c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.22-SNAPSHOT + 25.1.0.22 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.22 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index d19617fe2d..2a91030502 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.22-SNAPSHOT + 25.1.0.22 diff --git a/repository/pom.xml b/repository/pom.xml index 5114825a2b..34d68805ea 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.22-SNAPSHOT + 25.1.0.22 From f9be67add66ff8ff0045b71ae4da745f69d53601 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 9 Jan 2025 07:19:54 +0000 Subject: [PATCH 03/15] [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 a9edb8bce2..efb73176e4 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.22 + 25.1.0.23-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index f2f296be86..bab5ea7028 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.22 + 25.1.0.23-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 bf2790d5d8..beac9aeaf6 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.22 + 25.1.0.23-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index ec08fc4e2b..5ee1d3bbbb 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.22 + 25.1.0.23-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index f9bb8b88d4..1254383b2d 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.22 + 25.1.0.23-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 dd10701dd6..d526feaa2c 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.22 + 25.1.0.23-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 7e718cfd04..7060567ba3 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.22 + 25.1.0.23-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 3f10679356..ec6c220376 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.22 + 25.1.0.23-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 13cfb637ce..09f8097be1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.22 + 25.1.0.23-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index f607c883ea..420df984f9 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.22 + 25.1.0.23-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 5450d1df4e..9efa1d3dac 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.22 + 25.1.0.23-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 9ecce8eaf3..582f408161 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.22 + 25.1.0.23-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 5ae2a0d9df..56dc9e3b1b 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.22 + 25.1.0.23-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 5ea10b8639..d0382ff8f9 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.22 + 25.1.0.23-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 6aed269d61..b7585f9898 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.22 + 25.1.0.23-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 66f2942317..ef2ad3c3fe 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.22 + 25.1.0.23-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 23f819dddd..a861d82acf 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.22 + 25.1.0.23-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index b31cad2b55..345ab143bc 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.22 + 25.1.0.23-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 7b17876b33..b2a8099fbe 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.22 + 25.1.0.23-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 9b559b58d4..ff52fa5ab5 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.22 + 25.1.0.23-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 3dd3da008c..bc25d38dda 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.22 + 25.1.0.23-SNAPSHOT diff --git a/pom.xml b/pom.xml index 225770995c..4f2755b4a9 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.22 + 25.1.0.23-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.22 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 2a91030502..239fe841a7 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.22 + 25.1.0.23-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 34d68805ea..4afecfff4f 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.22 + 25.1.0.23-SNAPSHOT From 38b796f9ce852d642054ec128cb28468d7987d0b Mon Sep 17 00:00:00 2001 From: Manish Kumar <110275771+code4uuuu@users.noreply.github.com> Date: Thu, 9 Jan 2025 14:07:27 +0530 Subject: [PATCH 04/15] fix/MNT-24542 class cast exception (#3092) * [MNT-24542] fix class cast exception * pre-commit-issue * removed else part * address review comments * fix-conflict --- .../SpringBasedIdentityServiceFacade.java | 698 +++++++++--------- 1 file changed, 354 insertions(+), 344 deletions(-) diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/SpringBasedIdentityServiceFacade.java b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/SpringBasedIdentityServiceFacade.java index cab996c09b..8eb0eff806 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/SpringBasedIdentityServiceFacade.java +++ b/repository/src/main/java/org/alfresco/repo/security/authentication/identityservice/SpringBasedIdentityServiceFacade.java @@ -1,344 +1,354 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2025 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.security.authentication.identityservice; - -import static java.util.Objects.requireNonNull; - -import static org.alfresco.repo.security.authentication.identityservice.IdentityServiceMetadataKey.AUDIENCE; - -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.time.Instant; -import java.util.Map; -import java.util.Optional; -import java.util.function.Predicate; - -import com.nimbusds.oauth2.sdk.ParseException; -import com.nimbusds.oauth2.sdk.token.BearerAccessToken; -import com.nimbusds.openid.connect.sdk.UserInfoRequest; -import com.nimbusds.openid.connect.sdk.UserInfoResponse; -import com.nimbusds.openid.connect.sdk.UserInfoSuccessResponse; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.core.convert.converter.Converter; -import org.springframework.security.oauth2.client.endpoint.AbstractOAuth2AuthorizationGrantRequest; -import org.springframework.security.oauth2.client.endpoint.DefaultAuthorizationCodeTokenResponseClient; -import org.springframework.security.oauth2.client.endpoint.DefaultPasswordTokenResponseClient; -import org.springframework.security.oauth2.client.endpoint.DefaultRefreshTokenTokenResponseClient; -import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient; -import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; -import org.springframework.security.oauth2.client.endpoint.OAuth2PasswordGrantRequest; -import org.springframework.security.oauth2.client.endpoint.OAuth2PasswordGrantRequestEntityConverter; -import org.springframework.security.oauth2.client.endpoint.OAuth2RefreshTokenGrantRequest; -import org.springframework.security.oauth2.client.registration.ClientRegistration; -import org.springframework.security.oauth2.client.registration.ClientRegistration.ProviderDetails; -import org.springframework.security.oauth2.core.AbstractOAuth2Token; -import org.springframework.security.oauth2.core.AuthorizationGrantType; -import org.springframework.security.oauth2.core.OAuth2AccessToken; -import org.springframework.security.oauth2.core.OAuth2AccessToken.TokenType; -import org.springframework.security.oauth2.core.OAuth2AuthorizationException; -import org.springframework.security.oauth2.core.OAuth2RefreshToken; -import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse; -import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationExchange; -import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest; -import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponse; -import org.springframework.security.oauth2.jwt.Jwt; -import org.springframework.security.oauth2.jwt.JwtDecoder; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.client.RestOperations; - -class SpringBasedIdentityServiceFacade implements IdentityServiceFacade -{ - private static final Log LOGGER = LogFactory.getLog(SpringBasedIdentityServiceFacade.class); - private static final Instant SOME_INSIGNIFICANT_DATE_IN_THE_PAST = Instant.MIN.plusSeconds(12345); - private final Map clients; - private final ClientRegistration clientRegistration; - private final JwtDecoder jwtDecoder; - - SpringBasedIdentityServiceFacade(RestOperations restOperations, ClientRegistration clientRegistration, - JwtDecoder jwtDecoder) - { - requireNonNull(restOperations); - this.clientRegistration = requireNonNull(clientRegistration); - this.jwtDecoder = requireNonNull(jwtDecoder); - this.clients = Map.of( - AuthorizationGrantType.AUTHORIZATION_CODE, createAuthorizationCodeClient(restOperations), - AuthorizationGrantType.REFRESH_TOKEN, createRefreshTokenClient(restOperations), - AuthorizationGrantType.PASSWORD, createPasswordClient(restOperations, clientRegistration)); - } - - @Override - public AccessTokenAuthorization authorize(AuthorizationGrant authorizationGrant) - { - final AbstractOAuth2AuthorizationGrantRequest request = createRequest(authorizationGrant); - final OAuth2AccessTokenResponseClient client = getClient(request); - - final OAuth2AccessTokenResponse response; - try - { - response = client.getTokenResponse(request); - } - catch (OAuth2AuthorizationException e) - { - LOGGER.debug("Failed to authorize against Authorization Server. Reason: " + e.getError() + "."); - throw new AuthorizationException("Failed to obtain access token. " + e.getError(), e); - } - catch (RuntimeException e) - { - LOGGER.warn("Failed to authorize against Authorization Server. Reason: " + e.getMessage()); - throw new AuthorizationException("Failed to obtain access token.", e); - } - - return new SpringAccessTokenAuthorization(response); - } - - @Override - public Optional getUserInfo(String tokenParameter, String principalAttribute) - { - return Optional.ofNullable(tokenParameter) - .filter(Predicate.not(String::isEmpty)) - .flatMap(token -> Optional.ofNullable(clientRegistration) - .map(ClientRegistration::getProviderDetails) - .map(ClientRegistration.ProviderDetails::getUserInfoEndpoint) - .map(ClientRegistration.ProviderDetails.UserInfoEndpoint::getUri) - .flatMap(uri -> { - try - { - return Optional.of( - new UserInfoRequest(new URI(uri), new BearerAccessToken(token)).toHTTPRequest().send()); - } - catch (IOException | URISyntaxException e) - { - LOGGER.warn("Failed to get user information. Reason: " + e.getMessage()); - return Optional.empty(); - } - }) - .flatMap(httpResponse -> { - try - { - return Optional.of(UserInfoResponse.parse(httpResponse)); - } - catch (ParseException e) - { - LOGGER.warn("Failed to parse user info response. Reason: " + e.getMessage()); - return Optional.empty(); - } - }) - .map(UserInfoResponse::toSuccessResponse) - .map(UserInfoSuccessResponse::getUserInfo)) - .map(userInfo -> new OIDCUserInfo(userInfo.getStringClaim(principalAttribute), userInfo.getGivenName(), - userInfo.getFamilyName(), userInfo.getEmailAddress())); - } - - @Override - public ClientRegistration getClientRegistration() - { - return clientRegistration; - } - - @Override - public DecodedAccessToken decodeToken(String token) - { - final Jwt validToken; - try - { - validToken = jwtDecoder.decode(token); - } - catch (RuntimeException e) - { - throw new TokenDecodingException("Failed to decode token. " + e.getMessage(), e); - } - if (LOGGER.isDebugEnabled()) - { - LOGGER.debug("Bearer token outcome: " + validToken.getClaims()); - } - return new SpringDecodedAccessToken(validToken); - } - - private AbstractOAuth2AuthorizationGrantRequest createRequest(AuthorizationGrant grant) - { - if (grant.isPassword()) - { - return new OAuth2PasswordGrantRequest(clientRegistration, grant.getUsername(), grant.getPassword()); - } - - if (grant.isRefreshToken()) - { - final OAuth2AccessToken expiredAccessToken = new OAuth2AccessToken( - TokenType.BEARER, - "JUST_FOR_FULFILLING_THE_SPRING_API", - SOME_INSIGNIFICANT_DATE_IN_THE_PAST, - SOME_INSIGNIFICANT_DATE_IN_THE_PAST.plusSeconds(1)); - final OAuth2RefreshToken refreshToken = new OAuth2RefreshToken(grant.getRefreshToken(), null); - - return new OAuth2RefreshTokenGrantRequest(clientRegistration, expiredAccessToken, refreshToken, - clientRegistration.getScopes()); - } - - if (grant.isAuthorizationCode()) - { - final OAuth2AuthorizationExchange authzExchange = new OAuth2AuthorizationExchange( - OAuth2AuthorizationRequest.authorizationCode() - .clientId(clientRegistration.getClientId()) - .authorizationUri(clientRegistration.getProviderDetails().getAuthorizationUri()) - .redirectUri(grant.getRedirectUri()) - .scopes(clientRegistration.getScopes()) - .build(), - OAuth2AuthorizationResponse.success(grant.getAuthorizationCode()) - .redirectUri(grant.getRedirectUri()) - .build() - ); - return new OAuth2AuthorizationCodeGrantRequest(clientRegistration, authzExchange); - } - - throw new UnsupportedOperationException("Unsupported grant type."); - } - - private OAuth2AccessTokenResponseClient getClient(AbstractOAuth2AuthorizationGrantRequest request) - { - final AuthorizationGrantType grantType = request.getGrantType(); - final OAuth2AccessTokenResponseClient client = clients.get(grantType); - if (client == null) - { - throw new UnsupportedOperationException("Unsupported grant type `" + grantType + "`."); - } - return client; - } - - private static OAuth2AccessTokenResponseClient createAuthorizationCodeClient( - RestOperations rest) - { - final DefaultAuthorizationCodeTokenResponseClient client = new DefaultAuthorizationCodeTokenResponseClient(); - client.setRestOperations(rest); - return client; - } - - private static OAuth2AccessTokenResponseClient createRefreshTokenClient( - RestOperations rest) - { - final DefaultRefreshTokenTokenResponseClient client = new DefaultRefreshTokenTokenResponseClient(); - client.setRestOperations(rest); - return client; - } - - private static OAuth2AccessTokenResponseClient createPasswordClient(RestOperations rest, - ClientRegistration clientRegistration) - { - final DefaultPasswordTokenResponseClient client = new DefaultPasswordTokenResponseClient(); - client.setRestOperations(rest); - Optional.of(clientRegistration) - .map(ClientRegistration::getProviderDetails) - .map(ProviderDetails::getConfigurationMetadata) - .map(metadata -> metadata.get(AUDIENCE.getValue())) - .filter(String.class::isInstance) - .map(String.class::cast) - .ifPresent(audienceValue -> { - final OAuth2PasswordGrantRequestEntityConverter requestEntityConverter = new OAuth2PasswordGrantRequestEntityConverter(); - requestEntityConverter.addParametersConverter(audienceParameterConverter(audienceValue)); - client.setRequestEntityConverter(requestEntityConverter); - }); - return client; - } - - private static Converter> audienceParameterConverter( - String audienceValue) - { - return (grantRequest) -> { - MultiValueMap parameters = new LinkedMultiValueMap<>(); - parameters.set("audience", audienceValue); - - return parameters; - }; - } - - private static class SpringAccessTokenAuthorization implements AccessTokenAuthorization - { - private final OAuth2AccessTokenResponse tokenResponse; - - private SpringAccessTokenAuthorization(OAuth2AccessTokenResponse tokenResponse) - { - this.tokenResponse = requireNonNull(tokenResponse); - } - - @Override - public AccessToken getAccessToken() - { - return new SpringAccessToken(tokenResponse.getAccessToken()); - } - - @Override - public String getRefreshTokenValue() - { - return Optional.of(tokenResponse) - .map(OAuth2AccessTokenResponse::getRefreshToken) - .map(AbstractOAuth2Token::getTokenValue) - .orElse(null); - } - } - - private static class SpringAccessToken implements AccessToken - { - private final AbstractOAuth2Token token; - - private SpringAccessToken(AbstractOAuth2Token token) - { - this.token = requireNonNull(token); - } - - @Override - public String getTokenValue() - { - return token.getTokenValue(); - } - - @Override - public Instant getExpiresAt() - { - return token.getExpiresAt(); - } - } - - private static class SpringDecodedAccessToken extends SpringAccessToken implements DecodedAccessToken - { - private final Jwt jwt; - - private SpringDecodedAccessToken(Jwt jwt) - { - super(jwt); - this.jwt = jwt; - } - - @Override - public Object getClaim(String claim) - { - return jwt.getClaim(claim); - } - } -} \ No newline at end of file +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2025 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.security.authentication.identityservice; + +import static java.util.Objects.requireNonNull; + +import static org.alfresco.repo.security.authentication.identityservice.IdentityServiceMetadataKey.AUDIENCE; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.time.Instant; +import java.util.Map; +import java.util.Optional; +import java.util.function.Predicate; + +import com.nimbusds.oauth2.sdk.ErrorObject; +import com.nimbusds.oauth2.sdk.ParseException; +import com.nimbusds.oauth2.sdk.token.BearerAccessToken; +import com.nimbusds.openid.connect.sdk.UserInfoErrorResponse; +import com.nimbusds.openid.connect.sdk.UserInfoRequest; +import com.nimbusds.openid.connect.sdk.UserInfoResponse; +import com.nimbusds.openid.connect.sdk.UserInfoSuccessResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.core.convert.converter.Converter; +import org.springframework.security.oauth2.client.endpoint.AbstractOAuth2AuthorizationGrantRequest; +import org.springframework.security.oauth2.client.endpoint.DefaultAuthorizationCodeTokenResponseClient; +import org.springframework.security.oauth2.client.endpoint.DefaultPasswordTokenResponseClient; +import org.springframework.security.oauth2.client.endpoint.DefaultRefreshTokenTokenResponseClient; +import org.springframework.security.oauth2.client.endpoint.OAuth2AccessTokenResponseClient; +import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; +import org.springframework.security.oauth2.client.endpoint.OAuth2PasswordGrantRequest; +import org.springframework.security.oauth2.client.endpoint.OAuth2PasswordGrantRequestEntityConverter; +import org.springframework.security.oauth2.client.endpoint.OAuth2RefreshTokenGrantRequest; +import org.springframework.security.oauth2.client.registration.ClientRegistration; +import org.springframework.security.oauth2.client.registration.ClientRegistration.ProviderDetails; +import org.springframework.security.oauth2.core.AbstractOAuth2Token; +import org.springframework.security.oauth2.core.AuthorizationGrantType; +import org.springframework.security.oauth2.core.OAuth2AccessToken; +import org.springframework.security.oauth2.core.OAuth2AccessToken.TokenType; +import org.springframework.security.oauth2.core.OAuth2AuthorizationException; +import org.springframework.security.oauth2.core.OAuth2RefreshToken; +import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse; +import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationExchange; +import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest; +import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponse; +import org.springframework.security.oauth2.jwt.Jwt; +import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestOperations; + +class SpringBasedIdentityServiceFacade implements IdentityServiceFacade +{ + private static final Log LOGGER = LogFactory.getLog(SpringBasedIdentityServiceFacade.class); + private static final Instant SOME_INSIGNIFICANT_DATE_IN_THE_PAST = Instant.MIN.plusSeconds(12345); + private final Map clients; + private final ClientRegistration clientRegistration; + private final JwtDecoder jwtDecoder; + + SpringBasedIdentityServiceFacade(RestOperations restOperations, ClientRegistration clientRegistration, + JwtDecoder jwtDecoder) + { + requireNonNull(restOperations); + this.clientRegistration = requireNonNull(clientRegistration); + this.jwtDecoder = requireNonNull(jwtDecoder); + this.clients = Map.of( + AuthorizationGrantType.AUTHORIZATION_CODE, createAuthorizationCodeClient(restOperations), + AuthorizationGrantType.REFRESH_TOKEN, createRefreshTokenClient(restOperations), + AuthorizationGrantType.PASSWORD, createPasswordClient(restOperations, clientRegistration)); + } + + @Override + public AccessTokenAuthorization authorize(AuthorizationGrant authorizationGrant) + { + final AbstractOAuth2AuthorizationGrantRequest request = createRequest(authorizationGrant); + final OAuth2AccessTokenResponseClient client = getClient(request); + + final OAuth2AccessTokenResponse response; + try + { + response = client.getTokenResponse(request); + } + catch (OAuth2AuthorizationException e) + { + LOGGER.debug("Failed to authorize against Authorization Server. Reason: " + e.getError() + "."); + throw new AuthorizationException("Failed to obtain access token. " + e.getError(), e); + } + catch (RuntimeException e) + { + LOGGER.warn("Failed to authorize against Authorization Server. Reason: " + e.getMessage()); + throw new AuthorizationException("Failed to obtain access token.", e); + } + + return new SpringAccessTokenAuthorization(response); + } + + @Override + public Optional getUserInfo(String tokenParameter, String principalAttribute) + { + return Optional.ofNullable(tokenParameter) + .filter(Predicate.not(String::isEmpty)) + .flatMap(token -> Optional.ofNullable(clientRegistration) + .map(ClientRegistration::getProviderDetails) + .map(ClientRegistration.ProviderDetails::getUserInfoEndpoint) + .map(ClientRegistration.ProviderDetails.UserInfoEndpoint::getUri) + .flatMap(uri -> { + try + { + return Optional.of( + new UserInfoRequest(new URI(uri), new BearerAccessToken(token)).toHTTPRequest().send()); + } + catch (IOException | URISyntaxException e) + { + LOGGER.warn("Failed to get user information. Reason: " + e.getMessage()); + return Optional.empty(); + } + }) + .flatMap(httpResponse -> { + try + { + UserInfoResponse userInfoResponse = UserInfoResponse.parse(httpResponse); + + if (userInfoResponse instanceof UserInfoErrorResponse userInfoErrorResponse) + { + String errorMessage = Optional.ofNullable(userInfoErrorResponse.getErrorObject()) + .map(ErrorObject::getDescription) + .orElse("No error description found"); + LOGGER.warn("User Info Request failed: " + errorMessage); + throw new UserInfoException(errorMessage); + } + return Optional.of(userInfoResponse); + } + catch (ParseException e) + { + LOGGER.warn("Failed to parse user info response. Reason: " + e.getMessage()); + return Optional.empty(); + } + }) + .map(UserInfoResponse::toSuccessResponse) + .map(UserInfoSuccessResponse::getUserInfo)) + .map(userInfo -> new OIDCUserInfo(userInfo.getStringClaim(principalAttribute), userInfo.getGivenName(), + userInfo.getFamilyName(), userInfo.getEmailAddress())); + } + + @Override + public ClientRegistration getClientRegistration() + { + return clientRegistration; + } + + @Override + public DecodedAccessToken decodeToken(String token) + { + final Jwt validToken; + try + { + validToken = jwtDecoder.decode(token); + } + catch (RuntimeException e) + { + throw new TokenDecodingException("Failed to decode token. " + e.getMessage(), e); + } + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug("Bearer token outcome: " + validToken.getClaims()); + } + return new SpringDecodedAccessToken(validToken); + } + + private AbstractOAuth2AuthorizationGrantRequest createRequest(AuthorizationGrant grant) + { + if (grant.isPassword()) + { + return new OAuth2PasswordGrantRequest(clientRegistration, grant.getUsername(), grant.getPassword()); + } + + if (grant.isRefreshToken()) + { + final OAuth2AccessToken expiredAccessToken = new OAuth2AccessToken( + TokenType.BEARER, + "JUST_FOR_FULFILLING_THE_SPRING_API", + SOME_INSIGNIFICANT_DATE_IN_THE_PAST, + SOME_INSIGNIFICANT_DATE_IN_THE_PAST.plusSeconds(1)); + final OAuth2RefreshToken refreshToken = new OAuth2RefreshToken(grant.getRefreshToken(), null); + + return new OAuth2RefreshTokenGrantRequest(clientRegistration, expiredAccessToken, refreshToken, + clientRegistration.getScopes()); + } + + if (grant.isAuthorizationCode()) + { + final OAuth2AuthorizationExchange authzExchange = new OAuth2AuthorizationExchange( + OAuth2AuthorizationRequest.authorizationCode() + .clientId(clientRegistration.getClientId()) + .authorizationUri(clientRegistration.getProviderDetails().getAuthorizationUri()) + .redirectUri(grant.getRedirectUri()) + .scopes(clientRegistration.getScopes()) + .build(), + OAuth2AuthorizationResponse.success(grant.getAuthorizationCode()) + .redirectUri(grant.getRedirectUri()) + .build()); + return new OAuth2AuthorizationCodeGrantRequest(clientRegistration, authzExchange); + } + + throw new UnsupportedOperationException("Unsupported grant type."); + } + + private OAuth2AccessTokenResponseClient getClient(AbstractOAuth2AuthorizationGrantRequest request) + { + final AuthorizationGrantType grantType = request.getGrantType(); + final OAuth2AccessTokenResponseClient client = clients.get(grantType); + if (client == null) + { + throw new UnsupportedOperationException("Unsupported grant type `" + grantType + "`."); + } + return client; + } + + private static OAuth2AccessTokenResponseClient createAuthorizationCodeClient( + RestOperations rest) + { + final DefaultAuthorizationCodeTokenResponseClient client = new DefaultAuthorizationCodeTokenResponseClient(); + client.setRestOperations(rest); + return client; + } + + private static OAuth2AccessTokenResponseClient createRefreshTokenClient( + RestOperations rest) + { + final DefaultRefreshTokenTokenResponseClient client = new DefaultRefreshTokenTokenResponseClient(); + client.setRestOperations(rest); + return client; + } + + private static OAuth2AccessTokenResponseClient createPasswordClient(RestOperations rest, + ClientRegistration clientRegistration) + { + final DefaultPasswordTokenResponseClient client = new DefaultPasswordTokenResponseClient(); + client.setRestOperations(rest); + Optional.of(clientRegistration) + .map(ClientRegistration::getProviderDetails) + .map(ProviderDetails::getConfigurationMetadata) + .map(metadata -> metadata.get(AUDIENCE.getValue())) + .filter(String.class::isInstance) + .map(String.class::cast) + .ifPresent(audienceValue -> { + final OAuth2PasswordGrantRequestEntityConverter requestEntityConverter = new OAuth2PasswordGrantRequestEntityConverter(); + requestEntityConverter.addParametersConverter(audienceParameterConverter(audienceValue)); + client.setRequestEntityConverter(requestEntityConverter); + }); + return client; + } + + private static Converter> audienceParameterConverter( + String audienceValue) + { + return (grantRequest) -> { + MultiValueMap parameters = new LinkedMultiValueMap<>(); + parameters.set("audience", audienceValue); + + return parameters; + }; + } + + private static class SpringAccessTokenAuthorization implements AccessTokenAuthorization + { + private final OAuth2AccessTokenResponse tokenResponse; + + private SpringAccessTokenAuthorization(OAuth2AccessTokenResponse tokenResponse) + { + this.tokenResponse = requireNonNull(tokenResponse); + } + + @Override + public AccessToken getAccessToken() + { + return new SpringAccessToken(tokenResponse.getAccessToken()); + } + + @Override + public String getRefreshTokenValue() + { + return Optional.of(tokenResponse) + .map(OAuth2AccessTokenResponse::getRefreshToken) + .map(AbstractOAuth2Token::getTokenValue) + .orElse(null); + } + } + + private static class SpringAccessToken implements AccessToken + { + private final AbstractOAuth2Token token; + + private SpringAccessToken(AbstractOAuth2Token token) + { + this.token = requireNonNull(token); + } + + @Override + public String getTokenValue() + { + return token.getTokenValue(); + } + + @Override + public Instant getExpiresAt() + { + return token.getExpiresAt(); + } + } + + private static class SpringDecodedAccessToken extends SpringAccessToken implements DecodedAccessToken + { + private final Jwt jwt; + + private SpringDecodedAccessToken(Jwt jwt) + { + super(jwt); + this.jwt = jwt; + } + + @Override + public Object getClaim(String claim) + { + return jwt.getClaim(claim); + } + } +} From ae00e09b110e6c555263e99e69499da254bcf48e Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 9 Jan 2025 09:17:17 +0000 Subject: [PATCH 05/15] [maven-release-plugin][skip ci] prepare release 25.1.0.23 --- 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 efb73176e4..cf15a40302 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.23-SNAPSHOT + 25.1.0.23 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index bab5ea7028..e2d3939471 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.23-SNAPSHOT + 25.1.0.23 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 beac9aeaf6..9e4f932340 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.23-SNAPSHOT + 25.1.0.23 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 5ee1d3bbbb..b145725dbf 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.23-SNAPSHOT + 25.1.0.23 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 1254383b2d..5dfeaf8b4d 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.23-SNAPSHOT + 25.1.0.23 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 d526feaa2c..daea91f04c 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.23-SNAPSHOT + 25.1.0.23 diff --git a/amps/pom.xml b/amps/pom.xml index 7060567ba3..430030ef7b 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.23-SNAPSHOT + 25.1.0.23 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index ec6c220376..1d489e5f6a 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.23-SNAPSHOT + 25.1.0.23 diff --git a/core/pom.xml b/core/pom.xml index 09f8097be1..0d3ee851ba 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.23-SNAPSHOT + 25.1.0.23 diff --git a/data-model/pom.xml b/data-model/pom.xml index 420df984f9..6087af7493 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.23-SNAPSHOT + 25.1.0.23 diff --git a/mmt/pom.xml b/mmt/pom.xml index 9efa1d3dac..9067ef2d4b 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.23-SNAPSHOT + 25.1.0.23 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 582f408161..192e812525 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.23-SNAPSHOT + 25.1.0.23 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 56dc9e3b1b..4e60c2437e 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.23-SNAPSHOT + 25.1.0.23 diff --git a/packaging/pom.xml b/packaging/pom.xml index d0382ff8f9..237fbf5a55 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.23-SNAPSHOT + 25.1.0.23 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index b7585f9898..641cb21da6 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.23-SNAPSHOT + 25.1.0.23 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index ef2ad3c3fe..635534b6bc 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.23-SNAPSHOT + 25.1.0.23 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index a861d82acf..e9a7132f41 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.23-SNAPSHOT + 25.1.0.23 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 345ab143bc..fd5fb8ee2a 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.23-SNAPSHOT + 25.1.0.23 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index b2a8099fbe..81c1e0851a 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.23-SNAPSHOT + 25.1.0.23 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index ff52fa5ab5..366d768569 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.23-SNAPSHOT + 25.1.0.23 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index bc25d38dda..d2983c0de6 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.23-SNAPSHOT + 25.1.0.23 diff --git a/pom.xml b/pom.xml index 4f2755b4a9..a6d5c3f21c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.23-SNAPSHOT + 25.1.0.23 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.23 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 239fe841a7..8489f1fcbe 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.23-SNAPSHOT + 25.1.0.23 diff --git a/repository/pom.xml b/repository/pom.xml index 4afecfff4f..bdfb73741b 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.23-SNAPSHOT + 25.1.0.23 From c5ac2f3c4ab2373bd9526fb966770b2507ab1738 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 9 Jan 2025 09:17:19 +0000 Subject: [PATCH 06/15] [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 cf15a40302..1684372b07 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.23 + 25.1.0.24-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index e2d3939471..688bba5dd8 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.23 + 25.1.0.24-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 9e4f932340..b801aa3b59 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.23 + 25.1.0.24-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index b145725dbf..ebe0f97cc2 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.23 + 25.1.0.24-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 5dfeaf8b4d..317ddc667e 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.23 + 25.1.0.24-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 daea91f04c..c872701993 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.23 + 25.1.0.24-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 430030ef7b..d83e2709a4 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.23 + 25.1.0.24-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 1d489e5f6a..a2d1488cd4 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.23 + 25.1.0.24-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 0d3ee851ba..cb31c440be 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.23 + 25.1.0.24-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 6087af7493..bbd9b443b5 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.23 + 25.1.0.24-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 9067ef2d4b..c9b468a218 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.23 + 25.1.0.24-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 192e812525..21e49f96a4 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.23 + 25.1.0.24-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 4e60c2437e..b055db720a 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.23 + 25.1.0.24-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 237fbf5a55..523de1f181 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.23 + 25.1.0.24-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 641cb21da6..d8f8a58628 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.23 + 25.1.0.24-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 635534b6bc..38eb812a25 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.23 + 25.1.0.24-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index e9a7132f41..08ffd5fe0f 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.23 + 25.1.0.24-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index fd5fb8ee2a..6bc7a0016a 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.23 + 25.1.0.24-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 81c1e0851a..fc54e75c4c 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.23 + 25.1.0.24-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 366d768569..da7f20110e 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.23 + 25.1.0.24-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index d2983c0de6..a334eb3d56 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.23 + 25.1.0.24-SNAPSHOT diff --git a/pom.xml b/pom.xml index a6d5c3f21c..2db1957077 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.23 + 25.1.0.24-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.23 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 8489f1fcbe..b3e739bafa 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.23 + 25.1.0.24-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index bdfb73741b..d6246f7365 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.23 + 25.1.0.24-SNAPSHOT From 436fde1a065fc3e8418b919ea5934d6b74d0862c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 16:09:40 +0000 Subject: [PATCH 07/15] Bump org.alfresco:alfresco-greenmail from 7.0 to 7.1 (#2931) Bumps [org.alfresco:alfresco-greenmail](https://github.com/Alfresco/alfresco-greenmail) from 7.0 to 7.1. - [Commits](https://github.com/Alfresco/alfresco-greenmail/compare/alfresco-greenmail-7.0...alfresco-greenmail-7.1) --- updated-dependencies: - dependency-name: org.alfresco:alfresco-greenmail dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sara --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2db1957077..60a02b5471 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 5.23.0 5.1.5 4.1.5 - 7.0 + 7.1 1.0.2 1.9.22.1 From 3551dbeb29a8ec55d3370c8fdc4f1eea1abd8a51 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 9 Jan 2025 16:49:45 +0000 Subject: [PATCH 08/15] [maven-release-plugin][skip ci] prepare release 25.1.0.24 --- 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 1684372b07..2ea37dcd35 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.24-SNAPSHOT + 25.1.0.24 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 688bba5dd8..2a31c72e78 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.24-SNAPSHOT + 25.1.0.24 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 b801aa3b59..8e67db8b14 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.24-SNAPSHOT + 25.1.0.24 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index ebe0f97cc2..e7db6a9757 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.24-SNAPSHOT + 25.1.0.24 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 317ddc667e..b2bcf18728 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.24-SNAPSHOT + 25.1.0.24 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 c872701993..f1dd55a6a5 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.24-SNAPSHOT + 25.1.0.24 diff --git a/amps/pom.xml b/amps/pom.xml index d83e2709a4..7ebed01a21 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.24-SNAPSHOT + 25.1.0.24 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index a2d1488cd4..2396f66af7 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.24-SNAPSHOT + 25.1.0.24 diff --git a/core/pom.xml b/core/pom.xml index cb31c440be..029c5f377f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.24-SNAPSHOT + 25.1.0.24 diff --git a/data-model/pom.xml b/data-model/pom.xml index bbd9b443b5..6de557e727 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.24-SNAPSHOT + 25.1.0.24 diff --git a/mmt/pom.xml b/mmt/pom.xml index c9b468a218..26b5e05087 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.24-SNAPSHOT + 25.1.0.24 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 21e49f96a4..da93022f85 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.24-SNAPSHOT + 25.1.0.24 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index b055db720a..75217bd90e 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.24-SNAPSHOT + 25.1.0.24 diff --git a/packaging/pom.xml b/packaging/pom.xml index 523de1f181..d6e1cc852a 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.24-SNAPSHOT + 25.1.0.24 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index d8f8a58628..def4dab805 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.24-SNAPSHOT + 25.1.0.24 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 38eb812a25..625e241a08 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.24-SNAPSHOT + 25.1.0.24 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 08ffd5fe0f..c5d79c6d4c 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.24-SNAPSHOT + 25.1.0.24 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 6bc7a0016a..3514a56f9f 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.24-SNAPSHOT + 25.1.0.24 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index fc54e75c4c..f51823e5a4 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.24-SNAPSHOT + 25.1.0.24 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index da7f20110e..4b4f98d8bf 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.24-SNAPSHOT + 25.1.0.24 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index a334eb3d56..c70f9def3f 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.24-SNAPSHOT + 25.1.0.24 diff --git a/pom.xml b/pom.xml index 60a02b5471..03a91fbfa4 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.24-SNAPSHOT + 25.1.0.24 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.24 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index b3e739bafa..16cdc442e7 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.24-SNAPSHOT + 25.1.0.24 diff --git a/repository/pom.xml b/repository/pom.xml index d6246f7365..8aaf955cd4 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.24-SNAPSHOT + 25.1.0.24 From fc0a1d3cc641cb324d5045f1c7044e6fbadd0646 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 9 Jan 2025 16:49:47 +0000 Subject: [PATCH 09/15] [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 2ea37dcd35..81687c572c 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.24 + 25.1.0.25-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 2a31c72e78..20116c1944 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.24 + 25.1.0.25-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 8e67db8b14..0a5e2d5416 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.24 + 25.1.0.25-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index e7db6a9757..497dc38dbf 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.24 + 25.1.0.25-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index b2bcf18728..a6b1d3f005 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.24 + 25.1.0.25-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 f1dd55a6a5..57217a25b4 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.24 + 25.1.0.25-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 7ebed01a21..895a9bc3a6 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.24 + 25.1.0.25-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 2396f66af7..5239ce4f6a 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.24 + 25.1.0.25-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 029c5f377f..412bb37ae9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.24 + 25.1.0.25-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 6de557e727..a4d7af5344 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.24 + 25.1.0.25-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 26b5e05087..b84abd9d86 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.24 + 25.1.0.25-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index da93022f85..c45c6f45e7 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.24 + 25.1.0.25-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 75217bd90e..2ea40cadbe 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.24 + 25.1.0.25-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index d6e1cc852a..3f715f864b 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.24 + 25.1.0.25-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index def4dab805..61e6bf5096 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.24 + 25.1.0.25-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 625e241a08..bb5dc48697 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.24 + 25.1.0.25-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index c5d79c6d4c..8c3d20b9d4 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.24 + 25.1.0.25-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 3514a56f9f..b79c851a53 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.24 + 25.1.0.25-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index f51823e5a4..cf54baf66a 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.24 + 25.1.0.25-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 4b4f98d8bf..294731a844 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.24 + 25.1.0.25-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index c70f9def3f..540977fbad 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.24 + 25.1.0.25-SNAPSHOT diff --git a/pom.xml b/pom.xml index 03a91fbfa4..8d0a4668d4 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.24 + 25.1.0.25-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.24 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 16cdc442e7..4712d57805 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.24 + 25.1.0.25-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 8aaf955cd4..ca62bd0d31 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.24 + 25.1.0.25-SNAPSHOT From f193389fe5cc9987fbf293339926c4084dee1e6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 18:28:59 +0000 Subject: [PATCH 10/15] Bump dependency.log4j.version from 2.24.2 to 2.24.3 (#3094) Bumps `dependency.log4j.version` from 2.24.2 to 2.24.3. Updates `org.apache.logging.log4j:log4j-slf4j2-impl` from 2.24.2 to 2.24.3 Updates `org.apache.logging.log4j:log4j-api` from 2.24.2 to 2.24.3 Updates `org.apache.logging.log4j:log4j-core` from 2.24.2 to 2.24.3 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-slf4j2-impl dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-patch ... 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 8d0a4668d4..b301dae2d9 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ 3.1-HTTPCLIENT-1265 2.12.2 2.0.16 - 2.24.2 + 2.24.3 3.0.23 2.9.2 7.7.10 From 0f3708c01b37d0f591f639051b39f97c37e8dcef Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 9 Jan 2025 19:10:17 +0000 Subject: [PATCH 11/15] [maven-release-plugin][skip ci] prepare release 25.1.0.25 --- 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 81687c572c..49e94fc16f 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.25-SNAPSHOT + 25.1.0.25 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 20116c1944..4e9ceebd23 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.25-SNAPSHOT + 25.1.0.25 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 0a5e2d5416..ce78f4a2ea 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.25-SNAPSHOT + 25.1.0.25 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 497dc38dbf..66f9b70c1d 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.25-SNAPSHOT + 25.1.0.25 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index a6b1d3f005..f81ad45959 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.25-SNAPSHOT + 25.1.0.25 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 57217a25b4..e7e049bf82 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.25-SNAPSHOT + 25.1.0.25 diff --git a/amps/pom.xml b/amps/pom.xml index 895a9bc3a6..5b53eb17bf 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.25-SNAPSHOT + 25.1.0.25 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 5239ce4f6a..04d09d20b8 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.25-SNAPSHOT + 25.1.0.25 diff --git a/core/pom.xml b/core/pom.xml index 412bb37ae9..5c7024633e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.25-SNAPSHOT + 25.1.0.25 diff --git a/data-model/pom.xml b/data-model/pom.xml index a4d7af5344..ce58630a3e 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.25-SNAPSHOT + 25.1.0.25 diff --git a/mmt/pom.xml b/mmt/pom.xml index b84abd9d86..21b9eec6ab 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.25-SNAPSHOT + 25.1.0.25 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index c45c6f45e7..91577bc2a1 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.25-SNAPSHOT + 25.1.0.25 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 2ea40cadbe..c11404ff72 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.25-SNAPSHOT + 25.1.0.25 diff --git a/packaging/pom.xml b/packaging/pom.xml index 3f715f864b..7103d4bf3d 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.25-SNAPSHOT + 25.1.0.25 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 61e6bf5096..82a8ceef2e 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.25-SNAPSHOT + 25.1.0.25 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index bb5dc48697..7483734c7d 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.25-SNAPSHOT + 25.1.0.25 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 8c3d20b9d4..e81ed8e499 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.25-SNAPSHOT + 25.1.0.25 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index b79c851a53..f424f7c735 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.25-SNAPSHOT + 25.1.0.25 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index cf54baf66a..af9f7a2098 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.25-SNAPSHOT + 25.1.0.25 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 294731a844..5555c8722b 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.25-SNAPSHOT + 25.1.0.25 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 540977fbad..267edc6a4d 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.25-SNAPSHOT + 25.1.0.25 diff --git a/pom.xml b/pom.xml index b301dae2d9..564294ed4a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.25-SNAPSHOT + 25.1.0.25 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.25 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 4712d57805..2b77be89b7 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.25-SNAPSHOT + 25.1.0.25 diff --git a/repository/pom.xml b/repository/pom.xml index ca62bd0d31..10458be2fa 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.25-SNAPSHOT + 25.1.0.25 From 1416f4d877d2490b8a07ed869e892f11ab5cc528 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 9 Jan 2025 19:10:19 +0000 Subject: [PATCH 12/15] [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 49e94fc16f..cf349ce01c 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.25 + 25.1.0.26-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 4e9ceebd23..ce0d09aa74 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.25 + 25.1.0.26-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 ce78f4a2ea..2cb6bd107f 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.25 + 25.1.0.26-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 66f9b70c1d..1ec4db020e 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.25 + 25.1.0.26-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index f81ad45959..e84cf662ad 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.25 + 25.1.0.26-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 e7e049bf82..ed7085584b 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.25 + 25.1.0.26-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 5b53eb17bf..476c75f3f4 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.25 + 25.1.0.26-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 04d09d20b8..9e1f324f00 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.25 + 25.1.0.26-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 5c7024633e..58139e9fe1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.25 + 25.1.0.26-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index ce58630a3e..56faa18fc3 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.25 + 25.1.0.26-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 21b9eec6ab..6ede144103 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.25 + 25.1.0.26-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 91577bc2a1..5ee29ab9bc 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.25 + 25.1.0.26-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index c11404ff72..b116d93700 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.25 + 25.1.0.26-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 7103d4bf3d..9f1e3a21e0 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.25 + 25.1.0.26-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 82a8ceef2e..834b2fe117 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.25 + 25.1.0.26-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 7483734c7d..6584588a66 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.25 + 25.1.0.26-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index e81ed8e499..0bb37a69c8 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.25 + 25.1.0.26-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index f424f7c735..ac31a79c5c 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.25 + 25.1.0.26-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index af9f7a2098..046da442ea 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.25 + 25.1.0.26-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 5555c8722b..7a512dc4da 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.25 + 25.1.0.26-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 267edc6a4d..88c82d114d 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.25 + 25.1.0.26-SNAPSHOT diff --git a/pom.xml b/pom.xml index 564294ed4a..6071688e68 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.25 + 25.1.0.26-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.25 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 2b77be89b7..258cc3462b 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.25 + 25.1.0.26-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 10458be2fa..109f5951db 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.25 + 25.1.0.26-SNAPSHOT From 3eada8a1fde71efcfd0298dc4339f572eca54b24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 19:19:44 +0000 Subject: [PATCH 13/15] Bump org.codehaus.cargo:cargo-maven3-plugin from 1.10.14 to 1.10.16 (#3095) Bumps org.codehaus.cargo:cargo-maven3-plugin from 1.10.14 to 1.10.16. --- updated-dependencies: - dependency-name: org.codehaus.cargo:cargo-maven3-plugin dependency-type: direct:production update-type: version-update:semver-patch ... 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 6071688e68..bc27135d60 100644 --- a/pom.xml +++ b/pom.xml @@ -1089,7 +1089,7 @@ org.codehaus.cargo cargo-maven3-plugin - 1.10.14 + 1.10.16 org.apache.maven.plugins From 148c0e960235d22d08a9e37e2e767f9bd34f407d Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 9 Jan 2025 19:59:32 +0000 Subject: [PATCH 14/15] [maven-release-plugin][skip ci] prepare release 25.1.0.26 --- 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 cf349ce01c..c51bd0cb18 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.26-SNAPSHOT + 25.1.0.26 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index ce0d09aa74..9eadf64b2f 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.26-SNAPSHOT + 25.1.0.26 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 2cb6bd107f..1254cb151b 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.26-SNAPSHOT + 25.1.0.26 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 1ec4db020e..6db5447957 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.26-SNAPSHOT + 25.1.0.26 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index e84cf662ad..de0aa7080c 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.26-SNAPSHOT + 25.1.0.26 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 ed7085584b..0a35cc50ea 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.26-SNAPSHOT + 25.1.0.26 diff --git a/amps/pom.xml b/amps/pom.xml index 476c75f3f4..e2d35e24f7 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.26-SNAPSHOT + 25.1.0.26 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 9e1f324f00..1bab454aeb 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.26-SNAPSHOT + 25.1.0.26 diff --git a/core/pom.xml b/core/pom.xml index 58139e9fe1..2d096d034a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.26-SNAPSHOT + 25.1.0.26 diff --git a/data-model/pom.xml b/data-model/pom.xml index 56faa18fc3..c3138f99cb 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.26-SNAPSHOT + 25.1.0.26 diff --git a/mmt/pom.xml b/mmt/pom.xml index 6ede144103..444fe3a9b3 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.26-SNAPSHOT + 25.1.0.26 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 5ee29ab9bc..6973148b47 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.26-SNAPSHOT + 25.1.0.26 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index b116d93700..ed02b5f3e8 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.26-SNAPSHOT + 25.1.0.26 diff --git a/packaging/pom.xml b/packaging/pom.xml index 9f1e3a21e0..d85af1aa5f 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.26-SNAPSHOT + 25.1.0.26 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 834b2fe117..86c9d564ac 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.26-SNAPSHOT + 25.1.0.26 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 6584588a66..a7a99a59e9 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.26-SNAPSHOT + 25.1.0.26 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 0bb37a69c8..29b78572e8 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.26-SNAPSHOT + 25.1.0.26 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index ac31a79c5c..2ce42c548c 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.26-SNAPSHOT + 25.1.0.26 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 046da442ea..61aab85535 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.26-SNAPSHOT + 25.1.0.26 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 7a512dc4da..d9092e5cc1 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.26-SNAPSHOT + 25.1.0.26 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 88c82d114d..31e7d498d2 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.26-SNAPSHOT + 25.1.0.26 diff --git a/pom.xml b/pom.xml index bc27135d60..e05e0883a3 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.26-SNAPSHOT + 25.1.0.26 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.26 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 258cc3462b..ed5bf17ec4 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.26-SNAPSHOT + 25.1.0.26 diff --git a/repository/pom.xml b/repository/pom.xml index 109f5951db..a4e0ee4487 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.26-SNAPSHOT + 25.1.0.26 From da9c7c372cec2b1c9a414e55f25ac7c990e8f5f4 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 9 Jan 2025 19:59:34 +0000 Subject: [PATCH 15/15] [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 c51bd0cb18..16b69c19cb 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 25.1.0.26 + 25.1.0.27-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 9eadf64b2f..72d9b99ab7 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.26 + 25.1.0.27-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 1254cb151b..3da6f7a90c 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.26 + 25.1.0.27-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 6db5447957..6091bfa14c 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.26 + 25.1.0.27-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index de0aa7080c..707680eed7 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.26 + 25.1.0.27-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 0a35cc50ea..4808edd591 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.26 + 25.1.0.27-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index e2d35e24f7..0efd8f71aa 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.26 + 25.1.0.27-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 1bab454aeb..047a5ed98c 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.26 + 25.1.0.27-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 2d096d034a..58c3382893 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.26 + 25.1.0.27-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index c3138f99cb..db7819acfe 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.26 + 25.1.0.27-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 444fe3a9b3..bbfc0f015c 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.26 + 25.1.0.27-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 6973148b47..29629e3ec6 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.26 + 25.1.0.27-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index ed02b5f3e8..957ad0965d 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.26 + 25.1.0.27-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index d85af1aa5f..9b04b776a3 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.26 + 25.1.0.27-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 86c9d564ac..20443ba643 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.26 + 25.1.0.27-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index a7a99a59e9..703570c62b 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.26 + 25.1.0.27-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 29b78572e8..12b02a55cf 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.26 + 25.1.0.27-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 2ce42c548c..fc422c226d 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.26 + 25.1.0.27-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 61aab85535..2f75d7ace3 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.26 + 25.1.0.27-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index d9092e5cc1..508b8f9f82 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.26 + 25.1.0.27-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 31e7d498d2..7424d4afe1 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 25.1.0.26 + 25.1.0.27-SNAPSHOT diff --git a/pom.xml b/pom.xml index e05e0883a3..a9b76b81a8 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 25.1.0.26 + 25.1.0.27-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.26 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index ed5bf17ec4..51d7db8531 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.26 + 25.1.0.27-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index a4e0ee4487..88e255496f 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 25.1.0.26 + 25.1.0.27-SNAPSHOT