From 35b4ad5dbe6736dbf022d4d4e369385ac4e8e4a4 Mon Sep 17 00:00:00 2001 From: SathishK-T <166369440+SathishK-T@users.noreply.github.com> Date: Wed, 3 Jul 2024 18:32:42 +0530 Subject: [PATCH 001/118] [APPS-2905][APPS-2906][APPS-2907][APPS-2909] Defect fixes in Retention Schedule V1 API's (#2732) * [APPS-2907][APPS-2909] Validation Changes in Retention Schedule V1 API * [APPS-2907][APPS-2909] Defect fixes in Retention Schedule V1 API's * [APPS-2907][APPS-2909] Defect fixes in Retention Schedule V1 API's * [APPS-2907][APPS-2909] Defect fixes in Retention Schedule V1 API's * [APPS-2907][APPS-2909] Defect fixes in Retention Schedule V1 API's * [APPS-2907][APPS-2909] Defect fixes in Retention Schedule V1 API's * [APPS-2907][APPS-2909] Defect fixes in Retention Schedule V1 API's --------- Co-authored-by: Sathish Kumar --- .../RetentionScheduleActionDefinition.java | 2 +- .../RetentionScheduleStepTests.java | 47 +++++++++++----- .../rest/api/impl/ApiNodesModelFactory.java | 37 +++++++++---- .../RetentionScheduleActionDefinition.java | 4 +- .../rm/rest/api/model/RetentionSteps.java | 3 +- .../RetentionScheduleActionRelation.java | 55 ++++++++++++++++--- .../RetentionScheduleRelation.java | 18 ++++++ .../main/webapp/definitions/gs-core-api.yaml | 37 +++++++------ 8 files changed, 151 insertions(+), 52 deletions(-) diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleActionDefinition.java b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleActionDefinition.java index 0c79e9f543..e743e904de 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleActionDefinition.java +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleActionDefinition.java @@ -40,7 +40,7 @@ public class RetentionScheduleActionDefinition private int periodAmount; private String period; private String periodProperty; - private boolean combineDispositionStepConditions; + private boolean combineRetentionStepConditions; private List events; private boolean eligibleOnFirstCompleteEvent; private String description; diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/retentionschedule/RetentionScheduleStepTests.java b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/retentionschedule/RetentionScheduleStepTests.java index 60359e6f74..060c22fae6 100644 --- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/retentionschedule/RetentionScheduleStepTests.java +++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/retentionschedule/RetentionScheduleStepTests.java @@ -79,7 +79,7 @@ public class RetentionScheduleStepTests extends BaseRMRestTest private static final String RETAIN_STEP = "retain"; private static final String INVALID_PERIOD = "random"; private static final String CUTOFF_STEP = "cutoff"; - private static final String DESTROY_STEP = "destroy"; + private static final String DESTROY_STEP = "destroyContent"; private static final String INVALID_PASSWORD = "wrongPassword"; @Autowired @@ -107,7 +107,7 @@ public class RetentionScheduleStepTests extends BaseRMRestTest retentionScheduleActionDefinition.setPeriodAmount(PERIOD_AMOUNT); retentionScheduleActionDefinition.setPeriodProperty(PERIOD_PROPERTY); retentionScheduleActionDefinition.setPeriod(PERIOD); - retentionScheduleActionDefinition.setCombineDispositionStepConditions(false); + retentionScheduleActionDefinition.setCombineRetentionStepConditions(false); retentionScheduleActionDefinition.setEligibleOnFirstCompleteEvent(true); retentionScheduleActionDefinition.setEvents(EVENTS); } @@ -118,6 +118,7 @@ public class RetentionScheduleStepTests extends BaseRMRestTest RetentionScheduleActionDefinition actionDefinition = getRetentionScheduleActionDefinition(); //Creating the first action "transfer" should give 422 actionDefinition.setName(TRANSFER_STEP); + actionDefinition.setLocation("location"); //Create retention schedule action definition getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition,createdRetentionSchedule.getId()); // Verify the status code @@ -151,6 +152,7 @@ public class RetentionScheduleStepTests extends BaseRMRestTest RetentionScheduleActionDefinition actionDefinition1 = getRetentionScheduleActionDefinition(); actionDefinition1.setName(TRANSFER_STEP); + actionDefinition1.setLocation("location"); getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition1,retentionSchedule.getId()); assertStatusCode(CREATED); @@ -190,6 +192,20 @@ public class RetentionScheduleStepTests extends BaseRMRestTest } @Test(priority = 5) + public void combineRetentionStepConditionsNotValidForNonAccessionStep() + { + RecordCategory recordCategory = createRootCategory(getRandomName(RECORD_CATEGORY)); + recordCategories.add(recordCategory.getId()); + RetentionSchedule retentionSchedule = createRetentionSchedule(recordCategory); + RetentionScheduleActionDefinition actionDefinition = getRetentionScheduleActionDefinition(); + actionDefinition.setName(RETAIN_STEP); + actionDefinition.setCombineRetentionStepConditions(true); + getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition,retentionSchedule.getId()); + + assertStatusCode(BAD_REQUEST); + } + + @Test(priority = 6) public void createRetentionScheduleWithSameStep() { RecordCategory recordCategory = createRootCategory(getRandomName(RECORD_CATEGORY)); @@ -209,7 +225,7 @@ public class RetentionScheduleStepTests extends BaseRMRestTest assertStatusCode(CONFLICT); } - @Test(priority = 6) + @Test(priority = 7) public void createRetentionScheduleWithMultipleTransferStep() { RecordCategory recordCategory = createRootCategory(getRandomName(RECORD_CATEGORY)); @@ -223,16 +239,19 @@ public class RetentionScheduleStepTests extends BaseRMRestTest RetentionScheduleActionDefinition actionDefinition1 = getRetentionScheduleActionDefinition(); actionDefinition1.setName(TRANSFER_STEP); + actionDefinition1.setLocation("location"); + getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition1, retentionSchedule.getId()); RetentionScheduleActionDefinition actionDefinition2 = getRetentionScheduleActionDefinition(); actionDefinition2.setName(TRANSFER_STEP); + actionDefinition2.setLocation("location"); getRestAPIFactory().getRetentionScheduleAPI().createRetentionScheduleStep(actionDefinition2, retentionSchedule.getId()); // Verify the status code assertStatusCode(CREATED); } - @Test(priority = 7) + @Test(priority = 8) public void createRetentionScheduleStepFor201() { //Create retention schedule action definition @@ -243,11 +262,11 @@ public class RetentionScheduleStepTests extends BaseRMRestTest assertEquals(createdRetentionActionDefinition.getName(), retentionScheduleActionDefinition.getName()); assertEquals(createdRetentionActionDefinition.getDescription(), retentionScheduleActionDefinition.getDescription()); assertEquals(createdRetentionActionDefinition.getPeriodAmount(), retentionScheduleActionDefinition.getPeriodAmount()); - assertEquals(createdRetentionActionDefinition.isCombineDispositionStepConditions(), retentionScheduleActionDefinition.isCombineDispositionStepConditions()); + assertEquals(createdRetentionActionDefinition.isCombineRetentionStepConditions(), retentionScheduleActionDefinition.isCombineRetentionStepConditions()); assertEquals(createdRetentionActionDefinition.isEligibleOnFirstCompleteEvent(), retentionScheduleActionDefinition.isEligibleOnFirstCompleteEvent()); } - @Test(priority = 8) + @Test(priority = 9) public void createRetentionScheduleStepFor401() { //Create retention schedule action definition @@ -256,7 +275,7 @@ public class RetentionScheduleStepTests extends BaseRMRestTest assertStatusCode(UNAUTHORIZED); } - @Test(priority = 9) + @Test(priority = 10) public void createRetentionScheduleStepFor403() { //Create retention schedule action definition @@ -265,7 +284,7 @@ public class RetentionScheduleStepTests extends BaseRMRestTest assertStatusCode(FORBIDDEN); } - @Test(priority = 10) + @Test(priority = 11) public void retentionScheduleStepFor400() { getRestAPIFactory().getRetentionScheduleAPI().getRetentionScheduleStep(recordCategory.getId()); @@ -273,7 +292,7 @@ public class RetentionScheduleStepTests extends BaseRMRestTest assertStatusCode(BAD_REQUEST); } - @Test(priority = 11) + @Test(priority = 12) public void createRetentionScheduleStepFor404() { //Create retention schedule action definition @@ -282,7 +301,7 @@ public class RetentionScheduleStepTests extends BaseRMRestTest assertStatusCode(NOT_FOUND); } - @Test(priority = 12) + @Test(priority = 13) public void retentionScheduleStepFor403() { // Get retention schedule steps with user having no rights @@ -291,7 +310,7 @@ public class RetentionScheduleStepTests extends BaseRMRestTest assertStatusCode(FORBIDDEN); } - @Test(priority = 13) + @Test(priority = 14) public void retentionScheduleStepFor401() { getRestAPIFactory().getRetentionScheduleAPI(new UserModel(getAdminUser().getUsername(), INVALID_PASSWORD)).getRetentionScheduleStep(createdRetentionSchedule.getId()); @@ -299,7 +318,7 @@ public class RetentionScheduleStepTests extends BaseRMRestTest assertStatusCode(UNAUTHORIZED); } - @Test(priority = 14) + @Test(priority = 15) public void retentionScheduleStepWith200() { RetentionScheduleStepCollection receiveRetentionStepCollection = getRestAPIFactory().getRetentionScheduleAPI().getRetentionScheduleStep(createdRetentionSchedule.getId()); @@ -315,7 +334,7 @@ public class RetentionScheduleStepTests extends BaseRMRestTest assertEquals(createdRetentionActionDefinition.getDescription(), retentionActionDef.getDescription()); assertEquals(createdRetentionActionDefinition.getPeriod(), retentionActionDef.getPeriod()); assertEquals(createdRetentionActionDefinition.getPeriodAmount(), retentionActionDef.getPeriodAmount()); - assertEquals(createdRetentionActionDefinition.isCombineDispositionStepConditions(), retentionActionDef.isCombineDispositionStepConditions()); + assertEquals(createdRetentionActionDefinition.isCombineRetentionStepConditions(), retentionActionDef.isCombineRetentionStepConditions()); assertEquals(createdRetentionActionDefinition.isEligibleOnFirstCompleteEvent(), retentionActionDef.isEligibleOnFirstCompleteEvent()); }); } @@ -341,7 +360,7 @@ public class RetentionScheduleStepTests extends BaseRMRestTest actionDefinition.setPeriodAmount(PERIOD_AMOUNT); actionDefinition.setPeriodProperty(PERIOD_PROPERTY); actionDefinition.setPeriod(PERIOD); - actionDefinition.setCombineDispositionStepConditions(false); + actionDefinition.setCombineRetentionStepConditions(false); actionDefinition.setEligibleOnFirstCompleteEvent(true); actionDefinition.setEvents(EVENTS); return actionDefinition; diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/ApiNodesModelFactory.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/ApiNodesModelFactory.java index b392993023..9260cde66b 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/ApiNodesModelFactory.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/ApiNodesModelFactory.java @@ -939,7 +939,7 @@ public class ApiNodesModelFactory { RetentionSchedule retentionSchedule = new RetentionSchedule(); retentionSchedule.setId(dispositionSchedule.getNodeRef().getId()); - if(dispositionSchedule.getNodeRef() != null) { + if (dispositionSchedule.getNodeRef() != null) { NodeRef parent = this.nodeService.getPrimaryParent(dispositionSchedule.getNodeRef()).getParentRef(); retentionSchedule.setParentId(parent.getId()); } @@ -984,7 +984,7 @@ public class ApiNodesModelFactory retentionScheduleActionDefinition.setEligibleOnFirstCompleteEvent(dispositionActionDefinition.eligibleOnFirstCompleteEvent()); if (nodeService.getProperty(dispositionActionDefinition.getNodeRef(), RecordsManagementModel.PROP_COMBINE_DISPOSITION_STEP_CONDITIONS) != null) { - retentionScheduleActionDefinition.setCombineDispositionStepConditions((Boolean) nodeService.getProperty(dispositionActionDefinition.getNodeRef(), RecordsManagementModel.PROP_COMBINE_DISPOSITION_STEP_CONDITIONS)); + retentionScheduleActionDefinition.setCombineRetentionStepConditions((Boolean) nodeService.getProperty(dispositionActionDefinition.getNodeRef(), RecordsManagementModel.PROP_COMBINE_DISPOSITION_STEP_CONDITIONS)); } retentionScheduleActionDefinition.setLocation(dispositionActionDefinition.getLocation()); if (dispositionActionDefinition.getGhostOnDestroy() != null) @@ -1001,7 +1001,7 @@ public class ApiNodesModelFactory */ private void mapPeriodProperties(DispositionActionDefinition dispositionActionDefinition, RetentionScheduleActionDefinition retentionScheduleActionDefinition) { - if(dispositionActionDefinition.getPeriodProperty() != null) + if (dispositionActionDefinition.getPeriodProperty() != null) { retentionScheduleActionDefinition.setPeriodProperty(dispositionActionDefinition.getPeriodProperty().toPrefixString(namespaceService)); } @@ -1078,10 +1078,20 @@ public class ApiNodesModelFactory public Map createRetentionActionDefinitionParams(RetentionScheduleActionDefinition nodeInfo) { Map actionDefinitionParams= new HashMap<>(); - actionDefinitionParams.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, nodeInfo.getName()); + + String retentionActionName = nodeInfo.getName(); + + if (nodeInfo.getName().equals(RetentionSteps.DESTROY_NODE.stepName) || + nodeInfo.getName().equals(RetentionSteps.DESTROY_CONTENT.stepName)) + { + retentionActionName = "destroy"; + } + + actionDefinitionParams.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, retentionActionName); actionDefinitionParams.put(RecordsManagementModel.PROP_DISPOSITION_DESCRIPTION, nodeInfo.getDescription()); StringBuilder retentionPeriod = new StringBuilder(nodeInfo.getPeriod()).append("|"); - if(isPeriodAmountApplicable(nodeInfo.getPeriod())) + + if (isPeriodAmountApplicable(nodeInfo.getPeriod())) { retentionPeriod.append(nodeInfo.getPeriodAmount()); } @@ -1090,17 +1100,22 @@ public class ApiNodesModelFactory actionDefinitionParams.put(RecordsManagementModel.PROP_DISPOSITION_PERIOD_PROPERTY, periodProperty); actionDefinitionParams.put(RecordsManagementModel.PROP_DISPOSITION_EVENT_COMBINATION, nodeInfo.isEligibleOnFirstCompleteEvent()); - actionDefinitionParams.put(RecordsManagementModel.PROP_COMBINE_DISPOSITION_STEP_CONDITIONS, - nodeInfo.isCombineDispositionStepConditions()); - actionDefinitionParams.put(RecordsManagementModel.PROP_DISPOSITION_LOCATION, - nodeInfo.getLocation()); + boolean combineConditions = nodeInfo.getName().equals(RetentionSteps.ACCESSION.stepName) && nodeInfo.isCombineRetentionStepConditions(); + actionDefinitionParams.put(RecordsManagementModel.PROP_COMBINE_DISPOSITION_STEP_CONDITIONS, combineConditions); + + if(nodeInfo.getLocation() != null && nodeInfo.getName().equals(RetentionSteps.TRANSFER.stepName)) + { + actionDefinitionParams.put(RecordsManagementModel.PROP_DISPOSITION_LOCATION, + nodeInfo.getLocation()); + } List inputEvents = nodeInfo.getEvents(); actionDefinitionParams.put(RecordsManagementModel.PROP_DISPOSITION_EVENT, (Serializable) inputEvents); - if (RetentionSteps.DESTROY.stepName.equals(nodeInfo.getName()) && nodeInfo.isRetainRecordMetadataAfterDestruction()) + + if (RetentionSteps.DESTROY_CONTENT.stepName.equals(nodeInfo.getName())) { actionDefinitionParams.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_GHOST_ON_DESTROY, "ghost"); } - else + else if (RetentionSteps.DESTROY_NODE.stepName.equals(nodeInfo.getName())) { actionDefinitionParams.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_GHOST_ON_DESTROY, "delete"); } diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RetentionScheduleActionDefinition.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RetentionScheduleActionDefinition.java index d9806e01df..3d472cfff3 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RetentionScheduleActionDefinition.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RetentionScheduleActionDefinition.java @@ -38,13 +38,13 @@ public class RetentionScheduleActionDefinition { private String id; private String name; + private String description; private int periodAmount; private String period; private String periodProperty; - private boolean combineDispositionStepConditions; + private boolean combineRetentionStepConditions; private List events; private boolean eligibleOnFirstCompleteEvent; - private String description; private boolean retainRecordMetadataAfterDestruction; private String location; private int index; diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RetentionSteps.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RetentionSteps.java index e8ecbd32bf..ddc5da107b 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RetentionSteps.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RetentionSteps.java @@ -35,7 +35,8 @@ public enum RetentionSteps CUTOFF("cutoff"), TRANSFER("transfer"), ACCESSION("accession"), - DESTROY("destroy"); + DESTROY_CONTENT("destroyContent"), + DESTROY_NODE("destroyNode"); public final String stepName; diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/retentionschedule/RetentionScheduleActionRelation.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/retentionschedule/RetentionScheduleActionRelation.java index 8e4c443751..269b6bde08 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/retentionschedule/RetentionScheduleActionRelation.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/retentionschedule/RetentionScheduleActionRelation.java @@ -146,6 +146,11 @@ public class RetentionScheduleActionRelation implements RelationshipResourceActi */ private void retentionScheduleStepValidation(NodeRef retentionScheduleNodeRef, RetentionScheduleActionDefinition retentionScheduleActionDefinition) { + if (checkStepNameIsEmpty(retentionScheduleActionDefinition.getName())) + { + throw new IllegalArgumentException("'name' parameter is mandatory when creating a disposition action definition"); + } + List actions = nodesModelFactory.getRetentionActions(retentionScheduleNodeRef); Set completedActions = new HashSet<>(); if (!actions.isEmpty()) @@ -155,9 +160,9 @@ public class RetentionScheduleActionRelation implements RelationshipResourceActi .collect(Collectors.toSet()); } - if (completedActions.contains(RetentionSteps.DESTROY.stepName)) + if (completedActions.contains("destroy")) { - throw new ConstraintViolatedException("Invalid Step - destroy action is already added . No other action is allowed after Destroy."); + throw new ConstraintViolatedException("Invalid Step - destroy action is already added. No other action is allowed after Destroy."); } if (checkStepAlreadyExists(completedActions, retentionScheduleActionDefinition.getName())) @@ -176,6 +181,11 @@ public class RetentionScheduleActionRelation implements RelationshipResourceActi } } + private boolean checkStepNameIsEmpty(String name) + { + return name == null || name.isEmpty(); + } + /** * this method is used to validate the request of the retention schedule * @param retentionScheduleActionDefinition retention schedule action definition @@ -187,16 +197,34 @@ public class RetentionScheduleActionRelation implements RelationshipResourceActi { throw new InvalidArgumentException("name value is invalid : " +retentionScheduleActionDefinition.getName()); } - // period value validation - if (invalidPeriodCheck(retentionScheduleActionDefinition.getPeriod())) - { - throw new InvalidArgumentException("period value is invalid : " +retentionScheduleActionDefinition.getPeriod()); - } + + validatePeriodAndPeriodProperty(retentionScheduleActionDefinition); + // event name validation if (invalidEventNameCheck(retentionScheduleActionDefinition.getEvents())) { throw new InvalidArgumentException("event value is invalid: " + retentionScheduleActionDefinition.getEvents()); } + + if (validateCombineRetentionStepConditionsForNonAccessionStep(retentionScheduleActionDefinition)) + { + throw new IllegalArgumentException("combineRetentionStepConditions property is only valid for accession step. Not valid for :" + retentionScheduleActionDefinition.getName()); + } + + if (validateLocationForNonTransferStep(retentionScheduleActionDefinition)) + { + throw new IllegalArgumentException("location property is only valid for transfer step. Not valid for :" + retentionScheduleActionDefinition.getName()); + } + } + + private void validatePeriodAndPeriodProperty(RetentionScheduleActionDefinition retentionScheduleActionDefinition) + { + // period value validation + if (invalidPeriodCheck(retentionScheduleActionDefinition.getPeriod())) + { + throw new InvalidArgumentException("period value is invalid : " +retentionScheduleActionDefinition.getPeriod()); + } + // periodProperty validation List validPeriodProperties = Arrays.asList("cm:created", "rma:cutOffDate", "rma:dispositionAsOf"); if (validPeriodProperties.stream().noneMatch(retentionScheduleActionDefinition.getPeriodProperty()::equals)) @@ -205,6 +233,19 @@ public class RetentionScheduleActionRelation implements RelationshipResourceActi } } + private boolean validateCombineRetentionStepConditionsForNonAccessionStep(RetentionScheduleActionDefinition retentionScheduleActionDefinition) + { + return !retentionScheduleActionDefinition.getName().equals(RetentionSteps.ACCESSION.stepName) + && retentionScheduleActionDefinition.isCombineRetentionStepConditions(); + } + + private boolean validateLocationForNonTransferStep(RetentionScheduleActionDefinition retentionScheduleActionDefinition) + { + return retentionScheduleActionDefinition.getLocation() != null + && !retentionScheduleActionDefinition.getName().equals(RetentionSteps.TRANSFER.stepName) + && !retentionScheduleActionDefinition.getLocation().isEmpty(); + } + private boolean checkStepAlreadyExists(Set completedActions, String stepName) { return completedActions.contains(stepName) && !stepName.equals(RetentionSteps.TRANSFER.stepName); diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/retentionschedule/RetentionScheduleRelation.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/retentionschedule/RetentionScheduleRelation.java index 86583c27da..b6f1b034a1 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/retentionschedule/RetentionScheduleRelation.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/retentionschedule/RetentionScheduleRelation.java @@ -26,9 +26,12 @@ */ package org.alfresco.rm.rest.api.retentionschedule; +import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; +import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.rest.framework.WebApiDescription; +import org.alfresco.rest.framework.core.exceptions.UnprocessableContentException; import org.alfresco.rest.framework.resource.RelationshipResource; import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction; import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo; @@ -37,10 +40,12 @@ import org.alfresco.rm.rest.api.impl.ApiNodesModelFactory; import org.alfresco.rm.rest.api.impl.FilePlanComponentsApiUtils; import org.alfresco.rm.rest.api.model.RetentionSchedule; import org.alfresco.rm.rest.api.recordcategories.RecordCategoriesEntityResource; +import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.namespace.QName; +import org.alfresco.service.namespace.RegexQNamePattern; import java.io.Serializable; import java.util.ArrayList; @@ -96,6 +101,11 @@ public class RetentionScheduleRelation implements RelationshipResourceAction.Rea mandatory("entity", nodeInfos); mandatory("parameters", parameters); NodeRef parentNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, recordCategoryId); + + if (checkCategoryHasAssocFolder(parentNodeRef) && nodeInfos.get(0).getIsRecordLevel()) + { + throw new UnprocessableContentException("Record level retention schedule cannot be created for a record category having folder associated."); + } List result = new ArrayList<>(); // Create the disposition schedule Map dsProps = new HashMap<>(); @@ -108,6 +118,14 @@ public class RetentionScheduleRelation implements RelationshipResourceAction.Rea return result; } + private boolean checkCategoryHasAssocFolder(NodeRef nodeRef) + { + List assocs = nodeService.getChildAssocs(nodeRef, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); + return assocs.stream() + .map(assoc -> nodeService.getType(assoc.getChildRef())) + .anyMatch(nodeType -> nodeType.equals(RecordsManagementModel.TYPE_RECORD_FOLDER)); + } + @Override @WebApiDescription(title = "Return a paged list of retention schedule based on the 'recordCategoryId'") public CollectionWithPagingInfo readAll(String recordCategoryId, Parameters parameters) diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml b/amps/ags/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml index 6ab10c5079..354cec9900 100644 --- a/amps/ags/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml +++ b/amps/ags/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml @@ -2683,6 +2683,8 @@ paths: description: recordCategoryId does not exist '409': description: Retention schedule already exist for the given recordCategoryId + '422': + description: Record level retention schedule cannot be created for a record category having folder associated default: description: Unexpected error schema: @@ -2742,13 +2744,13 @@ paths: ```JSON { "name":"accession", + "description":"Step Description", "periodAmount": 2, "period":"month", "periodProperty":"cm:created", - "combineDispositionStepConditions": false, + "combineRetentionStepConditions": false, "events":["versioned"], - "eligibleOnFirstCompleteEvent": true, - "description":"Step Description" + "eligibleOnFirstCompleteEvent": true } ``` operationId: createRetentionScheduleAction @@ -4534,20 +4536,20 @@ definitions: type: string name: type: string + description: + type: string periodAmount: type: integer period: type: string periodProperty: type: string - combineDispositionStepConditions: + combineRetentionStepConditions: type: boolean default: false eligibleOnFirstCompleteEvent: type: boolean default: true - description: - type: string retainRecordMetadataAfterDestruction: type: boolean location: @@ -4560,6 +4562,9 @@ definitions: type: integer RetentionStepNodeBodyCreate: type: object + required: + - name + - description properties: name: type: string @@ -4569,7 +4574,15 @@ definitions: * cutoff * accession * transfer - * destroy + * destroyContent + * destroyNode + + destroyNode step can be used to destroy content along with record metadata. + In case, record metadata needs to be retained, then destroyContent step should be used. + description: + type: string + description: | + This property is used to provide the step description. periodAmount: type: integer description: | @@ -4618,7 +4631,7 @@ definitions: * cm:created = Created Date (defult value) * rma:cutOffDate = Cut Off Date * rma:dispositionAsOf = Retention Action - combineDispositionStepConditions: + combineRetentionStepConditions: type: boolean description: | This property is only valid for **accession** step. @@ -4653,14 +4666,6 @@ definitions: description: | * false = When all events have happened * true = Whichever event is earlier - description: - type: string - description: | - This property is used to provide the step description. - retainRecordMetadataAfterDestruction: - type: boolean - description: | - This property is used to retain the metadata after record destruction. location: type: string description: | From 0e7660be83bb02f9c4ebacd7a8347a569fca62d2 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 3 Jul 2024 13:38:45 +0000 Subject: [PATCH 002/118] [maven-release-plugin][skip ci] prepare release 23.3.0.63 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index da604dde9f..741cf2512b 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 369f16ff48..744dfdd8a2 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 - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index d0a21c4cb0..1d5fcb2900 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 - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 7d13b2a3c8..8c7150049f 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 - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 37c330acea..1f7faf6510 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 - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 461d366003..5ad2eb817d 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 - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/amps/pom.xml b/amps/pom.xml index 8833e10762..a8981705a8 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 2ffc74bc31..94bcd850f6 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/core/pom.xml b/core/pom.xml index b1658281c6..c0ed80209d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/data-model/pom.xml b/data-model/pom.xml index 37b59eb6a9..032f1ac940 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/mmt/pom.xml b/mmt/pom.xml index deef149f0e..19d1865601 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 3a5d0ebad0..8e5399b55f 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index deeb184100..aa7bf0e65f 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/packaging/pom.xml b/packaging/pom.xml index 15bcb302d6..441b66066d 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 6712aa55a2..d42259f4e6 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 26f15be8ee..ce288666ee 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 - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index f6d07fe019..9b08509c98 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 - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 0665997e70..ffb41ec5ba 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 - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 4d13def062..284d4a9987 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 - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 09c252b4f1..282fecdba3 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 - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index d4208eefbb..1e1b78bd75 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/pom.xml b/pom.xml index e5d7153fcb..094d6decf1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.63-SNAPSHOT + 23.3.0.63 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.63 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 68d15be3ff..3c700e0803 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.63-SNAPSHOT + 23.3.0.63 diff --git a/repository/pom.xml b/repository/pom.xml index 1290166374..58b82ee676 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.63-SNAPSHOT + 23.3.0.63 From 638058629df0b33f17d30579611b8aa64182a659 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 3 Jul 2024 13:38:48 +0000 Subject: [PATCH 003/118] [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 741cf2512b..c2ffb5d44a 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 744dfdd8a2..61680c111e 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 - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 1d5fcb2900..fcf1b1d89d 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 - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 8c7150049f..3c51292d0f 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 - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 1f7faf6510..44554a346d 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 - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 5ad2eb817d..2303db8501 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 - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index a8981705a8..2f09196246 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 94bcd850f6..7bfaf4a59f 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index c0ed80209d..d487b2e36e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 032f1ac940..2f0c10e4f3 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 19d1865601..c3f0b2e6a9 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 8e5399b55f..6e31bf3bfe 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index aa7bf0e65f..cbb7d3ef87 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 441b66066d..0446463f7e 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index d42259f4e6..75dff1696f 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index ce288666ee..3aaf83d3ae 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 - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 9b08509c98..d7d6e4a070 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 - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index ffb41ec5ba..afe9095a94 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 - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 284d4a9987..42606a64b0 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 - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 282fecdba3..69d74a163f 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 - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 1e1b78bd75..01e2a626b2 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/pom.xml b/pom.xml index 094d6decf1..3a17b00be1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.63 + 23.3.0.64-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.63 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 3c700e0803..28ca19489b 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.63 + 23.3.0.64-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 58b82ee676..e5d7f16ce6 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.63 + 23.3.0.64-SNAPSHOT From 0e90fe971059bfb32152d093dd786dd97d8508aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Thu, 4 Jul 2024 12:34:53 +0200 Subject: [PATCH 004/118] ACS-8289 Bump ATS (#2737) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3a17b00be1..6a981788cf 100644 --- a/pom.xml +++ b/pom.xml @@ -51,8 +51,8 @@ 7.0.1 5.23.0 5.23.0 - 5.1.3-A3 - 4.1.3-A2 + 5.1.3 + 4.1.3 7.0 0.0.27 From bf2f123aa71d271ecf9da69c84a0607915ef6611 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 4 Jul 2024 11:22:16 +0000 Subject: [PATCH 005/118] [maven-release-plugin][skip ci] prepare release 23.3.0.64 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index c2ffb5d44a..ba2ccee379 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 61680c111e..208617668c 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 - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index fcf1b1d89d..e4e872c98b 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 - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 3c51292d0f..eb23131287 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 - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 44554a346d..06123e5311 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 - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 2303db8501..e6c083c016 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 - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/amps/pom.xml b/amps/pom.xml index 2f09196246..f7f378b49e 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 7bfaf4a59f..b99fb47b1e 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/core/pom.xml b/core/pom.xml index d487b2e36e..5a584cd72d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/data-model/pom.xml b/data-model/pom.xml index 2f0c10e4f3..30ab825c00 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/mmt/pom.xml b/mmt/pom.xml index c3f0b2e6a9..dab7995a98 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 6e31bf3bfe..57e346bb95 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index cbb7d3ef87..ddebb24933 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/packaging/pom.xml b/packaging/pom.xml index 0446463f7e..9443055942 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 75dff1696f..c7104e079a 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 3aaf83d3ae..077cba69ed 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 - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index d7d6e4a070..10d48201f3 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 - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index afe9095a94..0b0273e5db 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 - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 42606a64b0..b9fa521a88 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 - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 69d74a163f..f09eb9f523 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 - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 01e2a626b2..8343b0549f 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/pom.xml b/pom.xml index 6a981788cf..4bbc2754fa 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.64-SNAPSHOT + 23.3.0.64 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.64 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 28ca19489b..e7a8da2b34 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.64-SNAPSHOT + 23.3.0.64 diff --git a/repository/pom.xml b/repository/pom.xml index e5d7f16ce6..f22b8bc2b9 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.64-SNAPSHOT + 23.3.0.64 From 24c6abedb597391b37b58689e072153e081d1426 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 4 Jul 2024 11:22:18 +0000 Subject: [PATCH 006/118] [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 ba2ccee379..f182f50547 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 208617668c..556c42b4ec 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 - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index e4e872c98b..67af0e6ce5 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 - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index eb23131287..c7ff8e2f57 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 - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 06123e5311..b66f8d0709 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 - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index e6c083c016..172ec48a45 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 - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index f7f378b49e..5751430d99 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index b99fb47b1e..5ec93c6d0c 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 5a584cd72d..47254daac8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 30ab825c00..0b62af1592 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index dab7995a98..8718158718 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 57e346bb95..7568cf959a 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index ddebb24933..ee8834aaa4 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 9443055942..051a8bdcd3 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index c7104e079a..ebaebb8d59 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 077cba69ed..6dd10365a6 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 - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 10d48201f3..9b60b9f22d 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 - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 0b0273e5db..536f577fd8 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 - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index b9fa521a88..eb2cff988e 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 - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index f09eb9f523..1a14dd9f42 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 - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 8343b0549f..f723c96eb3 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/pom.xml b/pom.xml index 4bbc2754fa..9d66faef66 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.64 + 23.3.0.65-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.64 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index e7a8da2b34..3ecc0158b6 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.64 + 23.3.0.65-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index f22b8bc2b9..274d778a80 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.64 + 23.3.0.65-SNAPSHOT From b7224b3d207cd310153c6016a1050f6a6f4054e3 Mon Sep 17 00:00:00 2001 From: Sara Aspery Date: Thu, 4 Jul 2024 13:51:50 +0100 Subject: [PATCH 007/118] Bump SS/IE to 2.0.11 --- amps/ags/rm-community/rm-community-repo/.env | 2 +- packaging/tests/environment/.env | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/amps/ags/rm-community/rm-community-repo/.env b/amps/ags/rm-community/rm-community-repo/.env index dfa05f01bd..c528c95c4a 100644 --- a/amps/ags/rm-community/rm-community-repo/.env +++ b/amps/ags/rm-community/rm-community-repo/.env @@ -1,3 +1,3 @@ -SOLR6_TAG=2.0.11-A6 +SOLR6_TAG=2.0.11 POSTGRES_TAG=15.4 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8 diff --git a/packaging/tests/environment/.env b/packaging/tests/environment/.env index dfa05f01bd..c528c95c4a 100644 --- a/packaging/tests/environment/.env +++ b/packaging/tests/environment/.env @@ -1,3 +1,3 @@ -SOLR6_TAG=2.0.11-A6 +SOLR6_TAG=2.0.11 POSTGRES_TAG=15.4 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8 From f5c71e609871cd9df85aa9bb19b430d25cd9b373 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 4 Jul 2024 16:22:52 +0000 Subject: [PATCH 008/118] [maven-release-plugin][skip ci] prepare release 23.3.0.65 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index f182f50547..a78062a917 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 556c42b4ec..6c629c1e77 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 - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 67af0e6ce5..bd328cca4f 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 - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index c7ff8e2f57..8180be34bc 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 - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index b66f8d0709..180492e4de 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 - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 172ec48a45..6e4f8a01b6 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 - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/amps/pom.xml b/amps/pom.xml index 5751430d99..6f6eab2faf 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 5ec93c6d0c..2ac51f0442 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/core/pom.xml b/core/pom.xml index 47254daac8..5b769047bd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/data-model/pom.xml b/data-model/pom.xml index 0b62af1592..489afb1bd9 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/mmt/pom.xml b/mmt/pom.xml index 8718158718..d4a9b05df8 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 7568cf959a..53adca57d0 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index ee8834aaa4..a97fbb1761 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/packaging/pom.xml b/packaging/pom.xml index 051a8bdcd3..308eabf0af 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index ebaebb8d59..86c9c6bdbb 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 6dd10365a6..d6e1c72849 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 - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 9b60b9f22d..745c9b2004 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 - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 536f577fd8..d7e54170a9 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 - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index eb2cff988e..d0db2f59b5 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 - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 1a14dd9f42..f16022587a 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 - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index f723c96eb3..0d50f637af 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/pom.xml b/pom.xml index 9d66faef66..7bc9a6c6cd 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.65-SNAPSHOT + 23.3.0.65 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.65 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 3ecc0158b6..56c2ff246d 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.65-SNAPSHOT + 23.3.0.65 diff --git a/repository/pom.xml b/repository/pom.xml index 274d778a80..ca483e30bc 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.65-SNAPSHOT + 23.3.0.65 From e3175e9a985023758b2c509de51e7dadcfb06304 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 4 Jul 2024 16:22:54 +0000 Subject: [PATCH 009/118] [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 a78062a917..2ab8666628 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 6c629c1e77..c7c4f25942 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 - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index bd328cca4f..b1361ceb87 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 - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 8180be34bc..be9be709b5 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 - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 180492e4de..49166558f4 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 - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 6e4f8a01b6..a77c9d2d2f 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 - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 6f6eab2faf..5a00c2ccbb 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 2ac51f0442..5975adca45 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 5b769047bd..9cd3909de1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 489afb1bd9..151d5d01c1 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index d4a9b05df8..173c7a8c1d 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 53adca57d0..c518710cad 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index a97fbb1761..0169dfdb2a 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 308eabf0af..a1fccfe186 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 86c9c6bdbb..433c3b6109 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index d6e1c72849..65a269228a 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 - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 745c9b2004..94caf7066a 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 - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index d7e54170a9..70130841c9 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 - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index d0db2f59b5..e84f248b4d 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 - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index f16022587a..eafa11c49a 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 - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 0d50f637af..4a4ca85bca 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/pom.xml b/pom.xml index 7bc9a6c6cd..b549c71e16 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.65 + 23.3.0.66-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.65 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 56c2ff246d..8d506a98d6 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.65 + 23.3.0.66-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index ca483e30bc..4fa7709ab3 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.65 + 23.3.0.66-SNAPSHOT From 3421bcb5322216e067128325c0cf5100e06f2550 Mon Sep 17 00:00:00 2001 From: Alfresco CI User Date: Sun, 7 Jul 2024 00:03:55 +0000 Subject: [PATCH 010/118] [force] Force release for 2024-07-07. From 9a48b09f32d3eadc349671bb7dd8d24059a5ca68 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 7 Jul 2024 00:11:06 +0000 Subject: [PATCH 011/118] [maven-release-plugin][skip ci] prepare release 23.3.0.66 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 2ab8666628..db23b48028 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index c7c4f25942..6a77f1d934 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 - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index b1361ceb87..7ab0bb7141 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 - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index be9be709b5..dafcb357ff 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 - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 49166558f4..4cd8ae7510 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 - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index a77c9d2d2f..cb5124f052 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 - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/amps/pom.xml b/amps/pom.xml index 5a00c2ccbb..3d840eea61 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 5975adca45..117551913b 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/core/pom.xml b/core/pom.xml index 9cd3909de1..1cc19f487f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/data-model/pom.xml b/data-model/pom.xml index 151d5d01c1..82441239de 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/mmt/pom.xml b/mmt/pom.xml index 173c7a8c1d..87e27e6753 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index c518710cad..4cc33a6bb8 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 0169dfdb2a..f6d9169600 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/packaging/pom.xml b/packaging/pom.xml index a1fccfe186..2c169a7f59 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 433c3b6109..83029f5c82 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 65a269228a..c2008e0337 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 - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 94caf7066a..4307c93d4b 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 - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 70130841c9..791e1c594a 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 - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index e84f248b4d..3aafadb354 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 - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index eafa11c49a..3abfd717a1 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 - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 4a4ca85bca..229d68574e 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/pom.xml b/pom.xml index b549c71e16..1a0f7abf81 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.66-SNAPSHOT + 23.3.0.66 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.66 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 8d506a98d6..0cdd3f8c41 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.66-SNAPSHOT + 23.3.0.66 diff --git a/repository/pom.xml b/repository/pom.xml index 4fa7709ab3..c807806c8b 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.66-SNAPSHOT + 23.3.0.66 From c8718ca722d789587a961e7c04270a605ad19a11 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 7 Jul 2024 00:11:08 +0000 Subject: [PATCH 012/118] [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 db23b48028..bcf53bdc7d 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 6a77f1d934..6e7211c0f6 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 - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 7ab0bb7141..de23d1adb2 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 - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index dafcb357ff..041a3d6d26 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 - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 4cd8ae7510..44a91e207d 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 - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index cb5124f052..e1c7f1fb38 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 - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 3d840eea61..e0fd9fdd9d 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 117551913b..9f2de79bc5 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 1cc19f487f..1bfc662de9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 82441239de..13a38a9c8d 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 87e27e6753..0b2fa23289 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 4cc33a6bb8..606df766e4 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index f6d9169600..1926b21d8d 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 2c169a7f59..f753108a67 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 83029f5c82..d3a99b16fe 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index c2008e0337..33e751e7a7 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 - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 4307c93d4b..c60b5a57f0 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 - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 791e1c594a..a9ac491ac6 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 - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 3aafadb354..f9088f00eb 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 - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 3abfd717a1..b0a50a1cdd 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 - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 229d68574e..cb24c01513 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1a0f7abf81..6388b48904 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.66 + 23.3.0.67-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.66 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 0cdd3f8c41..ec02ebb4ec 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.66 + 23.3.0.67-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index c807806c8b..559fc62d28 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.66 + 23.3.0.67-SNAPSHOT From 195f5b1a8cec9b534a122bc1cb5ed07c372adce1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 09:04:41 +0200 Subject: [PATCH 013/118] Bump org.assertj:assertj-core from 3.24.2 to 3.26.3 (#2769) Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.26.3. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.26.3) --- updated-dependencies: - dependency-name: org.assertj:assertj-core 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6388b48904..3d41211c01 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 9.0 1.78.1 5.4.0 - 3.24.2 + 3.26.3 20231013 2.9.0 2.14.0 From b532ba9d54a19018a0cfe46035b23fccf2845d9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 09:05:29 +0200 Subject: [PATCH 014/118] Bump org.springframework.security:spring-security-bom (#2698) Bumps [org.springframework.security:spring-security-bom](https://github.com/spring-projects/spring-security) from 6.3.0 to 6.3.1. - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/6.3.0...6.3.1) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-bom 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 3d41211c01..5a3d1a8fa0 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 1.9.20.1 6.0.19 - 6.3.0 + 6.3.1 3.5.3 2.15.2 4.0.2 From 628d299980f7bc25cace259f0302ebf7bdec8140 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 09:06:59 +0200 Subject: [PATCH 015/118] Bump org.apache.httpcomponents.core5:httpcore5 from 5.2.3 to 5.2.5 (#2736) Bumps [org.apache.httpcomponents.core5:httpcore5](https://github.com/apache/httpcomponents-core) from 5.2.3 to 5.2.5. - [Changelog](https://github.com/apache/httpcomponents-core/blob/rel/v5.2.5/RELEASE_NOTES.txt) - [Commits](https://github.com/apache/httpcomponents-core/compare/rel/v5.2.3...rel/v5.2.5) --- updated-dependencies: - dependency-name: org.apache.httpcomponents.core5:httpcore5 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 5a3d1a8fa0..570d552b68 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 4.5.14 4.4.16 5.2.1 - 5.2.3 + 5.2.5 3.1-HTTPCLIENT-1265 2.12.2 2.0.9 From d0323836ad21fcb79a4dc862faf724042b8a3bd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 09:07:35 +0200 Subject: [PATCH 016/118] Bump org.codehaus.cargo:cargo-maven3-plugin from 1.10.9 to 1.10.14 (#2735) Bumps org.codehaus.cargo:cargo-maven3-plugin from 1.10.9 to 1.10.14. --- 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 570d552b68..771818e9cf 100644 --- a/pom.xml +++ b/pom.xml @@ -1074,7 +1074,7 @@ org.codehaus.cargo cargo-maven3-plugin - 1.10.9 + 1.10.14 org.apache.maven.plugins From c085d425310b637c2b75bed0453790ef88b0a625 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 09:08:02 +0200 Subject: [PATCH 017/118] Bump org.codehaus.groovy:groovy from 3.0.19 to 3.0.22 (#2733) Bumps [org.codehaus.groovy:groovy](https://github.com/apache/groovy) from 3.0.19 to 3.0.22. - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy 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> --- packaging/tests/tas-restapi/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index f9088f00eb..b1c9bb8f12 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -171,7 +171,7 @@ org.codehaus.groovy groovy - 3.0.19 + 3.0.22 diff --git a/pom.xml b/pom.xml index 771818e9cf..c7cd9611f1 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 2.12.2 2.0.9 2.20.0 - 3.0.19 + 3.0.22 2.9.2 7.7.10 5.2.5 From 91b91e3dee81e861fad04703f6c9ceff3577c4ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 09:43:54 +0200 Subject: [PATCH 018/118] Bump org.projectlombok:lombok from 1.18.30 to 1.18.34 (#2729) Bumps [org.projectlombok:lombok](https://github.com/projectlombok/lombok) from 1.18.30 to 1.18.34. - [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/projectlombok/lombok/compare/v1.18.30...v1.18.34) --- updated-dependencies: - dependency-name: org.projectlombok:lombok 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 c7cd9611f1..c38ee39f90 100644 --- a/pom.xml +++ b/pom.xml @@ -936,7 +936,7 @@ org.projectlombok lombok - 1.18.30 + 1.18.34 provided From dee36744945a73608df41f664d42d6167956c80c Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 10 Jul 2024 09:41:24 +0000 Subject: [PATCH 019/118] [maven-release-plugin][skip ci] prepare release 23.3.0.67 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index bcf53bdc7d..f4bc51e784 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 6e7211c0f6..469e205b34 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 - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index de23d1adb2..35c0c90e70 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 - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 041a3d6d26..4b7d7e7be4 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 - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 44a91e207d..b0d6b3f82c 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 - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index e1c7f1fb38..f340718158 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 - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/amps/pom.xml b/amps/pom.xml index e0fd9fdd9d..375bbb3953 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 9f2de79bc5..1dd885ad9d 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/core/pom.xml b/core/pom.xml index 1bfc662de9..c1041c9a49 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/data-model/pom.xml b/data-model/pom.xml index 13a38a9c8d..7ddf3cec79 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/mmt/pom.xml b/mmt/pom.xml index 0b2fa23289..e721f4d6be 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 606df766e4..d9154b8b40 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 1926b21d8d..a890f883ba 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/packaging/pom.xml b/packaging/pom.xml index f753108a67..69eb084d2a 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index d3a99b16fe..ca32db3909 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 33e751e7a7..bd18990ac2 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 - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index c60b5a57f0..fd06c03ab8 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 - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index a9ac491ac6..1bb72d586b 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 - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index b1c9bb8f12..a3f7404300 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 - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index b0a50a1cdd..7c34217172 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 - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index cb24c01513..ae06922d51 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/pom.xml b/pom.xml index c38ee39f90..825d1ac801 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.67-SNAPSHOT + 23.3.0.67 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.67 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index ec02ebb4ec..a6915a6973 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.67-SNAPSHOT + 23.3.0.67 diff --git a/repository/pom.xml b/repository/pom.xml index 559fc62d28..35db1e5a48 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.67-SNAPSHOT + 23.3.0.67 From 90fad5d4e8615ccd74deaba961685fa3d53d740d Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 10 Jul 2024 09:41:26 +0000 Subject: [PATCH 020/118] [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 f4bc51e784..87deed6873 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 469e205b34..0802268741 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 - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 35c0c90e70..aead87e010 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 - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 4b7d7e7be4..aeed36ea0e 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 - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index b0d6b3f82c..20b9c23780 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 - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index f340718158..c87f1b708f 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 - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 375bbb3953..18adf8338c 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 1dd885ad9d..beef4accb9 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index c1041c9a49..873987dc20 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 7ddf3cec79..98076c8f03 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index e721f4d6be..a3a4eef839 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index d9154b8b40..deb84dce53 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index a890f883ba..52322920e0 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 69eb084d2a..facbc3a8bb 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index ca32db3909..a8063cd121 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index bd18990ac2..f1a7c6d3d5 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 - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index fd06c03ab8..b1a4cd2d08 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 - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 1bb72d586b..6726556963 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 - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index a3f7404300..3f9d2dd098 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 - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 7c34217172..530a344a46 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 - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index ae06922d51..e150bd014e 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/pom.xml b/pom.xml index 825d1ac801..aa8bd84ea9 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.67 + 23.3.0.68-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.67 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index a6915a6973..9a7ec00eb2 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.67 + 23.3.0.68-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 35db1e5a48..01ec0f3a2e 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.67 + 23.3.0.68-SNAPSHOT From 23116650039f614fe377539d0422b3488e0bc566 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:21:02 +0200 Subject: [PATCH 021/118] Bump dependency.jackson.version from 2.15.2 to 2.17.2 (#2759) Bumps `dependency.jackson.version` from 2.15.2 to 2.17.2. Updates `com.fasterxml.jackson.core:jackson-core` from 2.15.2 to 2.17.2 - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.15.2...jackson-core-2.17.2) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.15.2 to 2.17.2 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.datatype:jackson-datatype-joda` from 2.15.2 to 2.17.2 - [Commits](https://github.com/FasterXML/jackson-datatype-joda/compare/jackson-datatype-joda-2.15.2...jackson-datatype-joda-2.17.2) Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-yaml` from 2.15.2 to 2.17.2 - [Commits](https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.15.2...jackson-dataformats-text-2.17.2) Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.15.2 to 2.17.2 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.module:jackson-module-jaxb-annotations` from 2.15.2 to 2.17.2 - [Commits](https://github.com/FasterXML/jackson-modules-base/compare/jackson-modules-base-2.15.2...jackson-modules-base-2.17.2) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-joda dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.module:jackson-module-jaxb-annotations 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa8bd84ea9..6f6d027633 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 6.0.19 6.3.1 3.5.3 - 2.15.2 + 2.17.2 4.0.2 1.0.0-jakarta-1 9.0 From 3aeb049d6b75c88c811e16502d235a9cc133b119 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:21:39 +0200 Subject: [PATCH 022/118] Bump dependency.rest-assured.version from 5.3.2 to 5.5.0 (#2761) Bumps `dependency.rest-assured.version` from 5.3.2 to 5.5.0. Updates `io.rest-assured:rest-assured` from 5.3.2 to 5.5.0 - [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt) - [Commits](https://github.com/rest-assured/rest-assured/commits/rest-assured-5.5.0) Updates `io.rest-assured:json-path` from 5.3.2 to 5.5.0 - [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt) - [Commits](https://github.com/rest-assured/rest-assured/commits/rest-assured-5.5.0) Updates `io.rest-assured:xml-path` from 5.3.2 to 5.5.0 - [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt) - [Commits](https://github.com/rest-assured/rest-assured/commits/rest-assured-5.5.0) Updates `io.rest-assured:json-schema-validator` from 5.3.2 to 5.5.0 --- updated-dependencies: - dependency-name: io.rest-assured:rest-assured dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: io.rest-assured:json-path dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.rest-assured:xml-path dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.rest-assured:json-schema-validator 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6f6d027633..06f3e64728 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,7 @@ 8 2.7.4 5.0.1 - 5.3.2 + 5.5.0 2.0.0 1.21 1.19 From 8ee8be1696411fd7729bfdf22000522c8cc31237 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:22:12 +0200 Subject: [PATCH 023/118] Bump com.networknt:json-schema-validator from 1.0.86 to 1.5.0 (#2760) Bumps [com.networknt:json-schema-validator](https://github.com/networknt/json-schema-validator) from 1.0.86 to 1.5.0. - [Release notes](https://github.com/networknt/json-schema-validator/releases) - [Changelog](https://github.com/networknt/json-schema-validator/blob/master/CHANGELOG.md) - [Commits](https://github.com/networknt/json-schema-validator/compare/1.0.86...1.5.0) --- updated-dependencies: - dependency-name: com.networknt:json-schema-validator dependency-type: direct:development update-type: version-update:semver-minor ... 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 06f3e64728..9f1c72e411 100644 --- a/pom.xml +++ b/pom.xml @@ -700,7 +700,7 @@ com.networknt json-schema-validator - 1.0.86 + 1.5.0 From fcc4bc9ac4427349d76d7d11283daf9510620453 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:22:50 +0200 Subject: [PATCH 024/118] Bump org.eclipse.jetty:jetty-webapp from 11.0.16 to 11.0.22 (#2739) Bumps org.eclipse.jetty:jetty-webapp from 11.0.16 to 11.0.22. --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-webapp dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- remote-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 9a7ec00eb2..8c76c24a1f 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -137,7 +137,7 @@ org.eclipse.jetty jetty-webapp - 11.0.16 + 11.0.22 test From fc8c37b1e28b513394d073d31b9005533ff774ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:23:12 +0200 Subject: [PATCH 025/118] Bump commons-logging:commons-logging from 1.2 to 1.3.3 (#2740) Bumps commons-logging:commons-logging from 1.2 to 1.3.3. --- updated-dependencies: - dependency-name: commons-logging:commons-logging 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f1c72e411..79a72d36f0 100644 --- a/pom.xml +++ b/pom.xml @@ -401,7 +401,7 @@ commons-logging commons-logging - 1.2 + 1.3.3 commons-beanutils From f4a89937ef07d2fcdffe539e79a5e3721768f49c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:26:12 +0200 Subject: [PATCH 026/118] Bump org.apache.maven.plugins:maven-dependency-plugin (#2707) Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.6.0 to 3.7.1. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.6.0...maven-dependency-plugin-3.7.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 79a72d36f0..1e037d2b20 100644 --- a/pom.xml +++ b/pom.xml @@ -1024,7 +1024,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.6.0 + 3.7.1 maven-assembly-plugin From c06b210056b6d8a36e0871f0f390ca09bae45980 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:26:37 +0200 Subject: [PATCH 027/118] Bump org.apache.maven.plugins:maven-jar-plugin from 3.3.0 to 3.4.2 (#2703) Bumps [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.3.0 to 3.4.2. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.3.0...maven-jar-plugin-3.4.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-jar-plugin 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1e037d2b20..f625659952 100644 --- a/pom.xml +++ b/pom.xml @@ -1005,7 +1005,7 @@ maven-jar-plugin - 3.3.0 + 3.4.2 maven-war-plugin From 1bcde87d4206ea179fc3e49c38a610cdbf9a2abc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:08:59 +0200 Subject: [PATCH 028/118] Bump commons-net:commons-net from 3.9.0 to 3.11.1 (#2685) Bumps commons-net:commons-net from 3.9.0 to 3.11.1. --- updated-dependencies: - dependency-name: commons-net:commons-net dependency-type: direct:development update-type: version-update:semver-minor ... 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 f625659952..1f7746252c 100644 --- a/pom.xml +++ b/pom.xml @@ -442,7 +442,7 @@ commons-net commons-net - 3.9.0 + 3.11.1 org.apache.httpcomponents From 02b43f42ef98c4499c20bfb087c32597413aef85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:10:24 +0200 Subject: [PATCH 029/118] Bump com.google.guava:guava from 32.1.2-jre to 33.2.1-jre (#2674) Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.1.2-jre to 33.2.1-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-major ... 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 1f7746252c..47d6a57401 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ 2.9.0 2.14.0 2.10.1 - 32.1.2-jre + 33.2.1-jre 4.5.14 4.4.16 5.2.1 From 5da314f03a2776d6e3e610fcd2c0b0eac153f1fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:11:23 +0200 Subject: [PATCH 030/118] Bump commons-validator:commons-validator from 1.7 to 1.9.0 (#2671) Bumps commons-validator:commons-validator from 1.7 to 1.9.0. --- updated-dependencies: - dependency-name: commons-validator:commons-validator 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> --- repository/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/pom.xml b/repository/pom.xml index 01ec0f3a2e..b87220bbc4 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -120,7 +120,7 @@ commons-validator commons-validator - 1.7 + 1.9.0 org.json From 267a776620674362b5bae0e3d7f1b4e50d6763fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:11:48 +0200 Subject: [PATCH 031/118] Bump org.apache.xmlbeans:xmlbeans from 5.2.0 to 5.2.1 (#2666) Bumps org.apache.xmlbeans:xmlbeans from 5.2.0 to 5.2.1. --- updated-dependencies: - dependency-name: org.apache.xmlbeans:xmlbeans 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 47d6a57401..63c2291887 100644 --- a/pom.xml +++ b/pom.xml @@ -462,7 +462,7 @@ org.apache.xmlbeans xmlbeans - 5.2.0 + 5.2.1 org.json From 36286e76e9f32bd07b99dd170c6eabbf43e548d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:12:56 +0200 Subject: [PATCH 032/118] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.5.0 to 3.7.0 (#2676) Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.5.0 to 3.7.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.5.0...maven-javadoc-plugin-3.7.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 63c2291887..2d6eda74e0 100644 --- a/pom.xml +++ b/pom.xml @@ -1014,7 +1014,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.7.0 org.apache.maven.plugins From 2a07b65e25d9b38a60bb9f0a1111919644499bbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:13:33 +0200 Subject: [PATCH 033/118] Bump org.apache.commons:commons-compress from 1.26.0 to 1.26.2 (#2662) Bumps org.apache.commons:commons-compress from 1.26.0 to 1.26.2. --- updated-dependencies: - dependency-name: org.apache.commons:commons-compress 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 2d6eda74e0..48178fd485 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 4.0.5 4.1.110.Final 5.18.3 - 1.26.0 + 1.26.2 4.2.0 4.1.3 1.0.67 From c89871c4fac8fba1ac953f4647c51a8113d726e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:14:16 +0200 Subject: [PATCH 034/118] Bump org.mockito:mockito-core from 5.4.0 to 5.12.0 (#2642) Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.4.0 to 5.12.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.4.0...v5.12.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 48178fd485..6be6157270 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 1.0.0-jakarta-1 9.0 1.78.1 - 5.4.0 + 5.12.0 3.26.3 20231013 2.9.0 From b29afa2248977079b4b483eeeb99e6d584ee976e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:15:43 +0200 Subject: [PATCH 035/118] Bump dependency.aspectj.version from 1.9.20.1 to 1.9.22.1 (#2641) Bumps `dependency.aspectj.version` from 1.9.20.1 to 1.9.22.1. Updates `org.aspectj:aspectjrt` from 1.9.20.1 to 1.9.22.1 - [Release notes](https://github.com/eclipse/org.aspectj/releases) - [Commits](https://github.com/eclipse/org.aspectj/commits) Updates `org.aspectj:aspectjtools` from 1.9.20.1 to 1.9.22.1 - [Release notes](https://github.com/eclipse/org.aspectj/releases) - [Commits](https://github.com/eclipse/org.aspectj/commits) --- updated-dependencies: - dependency-name: org.aspectj:aspectjrt dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.aspectj:aspectjtools 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 6be6157270..3645e77e11 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 7.0 0.0.27 - 1.9.20.1 + 1.9.22.1 6.0.19 6.3.1 3.5.3 From 34357a83d8706f183ec1db34c4167da44902b11d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:16:14 +0200 Subject: [PATCH 036/118] Bump Alfresco/ya-pmd-scan from 3.0.0 to 3.0.2 (#2631) Bumps [Alfresco/ya-pmd-scan](https://github.com/alfresco/ya-pmd-scan) from 3.0.0 to 3.0.2. - [Release notes](https://github.com/alfresco/ya-pmd-scan/releases) - [Commits](https://github.com/alfresco/ya-pmd-scan/compare/v3.0.0...v3.0.2) --- updated-dependencies: - dependency-name: Alfresco/ya-pmd-scan 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> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4870b158ad..ed1a376b51 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -138,7 +138,7 @@ jobs: - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2 - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2 - - uses: Alfresco/ya-pmd-scan@v3.0.0 + - uses: Alfresco/ya-pmd-scan@v3.0.2 with: classpath-build-command: "mvn test-compile -ntp -Pags -pl \"-:alfresco-community-repo-docker\"" From cb89ed65fb0b4b5f682b0eb1966b92a49fd9816e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:17:09 +0200 Subject: [PATCH 037/118] Bump io.swagger:swagger-parser from 1.0.67 to 1.0.71 (#2621) Bumps [io.swagger:swagger-parser](https://github.com/swagger-api/swagger-parser) from 1.0.67 to 1.0.71. - [Release notes](https://github.com/swagger-api/swagger-parser/releases) - [Commits](https://github.com/swagger-api/swagger-parser/compare/v1.0.67...v1.0.71) --- updated-dependencies: - dependency-name: io.swagger:swagger-parser dependency-type: direct:development 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 3645e77e11..9348f9d632 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ 1.26.2 4.2.0 4.1.3 - 1.0.67 + 1.0.71 3.1.1 3.8.6 2.0.6.1 From 971f8c9b46b4a168cf26fe0f775495b77b60c138 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:27:35 +0200 Subject: [PATCH 038/118] Bump com.github.docker-java:docker-java from 3.3.2 to 3.3.6 (#2479) Bumps [com.github.docker-java:docker-java](https://github.com/docker-java/docker-java) from 3.3.2 to 3.3.6. - [Release notes](https://github.com/docker-java/docker-java/releases) - [Changelog](https://github.com/docker-java/docker-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/docker-java/docker-java/compare/3.3.2...3.3.6) --- updated-dependencies: - dependency-name: com.github.docker-java:docker-java 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> --- amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 aead87e010..a3260f9dc3 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 @@ -98,7 +98,7 @@ com.github.docker-java docker-java - 3.3.2 + 3.3.6 org.bouncycastle From 0e9633fa5bf1c9e10d24373d1e2a84db425b1aec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:30:04 +0200 Subject: [PATCH 039/118] Bump commons-io:commons-io from 2.14.0 to 2.16.1 (#2575) Bumps commons-io:commons-io from 2.14.0 to 2.16.1. --- updated-dependencies: - dependency-name: commons-io:commons-io 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9348f9d632..0917d17390 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 3.26.3 20231013 2.9.0 - 2.14.0 + 2.16.1 2.10.1 33.2.1-jre 4.5.14 From c831a5e23d223a517c78aa3beb4e5424495c286e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:31:03 +0200 Subject: [PATCH 040/118] Bump org.eclipse.parsson:parsson from 1.1.4 to 1.1.6 (#2572) Bumps [org.eclipse.parsson:parsson](https://github.com/eclipse-ee4j/parsson) from 1.1.4 to 1.1.6. - [Release notes](https://github.com/eclipse-ee4j/parsson/releases) - [Commits](https://github.com/eclipse-ee4j/parsson/compare/1.1.4...1.1.6) --- updated-dependencies: - dependency-name: org.eclipse.parsson:parsson 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 0917d17390..aed68bf1d0 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ 3.0.0 1.2.0 2.1.2 - 1.1.4 + 1.1.6 2.9.0 2.5.0 4.1.0 From aac9be688746b8f4262b488f28cd0fc62a2bb6a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:35:08 +0200 Subject: [PATCH 041/118] Bump net.minidev:json-smart from 2.5.0 to 2.5.1 (#2532) Bumps [net.minidev:json-smart](https://github.com/netplex/json-smart-v2) from 2.5.0 to 2.5.1. - [Release notes](https://github.com/netplex/json-smart-v2/releases) - [Commits](https://github.com/netplex/json-smart-v2/compare/2.5.0...2.5.1) --- updated-dependencies: - dependency-name: net.minidev:json-smart 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 aed68bf1d0..b4a76b0efa 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ 2.1.2 1.1.6 2.9.0 - 2.5.0 + 2.5.1 4.1.0 3.1.0-A1 23.2.0 From b6a56cb0f8f5f5654ca3057433b9e95e84717ca3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:35:41 +0200 Subject: [PATCH 042/118] Bump org.apache.maven.plugins:maven-compiler-plugin (#2519) Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.13.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.13.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b4a76b0efa..b8d1d98ecf 100644 --- a/pom.xml +++ b/pom.xml @@ -975,7 +975,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 -parameters From af4e0c0a01f4601db08b527fc5ce284afa61f5d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:36:39 +0200 Subject: [PATCH 043/118] Bump dependency.cxf.version from 4.0.2 to 4.0.4 (#2505) Bumps `dependency.cxf.version` from 4.0.2 to 4.0.4. Updates `org.apache.cxf:cxf-rt-frontend-jaxws` from 4.0.2 to 4.0.4 Updates `org.apache.cxf:cxf-rt-frontend-jaxrs` from 4.0.2 to 4.0.4 Updates `org.apache.cxf:cxf-rt-rs-client` from 4.0.2 to 4.0.4 Updates `org.apache.cxf:cxf-rt-transports-http` from 4.0.2 to 4.0.4 Updates `org.apache.cxf:cxf-rt-ws-policy` from 4.0.2 to 4.0.4 --- updated-dependencies: - dependency-name: org.apache.cxf:cxf-rt-frontend-jaxws dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-frontend-jaxrs dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-rs-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-transports-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-ws-policy 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 b8d1d98ecf..5d637e6b14 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 6.3.1 3.5.3 2.17.2 - 4.0.2 + 4.0.4 1.0.0-jakarta-1 9.0 1.78.1 From df00db7cb7c695122258cd3108ddd80df948fe9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:37:30 +0200 Subject: [PATCH 044/118] Bump dependency.log4j.version from 2.20.0 to 2.23.1 (#2499) Bumps `dependency.log4j.version` from 2.20.0 to 2.23.1. Updates `org.apache.logging.log4j:log4j-slf4j2-impl` from 2.20.0 to 2.23.1 Updates `org.apache.logging.log4j:log4j-api` from 2.20.0 to 2.23.1 Updates `org.apache.logging.log4j:log4j-core` from 2.20.0 to 2.23.1 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-slf4j2-impl dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-core 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d637e6b14..883193a912 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ 3.1-HTTPCLIENT-1265 2.12.2 2.0.9 - 2.20.0 + 2.23.1 3.0.22 2.9.2 7.7.10 From cb3934eb960fec649e17859011def1666c5c09ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:38:44 +0200 Subject: [PATCH 045/118] Bump org.apache.maven.plugins:maven-assembly-plugin from 3.6.0 to 3.7.1 (#2521) Bumps [org.apache.maven.plugins:maven-assembly-plugin](https://github.com/apache/maven-assembly-plugin) from 3.6.0 to 3.7.1. - [Release notes](https://github.com/apache/maven-assembly-plugin/releases) - [Commits](https://github.com/apache/maven-assembly-plugin/compare/maven-assembly-plugin-3.6.0...maven-assembly-plugin-3.7.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-assembly-plugin 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 883193a912..0edb77a3b0 100644 --- a/pom.xml +++ b/pom.xml @@ -1028,7 +1028,7 @@ maven-assembly-plugin - 3.6.0 + 3.7.1 org.alfresco.maven.plugin From b3f5cf9f769f0212cccb6ab660cc560367454ea5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:41:01 +0200 Subject: [PATCH 046/118] Bump jakarta.xml.bind:jakarta.xml.bind-api from 4.0.0 to 4.0.2 (#2495) Bumps [jakarta.xml.bind:jakarta.xml.bind-api](https://github.com/jakartaee/jaxb-api) from 4.0.0 to 4.0.2. - [Release notes](https://github.com/jakartaee/jaxb-api/releases) - [Commits](https://github.com/jakartaee/jaxb-api/compare/4.0.0...4.0.2) --- updated-dependencies: - dependency-name: jakarta.xml.bind:jakarta.xml.bind-api 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 0edb77a3b0..f62393c620 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ 2.0.6.1 3.1.6 - 4.0.0 + 4.0.2 4.0.3 3.0.1 2.0.1 From 5f0c65b5519cb9e00adcc17abbc939d823b364b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:42:31 +0200 Subject: [PATCH 047/118] Bump dependency.jakarta-ee-jaxb-impl.version from 4.0.3 to 4.0.5 (#2494) Bumps `dependency.jakarta-ee-jaxb-impl.version` from 4.0.3 to 4.0.5. Updates `org.glassfish.jaxb:jaxb-runtime` from 4.0.3 to 4.0.5 Updates `org.glassfish.jaxb:jaxb-core` from 4.0.3 to 4.0.5 --- updated-dependencies: - dependency-name: org.glassfish.jaxb:jaxb-runtime dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.glassfish.jaxb:jaxb-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 f62393c620..bc69fe74b8 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ 3.1.6 4.0.2 - 4.0.3 + 4.0.5 3.0.1 2.0.1 2.1.1 From 8fc2da1ce937e491dd1a5dc505bc57ebcab28110 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:43:39 +0200 Subject: [PATCH 048/118] Bump org.apache.commons:commons-dbcp2 from 2.9.0 to 2.12.0 (#2486) Bumps org.apache.commons:commons-dbcp2 from 2.9.0 to 2.12.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-dbcp2 dependency-type: direct:development update-type: version-update:semver-minor ... 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 bc69fe74b8..d4476feec7 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 5.12.0 3.26.3 20231013 - 2.9.0 + 2.12.0 2.16.1 2.10.1 33.2.1-jre From 4f03115b69e6ed10bea314029bb93233c358da60 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:44:13 +0200 Subject: [PATCH 049/118] Bump org.jsoup:jsoup from 1.16.1 to 1.18.1 (#2770) Bumps [org.jsoup:jsoup](https://github.com/jhy/jsoup) from 1.16.1 to 1.18.1. - [Release notes](https://github.com/jhy/jsoup/releases) - [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES.md) - [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.16.1...jsoup-1.18.1) --- updated-dependencies: - dependency-name: org.jsoup:jsoup dependency-type: direct:development update-type: version-update:semver-minor ... 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 d4476feec7..4b778de39a 100644 --- a/pom.xml +++ b/pom.xml @@ -706,7 +706,7 @@ org.jsoup jsoup - 1.16.1 + 1.18.1 From ae88784bdb0a6dd80c4469077dd83e251be74ffb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:44:34 +0200 Subject: [PATCH 050/118] Bump org.apache.commons:commons-email from 1.5 to 1.6.0 (#2386) Bumps org.apache.commons:commons-email from 1.5 to 1.6.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-email 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b778de39a..0797fba030 100644 --- a/pom.xml +++ b/pom.xml @@ -621,7 +621,7 @@ org.apache.commons commons-email - 1.5 + 1.6.0 org.alfresco.aos-module From ca3a7663a081ab17f8a772bdc3e7b9f65be94ae6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:45:54 +0200 Subject: [PATCH 051/118] Bump org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0 (#2335) Bumps org.apache.commons:commons-lang3 from 3.13.0 to 3.14.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 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> --- packaging/tests/tas-restapi/pom.xml | 2 +- repository/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 3f9d2dd098..103446235e 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -17,7 +17,7 @@ UTF-8 master 4.5.6 - 3.13.0 + 3.14.0 8.3.3 17 diff --git a/repository/pom.xml b/repository/pom.xml index b87220bbc4..d1a65716c2 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -94,7 +94,7 @@ org.apache.commons commons-lang3 - 3.13.0 + 3.14.0 commons-codec From 92c1b2fb9d529ae4a8bbe87acb06e4135691a31c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:46:16 +0200 Subject: [PATCH 052/118] Bump org.mybatis:mybatis-spring from 3.0.2 to 3.0.3 (#2330) Bumps [org.mybatis:mybatis-spring](https://github.com/mybatis/spring) from 3.0.2 to 3.0.3. - [Release notes](https://github.com/mybatis/spring/releases) - [Commits](https://github.com/mybatis/spring/compare/mybatis-spring-3.0.2...mybatis-spring-3.0.3) --- updated-dependencies: - dependency-name: org.mybatis:mybatis-spring 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> --- repository/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/pom.xml b/repository/pom.xml index d1a65716c2..ee8ad791eb 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -402,7 +402,7 @@ org.mybatis mybatis-spring - 3.0.2 + 3.0.3 From fbc5b738ab0f3ef59ce961c196ef1743f210ad59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:47:00 +0200 Subject: [PATCH 053/118] Bump com.sun.xml.fastinfoset:FastInfoset from 2.1.0 to 2.1.1 (#2265) Bumps com.sun.xml.fastinfoset:FastInfoset from 2.1.0 to 2.1.1. --- updated-dependencies: - dependency-name: com.sun.xml.fastinfoset:FastInfoset 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> --- repository/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/pom.xml b/repository/pom.xml index ee8ad791eb..bc12c602c6 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -273,7 +273,7 @@ com.sun.xml.fastinfoset FastInfoset - 2.1.0 + 2.1.1 org.htmlparser From 12b986373ed620a5e964c624f8dd2f6b26a16af6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:47:24 +0200 Subject: [PATCH 054/118] Bump jakarta.jms:jakarta.jms-api from 3.0.0 to 3.1.0 (#2131) Bumps jakarta.jms:jakarta.jms-api from 3.0.0 to 3.1.0. --- updated-dependencies: - dependency-name: jakarta.jms:jakarta.jms-api 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0797fba030..08f47af6e6 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ 3.0.0 2.0.1 2.0.1 - 3.0.0 + 3.1.0 1.2.0 2.1.2 1.1.6 From 22bd9450033ac0a594a8002e949b680e280bbaf9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:49:35 +0200 Subject: [PATCH 055/118] Bump com.ibm.icu:icu4j from 73.2 to 75.1 (#2595) Bumps [com.ibm.icu:icu4j](https://github.com/unicode-org/icu) from 73.2 to 75.1. - [Release notes](https://github.com/unicode-org/icu/releases) - [Commits](https://github.com/unicode-org/icu/commits) --- updated-dependencies: - dependency-name: com.ibm.icu:icu4j dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- repository/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/pom.xml b/repository/pom.xml index bc12c602c6..6399621c64 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -133,7 +133,7 @@ com.ibm.icu icu4j - 73.2 + 75.1 com.googlecode.json-simple From 48e4d8a5a6df23b4b1f0a9b81468a3b465d3feea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:50:00 +0200 Subject: [PATCH 056/118] Bump org.slf4j:slf4j-api from 2.0.9 to 2.0.13 (#2587) Bumps org.slf4j:slf4j-api from 2.0.9 to 2.0.13. --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api 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 08f47af6e6..6b45eef38d 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 5.2.5 3.1-HTTPCLIENT-1265 2.12.2 - 2.0.9 + 2.0.13 2.23.1 3.0.22 2.9.2 From 0f1ef341f6c4efa34ec41ff0587eb2d63f8d512f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:51:06 +0200 Subject: [PATCH 057/118] Bump org.awaitility:awaitility from 4.2.0 to 4.2.1 (#2515) Bumps [org.awaitility:awaitility](https://github.com/awaitility/awaitility) from 4.2.0 to 4.2.1. - [Changelog](https://github.com/awaitility/awaitility/blob/master/changelog.txt) - [Commits](https://github.com/awaitility/awaitility/compare/awaitility-4.2.0...awaitility-4.2.1) --- updated-dependencies: - dependency-name: org.awaitility:awaitility 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 6b45eef38d..7d9aa0a6d8 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ 4.1.110.Final 5.18.3 1.26.2 - 4.2.0 + 4.2.1 4.1.3 1.0.71 3.1.1 From 0bb0e5b5b05f8117f836a2106532d92b9a0ec642 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:56:45 +0200 Subject: [PATCH 058/118] Bump jakarta.json:jakarta.json-api from 2.1.2 to 2.1.3 (#2267) Bumps [jakarta.json:jakarta.json-api](https://github.com/eclipse-ee4j/jsonp) from 2.1.2 to 2.1.3. - [Release notes](https://github.com/eclipse-ee4j/jsonp/releases) - [Commits](https://github.com/eclipse-ee4j/jsonp/commits) --- updated-dependencies: - dependency-name: jakarta.json:jakarta.json-api 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 7d9aa0a6d8..799f79249d 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ 2.0.1 3.1.0 1.2.0 - 2.1.2 + 2.1.3 1.1.6 2.9.0 2.5.1 From a09649c40a14c503f68e95b16f98e3119a556d29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:57:12 +0200 Subject: [PATCH 059/118] --- (#2659) updated-dependencies: - dependency-name: com.google.code.gson:gson 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 799f79249d..7303b9a898 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ 20231013 2.12.0 2.16.1 - 2.10.1 + 2.11.0 33.2.1-jre 4.5.14 4.4.16 From a7c83b9accf77249773a9d48d6f8f8ab3364d6e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 17:05:30 +0200 Subject: [PATCH 060/118] Bump org.codehaus.mojo:aspectj-maven-plugin from 1.14.0 to 1.15.0 (#2368) Bumps [org.codehaus.mojo:aspectj-maven-plugin](https://github.com/mojohaus/aspectj-maven-plugin) from 1.14.0 to 1.15.0. - [Release notes](https://github.com/mojohaus/aspectj-maven-plugin/releases) - [Commits](https://github.com/mojohaus/aspectj-maven-plugin/compare/aspectj-maven-plugin-1.14.0...aspectj-maven-plugin-1.15.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:aspectj-maven-plugin 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> --- repository/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/pom.xml b/repository/pom.xml index 6399621c64..7e431da2e8 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -839,7 +839,7 @@ org.codehaus.mojo aspectj-maven-plugin - 1.14.0 + 1.15.0 From 7616781ce9e25aa81aabe3bd3e055f9e49456a6e Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:33:51 +0000 Subject: [PATCH 061/118] [maven-release-plugin][skip ci] prepare release 23.3.0.68 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index 87deed6873..9309d12579 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 0802268741..e113351946 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 - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index a3260f9dc3..b4a5338afa 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 - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index aeed36ea0e..ebb62138dc 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 - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 20b9c23780..e4335bce9a 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 - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index c87f1b708f..c47b9e027b 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 - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/amps/pom.xml b/amps/pom.xml index 18adf8338c..68214d2aa5 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index beef4accb9..9b08827364 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/core/pom.xml b/core/pom.xml index 873987dc20..43b1f82e4d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/data-model/pom.xml b/data-model/pom.xml index 98076c8f03..2b357435cf 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/mmt/pom.xml b/mmt/pom.xml index a3a4eef839..e6a1753abf 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index deb84dce53..4569762a77 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 52322920e0..78623d018a 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/packaging/pom.xml b/packaging/pom.xml index facbc3a8bb..d29e996e84 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index a8063cd121..149af16528 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index f1a7c6d3d5..a1ee77ee5f 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 - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index b1a4cd2d08..c61bba9d53 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 - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 6726556963..1716f51f07 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 - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 103446235e..9c201c978a 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 - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 530a344a46..75f044e21d 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 - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index e150bd014e..e2af8c72b2 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/pom.xml b/pom.xml index 7303b9a898..414763c041 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.68-SNAPSHOT + 23.3.0.68 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.68 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 8c76c24a1f..cff5adff2d 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.68-SNAPSHOT + 23.3.0.68 diff --git a/repository/pom.xml b/repository/pom.xml index 7e431da2e8..47c953ad27 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.68-SNAPSHOT + 23.3.0.68 From 0ab31fcc935a96805f78b465d7393d3371609749 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 10 Jul 2024 16:33:54 +0000 Subject: [PATCH 062/118] [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 9309d12579..cb49a1f6c6 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index e113351946..11b09a8584 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 - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index b4a5338afa..3d79ddf452 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 - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index ebb62138dc..72c376788e 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 - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index e4335bce9a..534c4f7f06 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 - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index c47b9e027b..01d1ebc244 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 - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 68214d2aa5..bbd071aed6 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 9b08827364..899bfa4b58 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 43b1f82e4d..104fbbc9bd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 2b357435cf..30360dd9a9 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index e6a1753abf..26989b0b70 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 4569762a77..6118a7a747 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 78623d018a..73826c14c5 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index d29e996e84..d5ba6b1bff 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 149af16528..f4aee6aedc 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index a1ee77ee5f..b5b713abfa 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 - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index c61bba9d53..4fb91c6436 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 - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 1716f51f07..5420f9ff1a 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 - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 9c201c978a..fe2a132944 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 - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 75f044e21d..abae7b823b 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 - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index e2af8c72b2..c2d4a76e4c 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/pom.xml b/pom.xml index 414763c041..553e0b4324 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.68 + 23.3.0.69-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.68 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index cff5adff2d..6114414231 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.68 + 23.3.0.69-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 47c953ad27..f6306296d0 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.68 + 23.3.0.69-SNAPSHOT From c6201fa2fa7f33370fb6a20792c590aa58bdbbb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Thu, 11 Jul 2024 12:56:45 +0200 Subject: [PATCH 063/118] ACS-8323 Extend the possibility to configure the event sending strategy (#2765) --- .../repo/event2/DirectEventSender.java | 13 +- .../repo/event2/EnqueuingEventSender.java | 26 ++- .../org/alfresco/repo/event2/EventSender.java | 11 +- .../repo/event2/EventSenderFactoryBean.java | 148 ++++++++++++++++++ .../resources/alfresco/events2-context.xml | 13 +- .../resources/alfresco/repository.properties | 3 + .../org/alfresco/AppContext06TestSuite.java | 12 +- .../event2/AbstractContextAwareRepoEvent.java | 9 +- .../repo/event2/DirectEventGeneratorTest.java | 72 ++------- .../event2/EnqueuingEventGeneratorTest.java | 8 +- .../event2/EnqueuingEventSenderUnitTest.java | 14 +- .../repo/event2/EventGeneratorTest.java | 9 +- 12 files changed, 213 insertions(+), 125 deletions(-) create mode 100644 repository/src/main/java/org/alfresco/repo/event2/EventSenderFactoryBean.java diff --git a/repository/src/main/java/org/alfresco/repo/event2/DirectEventSender.java b/repository/src/main/java/org/alfresco/repo/event2/DirectEventSender.java index f2af8666ea..3f3805be09 100644 --- a/repository/src/main/java/org/alfresco/repo/event2/DirectEventSender.java +++ b/repository/src/main/java/org/alfresco/repo/event2/DirectEventSender.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2023 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -36,18 +36,13 @@ import org.springframework.beans.factory.InitializingBean; /** * Sends a message to a destination in the current thread. */ -public class DirectEventSender implements EventSender, InitializingBean +public class DirectEventSender implements EventSender { - protected Event2MessageProducer event2MessageProducer; + protected final Event2MessageProducer event2MessageProducer; - @Override - public void afterPropertiesSet() + public DirectEventSender(Event2MessageProducer event2MessageProducer) { PropertyCheck.mandatory(this, "event2MessageProducer", event2MessageProducer); - } - - public void setEvent2MessageProducer(Event2MessageProducer event2MessageProducer) - { this.event2MessageProducer = event2MessageProducer; } diff --git a/repository/src/main/java/org/alfresco/repo/event2/EnqueuingEventSender.java b/repository/src/main/java/org/alfresco/repo/event2/EnqueuingEventSender.java index 08a425f218..7615cba81f 100644 --- a/repository/src/main/java/org/alfresco/repo/event2/EnqueuingEventSender.java +++ b/repository/src/main/java/org/alfresco/repo/event2/EnqueuingEventSender.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2023 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -46,28 +46,18 @@ public class EnqueuingEventSender extends DirectEventSender { protected static final Log LOGGER = LogFactory.getLog(EnqueuingEventSender.class); - protected Executor enqueueThreadPoolExecutor; - protected Executor dequeueThreadPoolExecutor; + protected final Executor enqueueThreadPoolExecutor; + protected final Executor dequeueThreadPoolExecutor; protected BlockingQueue queue = new LinkedBlockingQueue<>(); protected Runnable listener = createListener(); - @Override - public void afterPropertiesSet() + public EnqueuingEventSender(Event2MessageProducer event2MessageProducer, Executor enqueueThreadPoolExecutor, Executor dequeueThreadPoolExecutor) { - super.afterPropertiesSet(); + super(event2MessageProducer); PropertyCheck.mandatory(this, "enqueueThreadPoolExecutor", enqueueThreadPoolExecutor); PropertyCheck.mandatory(this, "dequeueThreadPoolExecutor", dequeueThreadPoolExecutor); - } - - public void setEnqueueThreadPoolExecutor(Executor enqueueThreadPoolExecutor) - { this.enqueueThreadPoolExecutor = enqueueThreadPoolExecutor; - } - - public void setDequeueThreadPoolExecutor(Executor dequeueThreadPoolExecutor) - { this.dequeueThreadPoolExecutor = dequeueThreadPoolExecutor; - dequeueThreadPoolExecutor.execute(listener); } /** @@ -91,6 +81,12 @@ public class EnqueuingEventSender extends DirectEventSender }); } + @Override + public void initialize() + { + dequeueThreadPoolExecutor.execute(listener); + } + /** * Create listener task in charge of dequeuing and sending events ready to be sent. * @return The task in charge of dequeuing and sending events ready to be sent. diff --git a/repository/src/main/java/org/alfresco/repo/event2/EventSender.java b/repository/src/main/java/org/alfresco/repo/event2/EventSender.java index 798c66f111..e23aa1692d 100644 --- a/repository/src/main/java/org/alfresco/repo/event2/EventSender.java +++ b/repository/src/main/java/org/alfresco/repo/event2/EventSender.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2023 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -40,4 +40,13 @@ public interface EventSender * @param eventProducer - callback function that creates an event */ void accept(Callable>> eventProducer); + + /** + * It's called right after event sender instantiation (see {@link org.alfresco.repo.event2.EventSenderFactoryBean}). + * It might be used to initialize the sender implementation. + */ + default void initialize() + { + //no initialization by default + } } diff --git a/repository/src/main/java/org/alfresco/repo/event2/EventSenderFactoryBean.java b/repository/src/main/java/org/alfresco/repo/event2/EventSenderFactoryBean.java new file mode 100644 index 0000000000..48fc4db3c8 --- /dev/null +++ b/repository/src/main/java/org/alfresco/repo/event2/EventSenderFactoryBean.java @@ -0,0 +1,148 @@ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2024 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.event2; + +import jakarta.annotation.Nonnull; +import org.alfresco.util.PropertyCheck; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.beans.factory.config.AbstractFactoryBean; +import org.springframework.core.env.PropertyResolver; + +import java.util.Optional; +import java.util.concurrent.Executor; + +public class EventSenderFactoryBean extends AbstractFactoryBean +{ + static final String LEGACY_SKIP_QUEUE_PROPERTY = "repo.event2.queue.skip"; + static final String EVENT_SEND_STRATEGY_PROPERTY = "repo.event2.send.strategy"; + private static final String DIRECT_EVENT_SENDER_NAME = "direct"; + private static final String ASYNC_EVENT_SENDER_NAME = "async"; + + private final PropertyResolver propertyResolver; + private final Event2MessageProducer event2MessageProducer; + private final Executor enqueueThreadPoolExecutor; + private final Executor dequeueThreadPoolExecutor; + + private String configuredSenderName; + private boolean legacySkipQueueConfig; + + public EventSenderFactoryBean(@Autowired PropertyResolver propertyResolver, Event2MessageProducer event2MessageProducer, + Executor enqueueThreadPoolExecutor, Executor dequeueThreadPoolExecutor) + { + super(); + PropertyCheck.mandatory(this, "propertyResolver", propertyResolver); + PropertyCheck.mandatory(this, "event2MessageProducer", event2MessageProducer); + PropertyCheck.mandatory(this, "enqueueThreadPoolExecutor", enqueueThreadPoolExecutor); + PropertyCheck.mandatory(this, "dequeueThreadPoolExecutor", dequeueThreadPoolExecutor); + this.propertyResolver = propertyResolver; + this.event2MessageProducer = event2MessageProducer; + this.enqueueThreadPoolExecutor = enqueueThreadPoolExecutor; + this.dequeueThreadPoolExecutor = dequeueThreadPoolExecutor; + } + + @Value("${" + LEGACY_SKIP_QUEUE_PROPERTY + ":#{false}}") + public void setLegacySkipQueueConfig(boolean legacySkipQueueConfig) + { + this.legacySkipQueueConfig = legacySkipQueueConfig; + } + + @Value("${" + EVENT_SEND_STRATEGY_PROPERTY + ":#{null}}") + public void setConfiguredSenderName(String configuredSenderName) + { + this.configuredSenderName = configuredSenderName; + } + + @Override + public Class getObjectType() + { + return EventSender.class; + } + + @Override + @Nonnull + protected EventSender createInstance() throws Exception + { + EventSender sender = instantiateConfiguredSender(); + + sender.initialize(); + + return sender; + } + + private EventSender instantiateConfiguredSender() + { + if (isSenderNameConfigured()) + { + return instantiateSender(getConfiguredSenderName()); + } + return isLegacySkipQueueConfigured() ? instantiateDirectSender() : instantiateAsyncSender(); + } + + protected EventSender instantiateSender(String senderName) + { + if (DIRECT_EVENT_SENDER_NAME.equalsIgnoreCase(senderName)) + { + return instantiateDirectSender(); + } + + if (ASYNC_EVENT_SENDER_NAME.equalsIgnoreCase(senderName)) + { + return instantiateAsyncSender(); + } + + throw new IllegalStateException("Failed to instantiate sender: " + senderName); + } + + private DirectEventSender instantiateDirectSender() + { + return new DirectEventSender(event2MessageProducer); + } + + private EnqueuingEventSender instantiateAsyncSender() + { + return new EnqueuingEventSender(event2MessageProducer, enqueueThreadPoolExecutor, dequeueThreadPoolExecutor); + } + + private boolean isSenderNameConfigured() + { + return !Optional.ofNullable(getConfiguredSenderName()) + .map(String::isBlank) + .orElse(true); + } + + private boolean isLegacySkipQueueConfigured() + { + return Optional.ofNullable(propertyResolver.getProperty(LEGACY_SKIP_QUEUE_PROPERTY, Boolean.class)) + .orElse(legacySkipQueueConfig); + } + + private String getConfiguredSenderName() + { + return Optional.ofNullable(propertyResolver.getProperty(EVENT_SEND_STRATEGY_PROPERTY, String.class)) + .orElse(configuredSenderName); + } +} diff --git a/repository/src/main/resources/alfresco/events2-context.xml b/repository/src/main/resources/alfresco/events2-context.xml index 0fb6f3ef43..3e6a2bc8f4 100644 --- a/repository/src/main/resources/alfresco/events2-context.xml +++ b/repository/src/main/resources/alfresco/events2-context.xml @@ -41,7 +41,7 @@ - + @@ -59,13 +59,10 @@ - - - - - - - + + + + diff --git a/repository/src/main/resources/alfresco/repository.properties b/repository/src/main/resources/alfresco/repository.properties index 91f678dee9..02347cc32d 100644 --- a/repository/src/main/resources/alfresco/repository.properties +++ b/repository/src/main/resources/alfresco/repository.properties @@ -1229,7 +1229,10 @@ repo.event2.filter.childAssocTypes=rn:rendition repo.event2.filter.users= # Topic name repo.event2.topic.endpoint=amqp:topic:alfresco.repo.event2 +# Specifies the strategy for sending the events +repo.event2.send.strategy= # Specifies if messages should be enqueued in in-memory queue or sent directly to the topic +# Deprecated. Please use repo.event2.send.strategy repo.event2.queue.skip=false #repo.event2.topic.endpoint=amqp:topic:VirtualTopic.alfresco.repo.event2 # Thread pool for async enqueue of repo events diff --git a/repository/src/test/java/org/alfresco/AppContext06TestSuite.java b/repository/src/test/java/org/alfresco/AppContext06TestSuite.java index 49bede2566..1c30218387 100644 --- a/repository/src/test/java/org/alfresco/AppContext06TestSuite.java +++ b/repository/src/test/java/org/alfresco/AppContext06TestSuite.java @@ -44,11 +44,6 @@ import org.junit.runners.Suite; @RunWith(Categories.class) @Categories.ExcludeCategory({DBTests.class, NonBuildTests.class}) @Suite.SuiteClasses({ - // Requires a running ActiveMQ - org.alfresco.repo.rawevents.EventBehaviourTest.class, - org.alfresco.repo.rawevents.TransactionAwareEventProducerTest.class, - org.alfresco.repo.event2.RepoEvent2ITSuite.class, - // Requires running transformers org.alfresco.transform.registry.LocalTransformServiceRegistryConfigTest.class, org.alfresco.repo.rendition2.RenditionService2IntegrationTest.class, @@ -71,7 +66,12 @@ import org.junit.runners.Suite; org.alfresco.repo.blog.BlogServiceImplTest.class, org.alfresco.repo.action.scheduled.ScheduledPersistedActionServiceTest.class, - org.alfresco.repo.rendition2.RenditionDefinitionTest.class + org.alfresco.repo.rendition2.RenditionDefinitionTest.class, + + // Requires a running ActiveMQ + org.alfresco.repo.rawevents.EventBehaviourTest.class, + org.alfresco.repo.rawevents.TransactionAwareEventProducerTest.class, + org.alfresco.repo.event2.RepoEvent2ITSuite.class, }) public class AppContext06TestSuite { diff --git a/repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java b/repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java index d7af0a25e7..6edf471720 100644 --- a/repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java +++ b/repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2023 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -71,14 +71,14 @@ import org.junit.Before; import org.junit.BeforeClass; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.annotation.Value; import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.test.context.TestPropertySource; /** * @author Iulian Aftene */ - +@TestPropertySource(properties = {"repo.event2.queue.skip=false"}) public abstract class AbstractContextAwareRepoEvent extends BaseSpringTest { protected static final boolean DEBUG = false; @@ -123,9 +123,6 @@ public abstract class AbstractContextAwareRepoEvent extends BaseSpringTest @Autowired private NamespaceDAO namespaceDAO; - @Value("${repo.event2.queue.skip}") - protected boolean skipEventQueue; - protected NodeRef rootNodeRef; @BeforeClass diff --git a/repository/src/test/java/org/alfresco/repo/event2/DirectEventGeneratorTest.java b/repository/src/test/java/org/alfresco/repo/event2/DirectEventGeneratorTest.java index 1298ded98d..94349cfbbc 100644 --- a/repository/src/test/java/org/alfresco/repo/event2/DirectEventGeneratorTest.java +++ b/repository/src/test/java/org/alfresco/repo/event2/DirectEventGeneratorTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2023 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -25,78 +25,32 @@ */ package org.alfresco.repo.event2; -import java.util.HashSet; -import java.util.Set; - -import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.ContextHierarchy; +import org.springframework.test.context.TestPropertySource; -@ContextHierarchy({ - // Context hierarchy inherits context config from parent classes and extends it with TestConfig from this class - @ContextConfiguration(classes = DirectEventGeneratorTest.TestConfig.class) -}) -@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) +import java.util.Collection; + +@TestPropertySource(properties = {"repo.event2.queue.skip=true"}) public class DirectEventGeneratorTest extends EventGeneratorTest { @Autowired - private InstantiatedBeansRegistry instantiatedBeansRegistry; - + private EventSender eventSender; @Autowired - private EventSender directEventSender; - - @BeforeClass - public static void beforeClass() - { - System.setProperty("repo.event2.queue.skip", "true"); - } + private Collection allEventSenderBeans; @Test - public void testIfEnqueuingEventSenderIsNotInstantiated() + public void testIfOnlyRequiredEventSenderIsInstantiated() { - final Set instantiatedBeans = this.instantiatedBeansRegistry.getBeans(); - - assertTrue(skipEventQueue); - assertFalse(instantiatedBeans.contains("enqueuingEventSender")); + assertEquals(1, allEventSenderBeans.size()); + assertTrue(allEventSenderBeans.contains(eventSender)); } + @Test public void testIfDirectSenderIsSetInEventGenerator() { - assertTrue(skipEventQueue); - assertEquals(directEventSender, eventGenerator.getEventSender()); - } - - @Configuration - public static class TestConfig - { - @Bean - public BeanPostProcessor instantiatedBeansRegistry() - { - return new InstantiatedBeansRegistry(); - } - } - - protected static class InstantiatedBeansRegistry implements BeanPostProcessor - { - private final Set registeredBeans = new HashSet<>(); - - @Override - public Object postProcessAfterInitialization(final Object bean, final String beanName) throws BeansException - { - registeredBeans.add(beanName); - return bean; - } - - public Set getBeans() { - return registeredBeans; - } + assertEquals(DirectEventSender.class, eventSender.getClass()); + assertEquals(eventSender, eventGenerator.getEventSender()); } } diff --git a/repository/src/test/java/org/alfresco/repo/event2/EnqueuingEventGeneratorTest.java b/repository/src/test/java/org/alfresco/repo/event2/EnqueuingEventGeneratorTest.java index 06e0643ec6..244f89ed23 100644 --- a/repository/src/test/java/org/alfresco/repo/event2/EnqueuingEventGeneratorTest.java +++ b/repository/src/test/java/org/alfresco/repo/event2/EnqueuingEventGeneratorTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2023 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -27,9 +27,9 @@ package org.alfresco.repo.event2; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.TestPropertySource; -@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) +@TestPropertySource(properties = {"repo.event2.queue.skip=false"}) public class EnqueuingEventGeneratorTest extends EventGeneratorTest { @Autowired @@ -38,7 +38,7 @@ public class EnqueuingEventGeneratorTest extends EventGeneratorTest @Test public void testIfEnqueuingSenderIsSetInEventGenerator() { - assertFalse(skipEventQueue); + assertEquals(EnqueuingEventSender.class, enqueuingEventSender.getClass()); assertEquals(enqueuingEventSender, eventGenerator.getEventSender()); } } diff --git a/repository/src/test/java/org/alfresco/repo/event2/EnqueuingEventSenderUnitTest.java b/repository/src/test/java/org/alfresco/repo/event2/EnqueuingEventSenderUnitTest.java index ce8604f326..162c99b7dd 100644 --- a/repository/src/test/java/org/alfresco/repo/event2/EnqueuingEventSenderUnitTest.java +++ b/repository/src/test/java/org/alfresco/repo/event2/EnqueuingEventSenderUnitTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2023 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -65,15 +65,11 @@ public class EnqueuingEventSenderUnitTest @Before public void setup() { - eventSender = new EnqueuingEventSender(); - - enqueuePool = newThreadPool(); - eventSender.setEnqueueThreadPoolExecutor(enqueuePool); - dequeuePool = newThreadPool(); - eventSender.setDequeueThreadPoolExecutor(dequeuePool); - bus = mock(Event2MessageProducer.class); - eventSender.setEvent2MessageProducer(bus); + enqueuePool = newThreadPool(); + dequeuePool = newThreadPool(); + eventSender = new EnqueuingEventSender(bus, enqueuePool, dequeuePool); + eventSender.initialize(); events = new HashMap<>(); diff --git a/repository/src/test/java/org/alfresco/repo/event2/EventGeneratorTest.java b/repository/src/test/java/org/alfresco/repo/event2/EventGeneratorTest.java index 561cb77ae1..25c6f96cc2 100644 --- a/repository/src/test/java/org/alfresco/repo/event2/EventGeneratorTest.java +++ b/repository/src/test/java/org/alfresco/repo/event2/EventGeneratorTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2023 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -49,7 +49,6 @@ import org.apache.activemq.command.ActiveMQTopic; import org.awaitility.Awaitility; import org.junit.After; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; public abstract class EventGeneratorTest extends AbstractContextAwareRepoEvent @@ -60,12 +59,6 @@ public abstract class EventGeneratorTest extends AbstractContextAwareRepoEvent private ActiveMQConnection connection; protected List> receivedEvents; - @BeforeClass - public static void beforeClass() - { - System.setProperty("repo.event2.queue.skip", "false"); - } - @Before public void startupTopicListener() throws Exception { From ab1e762a65d7595b45d95a0a38e4e5bb9ee1615e Mon Sep 17 00:00:00 2001 From: Domenico Sibilio Date: Thu, 11 Jul 2024 13:45:00 +0200 Subject: [PATCH 064/118] Exclude jakarta.transaction-api from commons-dbcp2 (#2772) --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 553e0b4324..d18f15bae8 100644 --- a/pom.xml +++ b/pom.xml @@ -851,6 +851,17 @@ org.apache.commons commons-dbcp2 ${dependency.commons-dbcp.version} + + + + jakarta.transaction + jakarta.transaction-api + + com.google.code.gson From aa2fb35b4184f87859faaa8cd9addcdb7e0a7555 Mon Sep 17 00:00:00 2001 From: Domenico Sibilio Date: Thu, 11 Jul 2024 14:20:24 +0200 Subject: [PATCH 065/118] [skip tests] From 08e42ed87714895ed349ff80a088aee703315de1 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 11 Jul 2024 12:23:06 +0000 Subject: [PATCH 066/118] [maven-release-plugin][skip ci] prepare release 23.3.0.69 --- amps/ags/pom.xml | 2 +- amps/ags/rm-automation/pom.xml | 2 +- .../rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- amps/ags/rm-community/pom.xml | 2 +- amps/ags/rm-community/rm-community-repo/pom.xml | 2 +- amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- amps/pom.xml | 2 +- amps/share-services/pom.xml | 2 +- core/pom.xml | 2 +- data-model/pom.xml | 2 +- mmt/pom.xml | 2 +- packaging/distribution/pom.xml | 2 +- packaging/docker-alfresco/pom.xml | 2 +- packaging/pom.xml | 2 +- packaging/tests/pom.xml | 2 +- packaging/tests/tas-cmis/pom.xml | 2 +- packaging/tests/tas-email/pom.xml | 2 +- packaging/tests/tas-integration/pom.xml | 2 +- packaging/tests/tas-restapi/pom.xml | 2 +- packaging/tests/tas-webdav/pom.xml | 2 +- packaging/war/pom.xml | 2 +- pom.xml | 4 ++-- remote-api/pom.xml | 2 +- repository/pom.xml | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml index cb49a1f6c6..b7e8f79c33 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 11b09a8584..dc4dc62c83 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 - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 3d79ddf452..23142a3326 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 - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 72c376788e..2126553c8a 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 - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 534c4f7f06..1e18f9a610 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 - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 01d1ebc244..477da711e6 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 - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/amps/pom.xml b/amps/pom.xml index bbd071aed6..a89a1539f1 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 899bfa4b58..b254d71495 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/core/pom.xml b/core/pom.xml index 104fbbc9bd..0946c12f38 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/data-model/pom.xml b/data-model/pom.xml index 30360dd9a9..36092ace40 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/mmt/pom.xml b/mmt/pom.xml index 26989b0b70..430271ec06 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 6118a7a747..0206ce6665 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 73826c14c5..d021726cba 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/packaging/pom.xml b/packaging/pom.xml index d5ba6b1bff..5d6a7168ea 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index f4aee6aedc..b4cba2203f 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index b5b713abfa..3084a23691 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 - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 4fb91c6436..14de46cb26 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 - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 5420f9ff1a..f05cbf77aa 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 - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index fe2a132944..a1e108b3ca 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 - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index abae7b823b..f3a358d43b 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 - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index c2d4a76e4c..f43b5948fd 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/pom.xml b/pom.xml index d18f15bae8..c3e904ab11 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.69-SNAPSHOT + 23.3.0.69 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.69 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 6114414231..b1ef62d1b5 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.69-SNAPSHOT + 23.3.0.69 diff --git a/repository/pom.xml b/repository/pom.xml index f6306296d0..021929e6a7 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.69-SNAPSHOT + 23.3.0.69 From 7adf58d35f49d22e84d87d6932667efc79477347 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 11 Jul 2024 12:23:08 +0000 Subject: [PATCH 067/118] [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 b7e8f79c33..84ab7c3c95 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index dc4dc62c83..bca40f6580 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 - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml index 23142a3326..659601b03e 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 - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 2126553c8a..e191b86a80 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 - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 1e18f9a610..e8a3376dcd 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 - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml index 477da711e6..14534a5a2f 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 - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index a89a1539f1..dee85e981d 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index b254d71495..56b5d3144a 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 0946c12f38..4a279c5abf 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 36092ace40..c3bf4b6455 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 430271ec06..78429fb61a 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 0206ce6665..1c67f10f6e 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index d021726cba..ffab2fd2c8 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 5d6a7168ea..1413fe586e 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index b4cba2203f..d078743349 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 3084a23691..e957e68bd3 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 - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 14de46cb26..12898f7377 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 - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index f05cbf77aa..3c4c036e38 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 - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index a1e108b3ca..93c24ba7a4 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 - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index f3a358d43b..70c484769f 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 - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index f43b5948fd..28e701c4b8 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/pom.xml b/pom.xml index c3e904ab11..d5d77c7c99 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.69 + 23.3.0.70-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.69 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index b1ef62d1b5..906ae09f1d 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.69 + 23.3.0.70-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 021929e6a7..8bf1742865 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.69 + 23.3.0.70-SNAPSHOT From 06af664a164398da8bf2b017f1697e42aca8ab07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 16:51:14 +0200 Subject: [PATCH 068/118] Bump dependency.camel.version from 4.0.0 to 4.6.0 (#2640) Bumps `dependency.camel.version` from 4.0.0 to 4.6.0. Updates `org.apache.camel:camel-activemq` from 4.0.0 to 4.6.0 Updates `org.apache.camel:camel-core` from 4.0.0 to 4.6.0 Updates `org.apache.camel:camel-spring-xml` from 4.0.0 to 4.6.0 Updates `org.apache.camel:camel-amqp` from 4.0.0 to 4.6.0 Updates `org.apache.camel:camel-jackson` from 4.0.0 to 4.6.0 Updates `org.apache.camel:camel-direct` from 4.0.0 to 4.6.0 Updates `org.apache.camel:camel-management` from 4.0.0 to 4.6.0 Updates `org.apache.camel:camel-mock` from 4.0.0 to 4.6.0 --- updated-dependencies: - dependency-name: org.apache.camel:camel-activemq dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.camel:camel-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.camel:camel-spring-xml dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.camel:camel-amqp dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.camel:camel-jackson dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.camel:camel-direct dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.camel:camel-management dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.camel:camel-mock 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d5d77c7c99..dc7a3d9eff 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ 7.7.10 5.2.5 3.5.0.Final - 4.0.5 + 4.6.0 4.1.110.Final 5.18.3 1.26.2 From 7ce91833602c1ed7bd73d3c0a124596f3044bc06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 17:15:58 +0200 Subject: [PATCH 069/118] Bump org.codehaus.groovy:groovy-json from 3.0.19 to 3.0.22 (#2734) Bumps [org.codehaus.groovy:groovy-json](https://github.com/apache/groovy) from 3.0.19 to 3.0.22. - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy-json 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> --- packaging/tests/tas-restapi/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 93c24ba7a4..8d904907f5 100644 --- a/packaging/tests/tas-restapi/pom.xml +++ b/packaging/tests/tas-restapi/pom.xml @@ -178,7 +178,7 @@ org.codehaus.groovy groovy-json - 3.0.19 + 3.0.22 From b30b7bd2520a0dbb6824dd3cfff0dfbf70a42dab Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:54:01 +0000 Subject: [PATCH 070/118] [maven-release-plugin][skip ci] prepare release 23.3.0.70 --- 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 84ab7c3c95..18964fa144 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index bca40f6580..61c06c0b39 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 - 23.3.0.70-SNAPSHOT + 23.3.0.70 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 659601b03e..cb8228fdd3 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 - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index e191b86a80..f7b643ca2d 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 - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index e8a3376dcd..9e2ca31107 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 - 23.3.0.70-SNAPSHOT + 23.3.0.70 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 14534a5a2f..dfc011f84e 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 - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/amps/pom.xml b/amps/pom.xml index dee85e981d..8d878b2390 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 56b5d3144a..0924662ac6 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/core/pom.xml b/core/pom.xml index 4a279c5abf..ddfdc23a61 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/data-model/pom.xml b/data-model/pom.xml index c3bf4b6455..ecf835ff0d 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/mmt/pom.xml b/mmt/pom.xml index 78429fb61a..a61c4897b1 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 1c67f10f6e..bf1eedfb7f 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index ffab2fd2c8..34262340f7 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/packaging/pom.xml b/packaging/pom.xml index 1413fe586e..5939177b55 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index d078743349..40bffb5195 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index e957e68bd3..a53d0ff93a 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 - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 12898f7377..772e04d638 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 - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 3c4c036e38..751d9f1fc7 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 - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 8d904907f5..78602b13ea 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 - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 70c484769f..2632509894 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 - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 28e701c4b8..07abdec6be 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/pom.xml b/pom.xml index dc7a3d9eff..b50a48bbd5 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.70-SNAPSHOT + 23.3.0.70 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.70 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 906ae09f1d..172a65e6d4 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.70-SNAPSHOT + 23.3.0.70 diff --git a/repository/pom.xml b/repository/pom.xml index 8bf1742865..879c5316b6 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.70-SNAPSHOT + 23.3.0.70 From 1a99c540746d38948ae8d1d617b5dbfa2f41b514 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:54:05 +0000 Subject: [PATCH 071/118] [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 18964fa144..85c972a26c 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 61c06c0b39..df1a792367 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 - 23.3.0.70 + 23.3.0.71-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 cb8228fdd3..39810d09be 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 - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index f7b643ca2d..ce9e6bc308 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 - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 9e2ca31107..3d5039213a 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 - 23.3.0.70 + 23.3.0.71-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 dfc011f84e..1025c6dcf8 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 - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 8d878b2390..c0c0f7ac76 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 0924662ac6..cad150cd93 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index ddfdc23a61..0582d4f5a5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index ecf835ff0d..ac6edc8a97 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index a61c4897b1..801bea139d 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index bf1eedfb7f..86aa99beea 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 34262340f7..578b1bb6df 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 5939177b55..bd1963b346 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 40bffb5195..3d177eb784 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index a53d0ff93a..a55af7b0d8 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 - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 772e04d638..637a7546e1 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 - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 751d9f1fc7..870877b95c 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 - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 78602b13ea..56c2dabb3c 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 - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 2632509894..8c42974cdc 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 - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 07abdec6be..8c707bdb51 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/pom.xml b/pom.xml index b50a48bbd5..cf901f0a23 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.70 + 23.3.0.71-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.70 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 172a65e6d4..6d9bf68a10 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.70 + 23.3.0.71-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 879c5316b6..8a3cc6bb98 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.70 + 23.3.0.71-SNAPSHOT From 97770fd831c89cac0892ad48f91f9ef535b5f192 Mon Sep 17 00:00:00 2001 From: Domenico Sibilio Date: Fri, 12 Jul 2024 10:10:45 +0200 Subject: [PATCH 072/118] Rollback Jackson from 2.17.2 to 2.15.2 (#2777) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf901f0a23..2f77caf5ca 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 6.0.19 6.3.1 3.5.3 - 2.17.2 + 2.15.2 4.0.4 1.0.0-jakarta-1 9.0 From ec279bcd5d902127ca40014547afe14c25741924 Mon Sep 17 00:00:00 2001 From: Domenico Sibilio Date: Fri, 12 Jul 2024 10:48:59 +0200 Subject: [PATCH 073/118] [skip tests] From 228944c59cb10eea8eb1cb0a22d159aa01ec2a76 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 12 Jul 2024 08:51:39 +0000 Subject: [PATCH 074/118] [maven-release-plugin][skip ci] prepare release 23.3.0.71 --- 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 85c972a26c..d8deec72df 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index df1a792367..6dd7921aa2 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 - 23.3.0.71-SNAPSHOT + 23.3.0.71 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 39810d09be..925ba4f21f 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 - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index ce9e6bc308..987fc15792 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 - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 3d5039213a..d79e2f773d 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 - 23.3.0.71-SNAPSHOT + 23.3.0.71 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 1025c6dcf8..745025989f 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 - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/amps/pom.xml b/amps/pom.xml index c0c0f7ac76..6e6fc47dd1 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index cad150cd93..fc54881547 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/core/pom.xml b/core/pom.xml index 0582d4f5a5..d351d5736d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/data-model/pom.xml b/data-model/pom.xml index ac6edc8a97..231803416b 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/mmt/pom.xml b/mmt/pom.xml index 801bea139d..63347c2ecf 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 86aa99beea..6fbeb5cc61 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 578b1bb6df..518e79dd8c 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/packaging/pom.xml b/packaging/pom.xml index bd1963b346..4dcdd08e1d 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 3d177eb784..f024f75375 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index a55af7b0d8..494aba1e5e 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 - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 637a7546e1..1dd82f8900 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 - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 870877b95c..0d5743c690 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 - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 56c2dabb3c..54ebe34c24 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 - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 8c42974cdc..587ce5fd6d 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 - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 8c707bdb51..ac0ab73d6d 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/pom.xml b/pom.xml index 2f77caf5ca..a6c2b1e31f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.71-SNAPSHOT + 23.3.0.71 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.71 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 6d9bf68a10..d9d8ae163d 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.71-SNAPSHOT + 23.3.0.71 diff --git a/repository/pom.xml b/repository/pom.xml index 8a3cc6bb98..e19c777121 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.71-SNAPSHOT + 23.3.0.71 From 05c4f2282ead4ec7c89ccf4a3fdfb74541f9862c Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 12 Jul 2024 08:51:41 +0000 Subject: [PATCH 075/118] [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 d8deec72df..b76323d39a 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 6dd7921aa2..4c2c7c66d2 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 - 23.3.0.71 + 23.3.0.72-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 925ba4f21f..5411c59357 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 - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 987fc15792..fd9c8831ce 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 - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index d79e2f773d..56a388a9d2 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 - 23.3.0.71 + 23.3.0.72-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 745025989f..7f58f053fb 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 - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 6e6fc47dd1..5991981c99 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index fc54881547..fcf245d9f7 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index d351d5736d..b9a7e9dc17 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 231803416b..3b83841d34 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 63347c2ecf..915f4888a5 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 6fbeb5cc61..e070bd012e 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 518e79dd8c..bfca15d08a 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 4dcdd08e1d..e7dd282586 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index f024f75375..884024e71b 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 494aba1e5e..8955f295ba 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 - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 1dd82f8900..eb3c7879a5 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 - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 0d5743c690..3274483445 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 - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 54ebe34c24..bab8d522e3 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 - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 587ce5fd6d..51d27a8fc1 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 - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index ac0ab73d6d..bc05fbe547 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/pom.xml b/pom.xml index a6c2b1e31f..b07beac795 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.71 + 23.3.0.72-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.71 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index d9d8ae163d..71e6fccef0 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.71 + 23.3.0.72-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index e19c777121..3fd3d2449f 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.71 + 23.3.0.72-SNAPSHOT From 79b78448e0bea2fc2aac81e82e65600650628460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Fri, 12 Jul 2024 11:31:06 +0200 Subject: [PATCH 076/118] ACS-8323 Switch to defaults from properties (#2776) --- .../repo/event2/EventSenderFactoryBean.java | 22 ++++++++++++++----- .../resources/alfresco/events2-context.xml | 12 +++++----- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/repository/src/main/java/org/alfresco/repo/event2/EventSenderFactoryBean.java b/repository/src/main/java/org/alfresco/repo/event2/EventSenderFactoryBean.java index 48fc4db3c8..2f0f216e9a 100644 --- a/repository/src/main/java/org/alfresco/repo/event2/EventSenderFactoryBean.java +++ b/repository/src/main/java/org/alfresco/repo/event2/EventSenderFactoryBean.java @@ -64,13 +64,13 @@ public class EventSenderFactoryBean extends AbstractFactoryBean this.dequeueThreadPoolExecutor = dequeueThreadPoolExecutor; } - @Value("${" + LEGACY_SKIP_QUEUE_PROPERTY + ":#{false}}") + @Value("${" + LEGACY_SKIP_QUEUE_PROPERTY + "}") public void setLegacySkipQueueConfig(boolean legacySkipQueueConfig) { this.legacySkipQueueConfig = legacySkipQueueConfig; } - @Value("${" + EVENT_SEND_STRATEGY_PROPERTY + ":#{null}}") + @Value("${" + EVENT_SEND_STRATEGY_PROPERTY + "}") public void setConfiguredSenderName(String configuredSenderName) { this.configuredSenderName = configuredSenderName; @@ -119,12 +119,12 @@ public class EventSenderFactoryBean extends AbstractFactoryBean private DirectEventSender instantiateDirectSender() { - return new DirectEventSender(event2MessageProducer); + return new DirectEventSender(getEvent2MessageProducer()); } private EnqueuingEventSender instantiateAsyncSender() { - return new EnqueuingEventSender(event2MessageProducer, enqueueThreadPoolExecutor, dequeueThreadPoolExecutor); + return new EnqueuingEventSender(getEvent2MessageProducer(), enqueueThreadPoolExecutor, dequeueThreadPoolExecutor); } private boolean isSenderNameConfigured() @@ -136,13 +136,23 @@ public class EventSenderFactoryBean extends AbstractFactoryBean private boolean isLegacySkipQueueConfigured() { - return Optional.ofNullable(propertyResolver.getProperty(LEGACY_SKIP_QUEUE_PROPERTY, Boolean.class)) + return Optional.ofNullable(resolveProperty(LEGACY_SKIP_QUEUE_PROPERTY, Boolean.class)) .orElse(legacySkipQueueConfig); } private String getConfiguredSenderName() { - return Optional.ofNullable(propertyResolver.getProperty(EVENT_SEND_STRATEGY_PROPERTY, String.class)) + return Optional.ofNullable(resolveProperty(EVENT_SEND_STRATEGY_PROPERTY, String.class)) .orElse(configuredSenderName); } + + protected T resolveProperty(String key, Class targetType) + { + return propertyResolver.getProperty(key, targetType); + } + + protected Event2MessageProducer getEvent2MessageProducer() + { + return event2MessageProducer; + } } diff --git a/repository/src/main/resources/alfresco/events2-context.xml b/repository/src/main/resources/alfresco/events2-context.xml index 3e6a2bc8f4..aa5d78d1ba 100644 --- a/repository/src/main/resources/alfresco/events2-context.xml +++ b/repository/src/main/resources/alfresco/events2-context.xml @@ -55,16 +55,18 @@ - - - - - + + + + + + + eventAsyncEnqueueThreadPool From de2effcefb807f7b5b9d1339b5066bc89709796e Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 12 Jul 2024 11:42:15 +0000 Subject: [PATCH 077/118] [maven-release-plugin][skip ci] prepare release 23.3.0.72 --- 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 b76323d39a..0f7ce52a8e 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 4c2c7c66d2..7c897fa9c2 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 - 23.3.0.72-SNAPSHOT + 23.3.0.72 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 5411c59357..ff591657f0 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 - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index fd9c8831ce..d02247090e 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 - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 56a388a9d2..1e5d366549 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 - 23.3.0.72-SNAPSHOT + 23.3.0.72 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 7f58f053fb..aa6fe56994 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 - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/amps/pom.xml b/amps/pom.xml index 5991981c99..8a20436dc0 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index fcf245d9f7..7b9cf4d9fa 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/core/pom.xml b/core/pom.xml index b9a7e9dc17..f16c0b68f6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/data-model/pom.xml b/data-model/pom.xml index 3b83841d34..7dc1492a49 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/mmt/pom.xml b/mmt/pom.xml index 915f4888a5..4854e48dcf 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index e070bd012e..e00cc373db 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index bfca15d08a..b46109c8bc 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/packaging/pom.xml b/packaging/pom.xml index e7dd282586..acf8134bf4 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 884024e71b..40d46d674a 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 8955f295ba..de66e05a54 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 - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index eb3c7879a5..64157f9a70 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 - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 3274483445..0367863edf 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 - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index bab8d522e3..9210fdd2bd 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 - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 51d27a8fc1..a9bf257f21 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 - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index bc05fbe547..595fe942a1 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/pom.xml b/pom.xml index b07beac795..1ca561b196 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.72-SNAPSHOT + 23.3.0.72 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.72 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 71e6fccef0..c2cbcc62bc 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.72-SNAPSHOT + 23.3.0.72 diff --git a/repository/pom.xml b/repository/pom.xml index 3fd3d2449f..24faa42644 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.72-SNAPSHOT + 23.3.0.72 From 115997d36780a00a46ec212e86ed7913fbaef785 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 12 Jul 2024 11:42:17 +0000 Subject: [PATCH 078/118] [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 0f7ce52a8e..900a77be17 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 7c897fa9c2..7a1f8b4c3a 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 - 23.3.0.72 + 23.3.0.73-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 ff591657f0..582b0a5d04 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 - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index d02247090e..cca0886b03 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 - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 1e5d366549..38e9e595c4 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 - 23.3.0.72 + 23.3.0.73-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 aa6fe56994..316f16a29e 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 - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 8a20436dc0..ec4d553119 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 7b9cf4d9fa..e80a884b03 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index f16c0b68f6..d756dc8b40 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 7dc1492a49..130ce9a202 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 4854e48dcf..6d34eed88c 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index e00cc373db..10daa3e53e 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index b46109c8bc..784970438f 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index acf8134bf4..4e44675f58 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 40d46d674a..40d29f428e 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index de66e05a54..719d56637a 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 - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 64157f9a70..f60f236e0d 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 - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 0367863edf..2a896ec041 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 - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 9210fdd2bd..2bce5a5a20 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 - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index a9bf257f21..eb7bc926ea 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 - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 595fe942a1..23eb18ba56 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1ca561b196..0da5f19fbe 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.72 + 23.3.0.73-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.72 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index c2cbcc62bc..9e908a8b70 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.72 + 23.3.0.73-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 24faa42644..e4b99f32bf 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.72 + 23.3.0.73-SNAPSHOT From 19e577383a1992713a8ca5d187ffab7f38bc9cf3 Mon Sep 17 00:00:00 2001 From: Alfresco CI User Date: Sun, 14 Jul 2024 00:03:41 +0000 Subject: [PATCH 079/118] [force] Force release for 2024-07-14. From 5b562edad16f3f9b4d133a3aa3fea37d6b6e3fc7 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 14 Jul 2024 00:06:53 +0000 Subject: [PATCH 080/118] [maven-release-plugin][skip ci] prepare release 23.3.0.73 --- 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 900a77be17..b8a441c29f 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 7a1f8b4c3a..d12607d048 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 - 23.3.0.73-SNAPSHOT + 23.3.0.73 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 582b0a5d04..08dbb3acdb 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 - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index cca0886b03..d610053c6d 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 - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 38e9e595c4..ce6e3ad8f8 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 - 23.3.0.73-SNAPSHOT + 23.3.0.73 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 316f16a29e..61ec1070a3 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 - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/amps/pom.xml b/amps/pom.xml index ec4d553119..8c0eb4a15b 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index e80a884b03..9f10dceebd 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/core/pom.xml b/core/pom.xml index d756dc8b40..d31c978f31 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/data-model/pom.xml b/data-model/pom.xml index 130ce9a202..99f4b0d332 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/mmt/pom.xml b/mmt/pom.xml index 6d34eed88c..6e4a5e5bda 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 10daa3e53e..2655911a2c 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 784970438f..48a73914ab 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/packaging/pom.xml b/packaging/pom.xml index 4e44675f58..5839d3cc79 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 40d29f428e..dacf58ab59 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 719d56637a..5cc51e86ca 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 - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index f60f236e0d..bfcd47282c 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 - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 2a896ec041..b64d27f721 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 - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 2bce5a5a20..6ced078d50 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 - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index eb7bc926ea..5f3dd3d54b 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 - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 23eb18ba56..8cf9f2bfec 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/pom.xml b/pom.xml index 0da5f19fbe..06e10e1a95 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.73-SNAPSHOT + 23.3.0.73 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.73 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 9e908a8b70..d9a483d241 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.73-SNAPSHOT + 23.3.0.73 diff --git a/repository/pom.xml b/repository/pom.xml index e4b99f32bf..1dec2fbf28 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.73-SNAPSHOT + 23.3.0.73 From 14c1b91a9b47c9cc213c0408449fea354312dac0 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 14 Jul 2024 00:06:55 +0000 Subject: [PATCH 081/118] [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 b8a441c29f..b12c83c2af 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index d12607d048..6ee5246093 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 - 23.3.0.73 + 23.3.0.74-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 08dbb3acdb..8a13a410e7 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 - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index d610053c6d..474f6f302a 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 - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index ce6e3ad8f8..2e580511bf 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 - 23.3.0.73 + 23.3.0.74-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 61ec1070a3..ef8d23e3b4 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 - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 8c0eb4a15b..eb3b5bda84 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 9f10dceebd..e2bf287626 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index d31c978f31..87445244f7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 99f4b0d332..f97440acae 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 6e4a5e5bda..f7bf671d66 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 2655911a2c..9f681bf626 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 48a73914ab..2360fe50a7 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 5839d3cc79..d308f34af4 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index dacf58ab59..0e1e0462f6 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 5cc51e86ca..6d3b6f2222 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 - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index bfcd47282c..1841662303 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 - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index b64d27f721..747e687a06 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 - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 6ced078d50..126d90a00d 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 - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 5f3dd3d54b..94cc3f8078 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 - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 8cf9f2bfec..96508db231 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/pom.xml b/pom.xml index 06e10e1a95..0e07e8c86a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.73 + 23.3.0.74-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.73 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index d9a483d241..9e8ddbc84e 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.73 + 23.3.0.74-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 1dec2fbf28..69073ce20e 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.73 + 23.3.0.74-SNAPSHOT From 2ccdee122a3751d17a5b52b575f1c7e8805fd03a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojtek=20=C5=9Awi=C4=99to=C5=84?= Date: Mon, 15 Jul 2024 10:22:29 +0200 Subject: [PATCH 082/118] ACS-8394 ReportPortal Integration run only on master, as an optional step --- .github/workflows/ci.yml | 138 ++++++++++++++++++++++++++++++++++----- 1 file changed, 123 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed1a376b51..cc24f5d3ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -174,6 +174,7 @@ jobs: - name: "Init" run: bash ./scripts/ci/init.sh - name: "Prepare Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v5.1.0 id: rp-prepare with: @@ -181,24 +182,30 @@ jobs: rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} rp-project: ${{ env.RP_PROJECT }} rp-use-static-launch-name: true + continue-on-error: true - name: "Add GitHub Step Summary" + if: github.ref_name == 'master' env: RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} RP_KEY: ${{ steps.rp-prepare.outputs.key }} RP_URL: ${{ steps.rp-prepare.outputs.url }} run: bash scripts/ci/add_step_summary.sh + continue-on-error: true - name: "Run tests" id: run-tests env: - RP_OPTS: ${{ steps.rp-prepare.outputs.mvn-opts }} + RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | eval "args=($RP_OPTS)" mvn -B test -pl ${{ matrix.testModule }} -am ${{ matrix.testAttributes }} -DfailIfNoTests=false "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" + if: github.ref_name == 'master' run: | echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY + continue-on-error: true - name: "Summarize Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v5.1.0 id: rp-summarize with: @@ -206,6 +213,7 @@ jobs: rp-launch-key: ${{ steps.rp-prepare.outputs.key }} rp-project: ${{ env.RP_PROJECT }} rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} + continue-on-error: true - name: "Exit on failure" if: steps.run-tests.outcome != 'success' run: | @@ -253,6 +261,7 @@ jobs: - name: "Set up the environment" run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d - name: "Prepare Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v5.1.0 id: rp-prepare with: @@ -260,24 +269,30 @@ jobs: rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} rp-project: ${{ env.RP_PROJECT }} rp-use-static-launch-name: true + continue-on-error: true - name: "Add GitHub Step Summary" + if: github.ref_name == 'master' env: RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} RP_KEY: ${{ steps.rp-prepare.outputs.key }} RP_URL: ${{ steps.rp-prepare.outputs.url }} run: bash scripts/ci/add_step_summary.sh + continue-on-error: true - name: "Run tests" id: run-tests env: - RP_OPTS: ${{ steps.rp-prepare.outputs.mvn-opts }} + RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | eval "args=($RP_OPTS)" mvn -B test -pl remote-api -Dtest=${{ matrix.testSuite }} -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" + if: github.ref_name == 'master' run: | echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY + continue-on-error: true - name: "Summarize Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v5.1.0 id: rp-summarize with: @@ -285,6 +300,7 @@ jobs: rp-launch-key: ${{ steps.rp-prepare.outputs.key }} rp-project: ${{ env.RP_PROJECT }} rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} + continue-on-error: true - name: "Exit on failure" if: steps.run-tests.outcome != 'success' run: | @@ -320,6 +336,7 @@ jobs: env: MARIADB_VERSION: ${{ matrix.version }} - name: "Prepare Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v5.1.0 id: rp-prepare with: @@ -327,24 +344,30 @@ jobs: rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} rp-project: ${{ env.RP_PROJECT }} rp-use-static-launch-name: true + continue-on-error: true - name: "Add GitHub Step Summary" + if: github.ref_name == 'master' env: RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} RP_KEY: ${{ steps.rp-prepare.outputs.key }} RP_URL: ${{ steps.rp-prepare.outputs.url }} run: bash scripts/ci/add_step_summary.sh + continue-on-error: true - name: "Run tests" id: run-tests env: - RP_OPTS: ${{ steps.rp-prepare.outputs.mvn-opts }} + RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | eval "args=($RP_OPTS)" mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" + if: github.ref_name == 'master' run: | echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY + continue-on-error: true - name: "Summarize Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v5.1.0 id: rp-summarize with: @@ -352,6 +375,7 @@ jobs: rp-launch-key: ${{ steps.rp-prepare.outputs.key }} rp-project: ${{ env.RP_PROJECT }} rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} + continue-on-error: true - name: "Exit on failure" if: steps.run-tests.outcome != 'success' run: | @@ -383,6 +407,7 @@ jobs: env: MARIADB_VERSION: 10.6 - name: "Prepare Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v5.1.0 id: rp-prepare with: @@ -390,24 +415,30 @@ jobs: rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} rp-project: ${{ env.RP_PROJECT }} rp-use-static-launch-name: true + continue-on-error: true - name: "Add GitHub Step Summary" + if: github.ref_name == 'master' env: RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} RP_KEY: ${{ steps.rp-prepare.outputs.key }} RP_URL: ${{ steps.rp-prepare.outputs.url }} run: bash scripts/ci/add_step_summary.sh + continue-on-error: true - name: "Run tests" id: run-tests env: - RP_OPTS: ${{ steps.rp-prepare.outputs.mvn-opts }} + RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | eval "args=($RP_OPTS)" mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" + if: github.ref_name == 'master' run: | echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY + continue-on-error: true - name: "Summarize Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v5.1.0 id: rp-summarize with: @@ -415,6 +446,7 @@ jobs: rp-launch-key: ${{ steps.rp-prepare.outputs.key }} rp-project: ${{ env.RP_PROJECT }} rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} + continue-on-error: true - name: "Exit on failure" if: steps.run-tests.outcome != 'success' run: | @@ -446,6 +478,7 @@ jobs: env: MYSQL_VERSION: 8 - name: "Prepare Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v5.1.0 id: rp-prepare with: @@ -453,24 +486,30 @@ jobs: rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} rp-project: ${{ env.RP_PROJECT }} rp-use-static-launch-name: true + continue-on-error: true - name: "Add GitHub Step Summary" + if: github.ref_name == 'master' env: RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} RP_KEY: ${{ steps.rp-prepare.outputs.key }} RP_URL: ${{ steps.rp-prepare.outputs.url }} run: bash scripts/ci/add_step_summary.sh + continue-on-error: true - name: "Run tests" id: run-tests env: - RP_OPTS: ${{ steps.rp-prepare.outputs.mvn-opts }} + RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | eval "args=($RP_OPTS)" mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" + if: github.ref_name == 'master' run: | echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY + continue-on-error: true - name: "Summarize Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v5.1.0 id: rp-summarize with: @@ -478,6 +517,7 @@ jobs: rp-launch-key: ${{ steps.rp-prepare.outputs.key }} rp-project: ${{ env.RP_PROJECT }} rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} + continue-on-error: true - name: "Exit on failure" if: steps.run-tests.outcome != 'success' run: | @@ -508,6 +548,7 @@ jobs: env: POSTGRES_VERSION: 13.12 - name: "Prepare Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v5.1.0 id: rp-prepare with: @@ -515,24 +556,30 @@ jobs: rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} rp-project: ${{ env.RP_PROJECT }} rp-use-static-launch-name: true + continue-on-error: true - name: "Add GitHub Step Summary" + if: github.ref_name == 'master' env: RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} RP_KEY: ${{ steps.rp-prepare.outputs.key }} RP_URL: ${{ steps.rp-prepare.outputs.url }} run: bash scripts/ci/add_step_summary.sh + continue-on-error: true - name: "Run tests" id: run-tests env: - RP_OPTS: ${{ steps.rp-prepare.outputs.mvn-opts }} + RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | eval "args=($RP_OPTS)" mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" + if: github.ref_name == 'master' run: | echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY + continue-on-error: true - name: "Summarize Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v5.1.0 id: rp-summarize with: @@ -540,6 +587,7 @@ jobs: rp-launch-key: ${{ steps.rp-prepare.outputs.key }} rp-project: ${{ env.RP_PROJECT }} rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} + continue-on-error: true - name: "Exit on failure" if: steps.run-tests.outcome != 'success' run: | @@ -570,6 +618,7 @@ jobs: env: POSTGRES_VERSION: 14.9 - name: "Prepare Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v5.1.0 id: rp-prepare with: @@ -577,24 +626,30 @@ jobs: rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} rp-project: ${{ env.RP_PROJECT }} rp-use-static-launch-name: true + continue-on-error: true - name: "Add GitHub Step Summary" + if: github.ref_name == 'master' env: RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} RP_KEY: ${{ steps.rp-prepare.outputs.key }} RP_URL: ${{ steps.rp-prepare.outputs.url }} run: bash scripts/ci/add_step_summary.sh + continue-on-error: true - name: "Run tests" id: run-tests env: - RP_OPTS: ${{ steps.rp-prepare.outputs.mvn-opts }} + RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | eval "args=($RP_OPTS)" mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" + if: github.ref_name == 'master' run: | echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY + continue-on-error: true - name: "Summarize Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v5.1.0 id: rp-summarize with: @@ -602,6 +657,7 @@ jobs: rp-launch-key: ${{ steps.rp-prepare.outputs.key }} rp-project: ${{ env.RP_PROJECT }} rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} + continue-on-error: true - name: "Exit on failure" if: steps.run-tests.outcome != 'success' run: | @@ -632,6 +688,7 @@ jobs: env: POSTGRES_VERSION: 15.4 - name: "Prepare Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v5.1.0 id: rp-prepare with: @@ -639,24 +696,30 @@ jobs: rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} rp-project: ${{ env.RP_PROJECT }} rp-use-static-launch-name: true + continue-on-error: true - name: "Add GitHub Step Summary" + if: github.ref_name == 'master' env: RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} RP_KEY: ${{ steps.rp-prepare.outputs.key }} RP_URL: ${{ steps.rp-prepare.outputs.url }} run: bash scripts/ci/add_step_summary.sh + continue-on-error: true - name: "Run tests" id: run-tests env: - RP_OPTS: ${{ steps.rp-prepare.outputs.mvn-opts }} + RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | eval "args=($RP_OPTS)" mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" + if: github.ref_name == 'master' run: | echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY + continue-on-error: true - name: "Summarize Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v5.1.0 id: rp-summarize with: @@ -664,6 +727,7 @@ jobs: rp-launch-key: ${{ steps.rp-prepare.outputs.key }} rp-project: ${{ env.RP_PROJECT }} rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} + continue-on-error: true - name: "Exit on failure" if: steps.run-tests.outcome != 'success' run: | @@ -690,6 +754,7 @@ jobs: - name: "Run ActiveMQ" run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile activemq up -d - name: "Prepare Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v5.13.1 id: rp-prepare with: @@ -697,24 +762,30 @@ jobs: rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} rp-project: ${{ env.RP_PROJECT }} rp-use-static-launch-name: true + continue-on-error: true - name: "Add GitHub Step Summary" + if: github.ref_name == 'master' env: RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} RP_KEY: ${{ steps.rp-prepare.outputs.key }} RP_URL: ${{ steps.rp-prepare.outputs.url }} run: bash scripts/ci/add_step_summary.sh + continue-on-error: true - name: "Run tests" id: run-tests env: - RP_OPTS: ${{ steps.rp-prepare.outputs.mvn-opts }} + RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | eval "args=($RP_OPTS)" mvn -B test -pl repository -am -Dtest=MessagingUnitTestSuite -DfailIfNoTests=false "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" + if: github.ref_name == 'master' run: | echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY + continue-on-error: true - name: "Summarize Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v5.13.1 id: rp-summarize with: @@ -722,6 +793,7 @@ jobs: rp-launch-key: ${{ steps.rp-prepare.outputs.key }} rp-project: ${{ env.RP_PROJECT }} rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} + continue-on-error: true - name: "Exit on failure" if: steps.run-tests.outcome != 'success' run: | @@ -797,6 +869,7 @@ jobs: - name: "Set up the environment" run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d - name: "Prepare Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v5.1.0 id: rp-prepare with: @@ -804,24 +877,30 @@ jobs: rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} rp-project: ${{ env.RP_PROJECT }} rp-use-static-launch-name: true + continue-on-error: true - name: "Add GitHub Step Summary" + if: github.ref_name == 'master' env: RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} RP_KEY: ${{ steps.rp-prepare.outputs.key }} RP_URL: ${{ steps.rp-prepare.outputs.url }} run: bash scripts/ci/add_step_summary.sh + continue-on-error: true - name: "Run tests" id: run-tests env: - RP_OPTS: ${{ steps.rp-prepare.outputs.mvn-opts }} + RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | eval "args=($RP_OPTS)" mvn -B test -pl repository -am -Dtest=${{ matrix.testSuite }} -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco ${{ matrix.mvn-options }} "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" + if: github.ref_name == 'master' run: | echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY + continue-on-error: true - name: "Summarize Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v5.1.0 id: rp-summarize with: @@ -829,6 +908,7 @@ jobs: rp-launch-key: ${{ steps.rp-prepare.outputs.key }} rp-project: ${{ env.RP_PROJECT }} rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} + continue-on-error: true - name: "Exit on failure" if: steps.run-tests.outcome != 'success' run: | @@ -895,6 +975,7 @@ jobs: if: ${{ matrix.test-name }} == 'Integration TAS tests' run: mvn install -pl :alfresco-community-repo-integration-test -am -DskipTests -Pall-tas-tests - name: "Prepare Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v5.1.0 id: rp-prepare with: @@ -902,16 +983,19 @@ jobs: rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} rp-project: ${{ env.RP_PROJECT }} rp-use-static-launch-name: true + continue-on-error: true - name: "Add GitHub Step Summary" + if: github.ref_name == 'master' env: RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} RP_KEY: ${{ steps.rp-prepare.outputs.key }} RP_URL: ${{ steps.rp-prepare.outputs.url }} run: bash scripts/ci/add_step_summary.sh + continue-on-error: true - name: "Run tests" id: tests env: - RP_OPTS: ${{ steps.rp-prepare.outputs.mvn-opts }} + RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} run: | eval "args=($RP_OPTS)" @@ -924,9 +1008,12 @@ jobs: if: ${{ always() && steps.tests.outcome == 'failure' }} run: ${TAS_SCRIPTS}/output_logs_for_failures.sh "packaging/tests/${{ matrix.pom-dir }}" - name: "Update GitHub Step Summary" + if: github.ref_name == 'master' run: | echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY + continue-on-error: true - name: "Summarize Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v5.1.0 id: rp-summarize with: @@ -934,6 +1021,7 @@ jobs: rp-launch-key: ${{ steps.rp-prepare.outputs.key }} rp-project: ${{ env.RP_PROJECT }} rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} + continue-on-error: true - name: "Exit on failure" if: steps.tests.outcome != 'success' run: | @@ -960,6 +1048,7 @@ jobs: - name: "Run Postgres 15.4 database" run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d - name: "Prepare Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v5.1.0 id: rp-prepare with: @@ -967,24 +1056,30 @@ jobs: rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} rp-project: ${{ env.RP_PROJECT }} rp-use-static-launch-name: true + continue-on-error: true - name: "Add GitHub Step Summary" + if: github.ref_name == 'master' env: RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} RP_KEY: ${{ steps.rp-prepare.outputs.key }} RP_URL: ${{ steps.rp-prepare.outputs.url }} run: bash scripts/ci/add_step_summary.sh + continue-on-error: true - name: "Run tests" id: run-tests env: - RP_OPTS: ${{ steps.rp-prepare.outputs.mvn-opts }} + RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | eval "args=($RP_OPTS)" mvn -B test -pl :alfresco-share-services -am -Dtest=ShareServicesTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" + if: github.ref_name == 'master' run: | echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY + continue-on-error: true - name: "Summarize Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v5.1.0 id: rp-summarize with: @@ -992,6 +1087,7 @@ jobs: rp-launch-key: ${{ steps.rp-prepare.outputs.key }} rp-project: ${{ env.RP_PROJECT }} rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} + continue-on-error: true - name: "Exit on failure" if: steps.run-tests.outcome != 'success' run: | @@ -1027,6 +1123,7 @@ jobs: bash ./scripts/ci/init.sh bash ./scripts/ci/build.sh - name: "Prepare Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v5.1.0 id: rp-prepare with: @@ -1034,10 +1131,11 @@ jobs: rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} rp-project: ${{ env.RP_PROJECT }} rp-use-static-launch-name: true + continue-on-error: true - name: "Verify" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} env: - RP_OPTS: ${{ steps.rp-prepare.outputs.mvn-opts }} + RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | eval "args=($RP_OPTS)" mvn --file amps/ags/pom.xml -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-postgres -PagsAllTestSuitePt${{ matrix.part }} ${{ env.LOG_WARN }} "${args[@]}" @@ -1071,6 +1169,7 @@ jobs: bash ./scripts/ci/init.sh bash ./scripts/ci/build.sh - name: "Prepare Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v5.1.0 id: rp-prepare with: @@ -1078,10 +1177,11 @@ jobs: rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} rp-project: ${{ env.RP_PROJECT }} rp-use-static-launch-name: true + continue-on-error: true - name: "Verify" timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} env: - RP_OPTS: ${{ steps.rp-prepare.outputs.mvn-opts }} + RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | eval "args=($RP_OPTS)" mvn --file amps/ags/pom.xml -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-mysql -PagsAllTestSuitePt${{ matrix.part }} ${{ env.LOG_WARN }} "${args[@]}" @@ -1117,6 +1217,7 @@ jobs: ${{ env.TAS_SCRIPTS }}/wait-for-alfresco-start.sh "http://localhost:8080/alfresco" mvn -B install -pl :alfresco-governance-services-automation-community-rest-api -am -Pags -Pall-tas-tests -DskipTests - name: "Prepare Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v5.1.0 id: rp-prepare with: @@ -1124,25 +1225,31 @@ jobs: rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} rp-project: ${{ env.RP_PROJECT }} rp-use-static-launch-name: true + continue-on-error: true - name: "Add GitHub Step Summary" + if: github.ref_name == 'master' env: RP_ENABLED: ${{ steps.rp-prepare.outputs.enabled }} RP_KEY: ${{ steps.rp-prepare.outputs.key }} RP_URL: ${{ steps.rp-prepare.outputs.url }} run: bash scripts/ci/add_step_summary.sh + continue-on-error: true - name: "Test" id: run-tests timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} env: - RP_OPTS: ${{ steps.rp-prepare.outputs.mvn-opts }} + RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }} run: | eval "args=($RP_OPTS)" mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false -Pags -Pall-tas-tests "${args[@]}" continue-on-error: true - name: "Update GitHub Step Summary" + if: github.ref_name == 'master' run: | echo "#### ⏱ After Tests: $(date -u +'%Y-%m-%d %H:%M:%S%:z')" >> $GITHUB_STEP_SUMMARY + continue-on-error: true - name: "Summarize Report Portal" + if: github.ref_name == 'master' uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v5.1.0 id: rp-summarize with: @@ -1150,6 +1257,7 @@ jobs: rp-launch-key: ${{ steps.rp-prepare.outputs.key }} rp-project: ${{ env.RP_PROJECT }} rp-token: ${{ secrets.REPORT_PORTAL_TOKEN }} + continue-on-error: true - name: "Exit on failure" if: steps.run-tests.outcome != 'success' run: | From db8b353fb1d40c997386929033b158f62e91bb1b Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 15 Jul 2024 09:02:17 +0000 Subject: [PATCH 083/118] [maven-release-plugin][skip ci] prepare release 23.3.0.74 --- 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 b12c83c2af..428810c3e5 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 6ee5246093..9fac4f3237 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 - 23.3.0.74-SNAPSHOT + 23.3.0.74 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 8a13a410e7..3f63b04679 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 - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 474f6f302a..ef596cb5fc 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 - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 2e580511bf..1332504155 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 - 23.3.0.74-SNAPSHOT + 23.3.0.74 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 ef8d23e3b4..fe5a77a91e 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 - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/amps/pom.xml b/amps/pom.xml index eb3b5bda84..2730c4285a 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index e2bf287626..c19bc7e0e0 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/core/pom.xml b/core/pom.xml index 87445244f7..07cee43592 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/data-model/pom.xml b/data-model/pom.xml index f97440acae..8ef7124e2e 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/mmt/pom.xml b/mmt/pom.xml index f7bf671d66..27746317f3 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 9f681bf626..bc9e892e79 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 2360fe50a7..f5d5980fcd 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/packaging/pom.xml b/packaging/pom.xml index d308f34af4..e7d7b9ef28 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 0e1e0462f6..ed83335d71 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 6d3b6f2222..a358cfe31a 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 - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 1841662303..be9660ca09 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 - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 747e687a06..3bb55c25a8 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 - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 126d90a00d..ef3699441a 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 - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 94cc3f8078..76b15fa719 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 - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 96508db231..685134791f 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/pom.xml b/pom.xml index 0e07e8c86a..2f729fa42a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.74-SNAPSHOT + 23.3.0.74 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.74 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 9e8ddbc84e..1b4bd7e8fb 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.74-SNAPSHOT + 23.3.0.74 diff --git a/repository/pom.xml b/repository/pom.xml index 69073ce20e..c03abee050 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.74-SNAPSHOT + 23.3.0.74 From 6f13f36c5abefbeaed797a9443e72e12f16eb06f Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 15 Jul 2024 09:02:19 +0000 Subject: [PATCH 084/118] [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 428810c3e5..0545e70d0f 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 9fac4f3237..4bf4345a7e 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 - 23.3.0.74 + 23.3.0.75-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 3f63b04679..1e7f4a73d5 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 - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index ef596cb5fc..26c468c1e2 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 - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 1332504155..f418d072a1 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 - 23.3.0.74 + 23.3.0.75-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 fe5a77a91e..ad1a0db186 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 - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 2730c4285a..03e84d4dbc 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index c19bc7e0e0..f23a3a7838 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 07cee43592..7c20f988b3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 8ef7124e2e..7f86dbb49f 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 27746317f3..c58b0d0b54 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index bc9e892e79..c13bf2678f 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index f5d5980fcd..e54afb9dbc 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index e7d7b9ef28..09dfb2e669 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index ed83335d71..b6f543bd3a 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index a358cfe31a..1d6bebb219 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 - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index be9660ca09..97a368d10b 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 - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 3bb55c25a8..e600126fca 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 - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index ef3699441a..9c748324fb 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 - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 76b15fa719..345b123d45 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 - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 685134791f..186fd00f9d 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/pom.xml b/pom.xml index 2f729fa42a..d915305d5b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.74 + 23.3.0.75-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.74 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 1b4bd7e8fb..b0dbbd4d82 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.74 + 23.3.0.75-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index c03abee050..b2ae01115b 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.74 + 23.3.0.75-SNAPSHOT From 25c4b677de0b1c74abf66edec0a78cfb98db7e98 Mon Sep 17 00:00:00 2001 From: Manish Kumar <110275771+code4uuuu@users.noreply.github.com> Date: Mon, 15 Jul 2024 21:29:09 +0530 Subject: [PATCH 085/118] [PRODSEC-9364] added java-uuid-generator (#2778) * [PRODSEC-9364] added java-uuid-generator * [PRODSEC-9364] addressed formatting issues * [PRODSEC-9364] removed unnecessary qualifier java.util * [PRODSEC-9364] removed addition import and change year in header --- core/pom.xml | 8 +-- .../src/main/java/org/alfresco/util/GUID.java | 4 +- .../InMemoryTicketComponentImpl.java | 4 +- mmt/pom.xml | 2 +- .../module/tool/ModuleManagementTool.java | 4 +- .../quickshare/QuickShareServiceImpl.java | 11 ++-- .../SplitPersonCleanupBootstrapBean.java | 56 +++++++++---------- .../QuickShareServiceIntegrationTest.java | 11 ++-- 8 files changed, 51 insertions(+), 49 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 7c20f988b3..f4cb07f3ac 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -47,11 +47,11 @@ commons-math3 3.6.1 + - org.safehaus.jug - jug - 2.0.0 - asl + com.fasterxml.uuid + java-uuid-generator + 5.1.0 org.apache.logging.log4j diff --git a/core/src/main/java/org/alfresco/util/GUID.java b/core/src/main/java/org/alfresco/util/GUID.java index 227e928a5e..2e65c3975f 100644 --- a/core/src/main/java/org/alfresco/util/GUID.java +++ b/core/src/main/java/org/alfresco/util/GUID.java @@ -21,7 +21,7 @@ package org.alfresco.util; import java.security.SecureRandom; import java.util.Random; -import org.safehaus.uuid.UUIDGenerator; +import com.fasterxml.uuid.Generators; import org.alfresco.api.AlfrescoPublicApi; /** @@ -69,7 +69,7 @@ public final class GUID public static String generate() { int randomInt = RANDOM.nextInt(SECURE_RANDOM_POOL_MAX_ITEMS); - return UUIDGenerator.getInstance().generateRandomBasedUUID(SECURE_RANDOM_POOL[randomInt]).toString(); + return Generators.randomBasedGenerator(SECURE_RANDOM_POOL[randomInt]).generate().toString(); } // == Not sure if we need this functionality again (derekh) == diff --git a/data-model/src/main/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentImpl.java b/data-model/src/main/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentImpl.java index 4d37e707ef..7ee39afe3d 100644 --- a/data-model/src/main/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentImpl.java +++ b/data-model/src/main/java/org/alfresco/repo/security/authentication/InMemoryTicketComponentImpl.java @@ -33,13 +33,13 @@ import java.util.HashSet; import java.util.Set; import java.util.zip.CRC32; +import com.fasterxml.uuid.Generators; import org.alfresco.repo.cache.SimpleCache; import org.alfresco.service.cmr.repository.datatype.Duration; import org.alfresco.util.GUID; import org.apache.commons.codec.binary.Hex; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.safehaus.uuid.UUIDGenerator; import org.alfresco.util.ParameterCheck; /** @@ -497,7 +497,7 @@ public class InMemoryTicketComponentImpl implements TicketComponent this.userName = userName; this.validDuration = validDuration; this.testDuration = validDuration.divide(2); - final String guid = UUIDGenerator.getInstance().generateRandomBasedUUID().toString(); + final String guid = Generators.randomBasedGenerator().generate().toString(); this.ticketId = computeTicketId(expires, expiryDate, userName, guid); diff --git a/mmt/pom.xml b/mmt/pom.xml index c58b0d0b54..61182f191f 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -84,7 +84,7 @@ org.alfresco:alfresco-core org.alfresco:alfresco-repository org.apache.commons:commons-compress - org.safehaus.jug:jug + com.fasterxml.uuid:java-uuid-generator org.alfresco.surf:spring-surf-core org.tukaani:xz org.apache.maven:maven-artifact diff --git a/mmt/src/main/java/org/alfresco/repo/module/tool/ModuleManagementTool.java b/mmt/src/main/java/org/alfresco/repo/module/tool/ModuleManagementTool.java index a8f7f57dd2..631fe810a6 100644 --- a/mmt/src/main/java/org/alfresco/repo/module/tool/ModuleManagementTool.java +++ b/mmt/src/main/java/org/alfresco/repo/module/tool/ModuleManagementTool.java @@ -25,6 +25,7 @@ */ package org.alfresco.repo.module.tool; +import com.fasterxml.uuid.Generators; import de.schlichtherle.truezip.file.*; import de.schlichtherle.truezip.fs.FsSyncException; import de.schlichtherle.truezip.fs.archive.zip.JarDriver; @@ -34,7 +35,6 @@ import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.repo.module.ModuleVersionNumber; import org.alfresco.service.cmr.module.ModuleDetails; import org.alfresco.service.cmr.module.ModuleInstallState; -import org.safehaus.uuid.UUIDGenerator; import java.io.BufferedInputStream; import java.io.IOException; @@ -916,7 +916,7 @@ public class ModuleManagementTool implements LogOutput */ private static String generateGuid() { - return UUIDGenerator.getInstance().generateTimeBasedUUID().toString(); + return Generators.timeBasedGenerator().generate().toString(); } /** diff --git a/repository/src/main/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java b/repository/src/main/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java index 2102a2bf93..9757bc622a 100644 --- a/repository/src/main/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java +++ b/repository/src/main/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java @@ -36,7 +36,10 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; +import java.util.UUID; +import com.fasterxml.uuid.Generators; +import com.fasterxml.uuid.impl.UUIDUtil; import org.alfresco.sync.events.types.ActivityEvent; import org.alfresco.sync.events.types.Event; import org.alfresco.model.ContentModel; @@ -108,8 +111,6 @@ import org.apache.commons.logging.LogFactory; import org.joda.time.DateTime; import org.joda.time.Interval; import org.joda.time.PeriodType; -import org.safehaus.uuid.UUID; -import org.safehaus.uuid.UUIDGenerator; /** * QuickShare Service implementation. @@ -435,8 +436,8 @@ public class QuickShareServiceImpl implements QuickShareService, // If it is retura dto built from the existing properties. if (! nodeService.getAspects(nodeRef).contains(QuickShareModel.ASPECT_QSHARE)) { - UUID uuid = UUIDGenerator.getInstance().generateRandomBasedUUID(); - sharedId = Base64.encodeBase64URLSafeString(uuid.toByteArray()); // => 22 chars (eg. q3bEKPeDQvmJYgt4hJxOjw) + UUID uuid = Generators.randomBasedGenerator().generate(); + sharedId = Base64.encodeBase64URLSafeString(UUIDUtil.asByteArray(uuid)); // => 22 chars (eg. q3bEKPeDQvmJYgt4hJxOjw) final Map props = new HashMap(2); props.put(QuickShareModel.PROP_QSHARE_SHAREDID, sharedId); @@ -1246,7 +1247,7 @@ public class QuickShareServiceImpl implements QuickShareService, } // Create the expiry action - final QuickShareLinkExpiryAction expiryAction = new QuickShareLinkExpiryActionImpl(java.util.UUID.randomUUID().toString(), sharedId, + final QuickShareLinkExpiryAction expiryAction = new QuickShareLinkExpiryActionImpl(UUID.randomUUID().toString(), sharedId, "QuickShare link expiry action"); // Create the persisted schedule final ScheduledPersistedAction schedule = scheduledPersistedActionService.createSchedule(expiryAction); diff --git a/repository/src/main/java/org/alfresco/repo/security/person/SplitPersonCleanupBootstrapBean.java b/repository/src/main/java/org/alfresco/repo/security/person/SplitPersonCleanupBootstrapBean.java index 777ef52afb..c87679cc2e 100644 --- a/repository/src/main/java/org/alfresco/repo/security/person/SplitPersonCleanupBootstrapBean.java +++ b/repository/src/main/java/org/alfresco/repo/security/person/SplitPersonCleanupBootstrapBean.java @@ -1,32 +1,33 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 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% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2024 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.person; import java.util.Set; import java.util.TreeSet; +import java.util.UUID; import org.alfresco.model.ContentModel; import org.alfresco.repo.batch.BatchProcessor; @@ -41,7 +42,6 @@ import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.alfresco.util.GUID; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.safehaus.uuid.UUID; import org.springframework.context.ApplicationEvent; /** @@ -168,7 +168,7 @@ public class SplitPersonCleanupBootstrapBean extends AbstractLifecycleBean try { @SuppressWarnings("unused") - UUID id = new UUID(guidString); + UUID id = UUID.fromString(guidString); // We have a valid guid. return true; } @@ -188,7 +188,7 @@ public class SplitPersonCleanupBootstrapBean extends AbstractLifecycleBean try { @SuppressWarnings("unused") - UUID id = new UUID(guidString); + UUID id = UUID.fromString(guidString); // We have a valid guid. return true; } diff --git a/repository/src/test/java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java b/repository/src/test/java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java index 1c50d23fd6..fbba0bdba2 100644 --- a/repository/src/test/java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java +++ b/repository/src/test/java/org/alfresco/repo/quickshare/QuickShareServiceIntegrationTest.java @@ -37,7 +37,10 @@ import java.io.Serializable; import java.util.Date; import java.util.Map; import java.util.Properties; +import java.util.UUID; +import com.fasterxml.uuid.Generators; +import com.fasterxml.uuid.impl.UUIDUtil; import org.alfresco.model.ContentModel; import org.alfresco.model.QuickShareModel; import org.alfresco.repo.model.Repository; @@ -83,8 +86,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.RuleChain; -import org.safehaus.uuid.UUID; -import org.safehaus.uuid.UUIDGenerator; import org.springframework.context.ApplicationContext; /** @@ -420,8 +421,8 @@ public class QuickShareServiceIntegrationTest @Test(expected=InvalidSharedIdException.class) public void getMetadataFromShareIdWithInvalidId() { - UUID uuid = UUIDGenerator.getInstance().generateRandomBasedUUID(); - String sharedId = Base64.encodeBase64URLSafeString(uuid.toByteArray()); // => 22 chars (eg. q3bEKPeDQvmJYgt4hJxOjw) + UUID uuid = Generators.randomBasedGenerator().generate(); + String sharedId = Base64.encodeBase64URLSafeString(UUIDUtil.asByteArray(uuid)); // => 22 chars (eg. q3bEKPeDQvmJYgt4hJxOjw) Map metadata = quickShareService.getMetaData(sharedId); } @@ -884,7 +885,7 @@ public class QuickShareServiceIntegrationTest { // Create a private site AuthenticationUtil.setFullyAuthenticatedUser(user1.getUsername()); - String randomUUID = UUIDGenerator.getInstance().generateRandomBasedUUID().toString(); + String randomUUID = Generators.randomBasedGenerator().generate().toString(); String siteName = "testSite" + randomUUID; siteService.createSite("site-dashboard", siteName, "Title for " + siteName, "Description for " + siteName, SiteVisibility.PRIVATE); From 24575c436ee56d5c117d411f94d16ce3457cd60d Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 15 Jul 2024 16:37:33 +0000 Subject: [PATCH 086/118] [maven-release-plugin][skip ci] prepare release 23.3.0.75 --- 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 0545e70d0f..3a8d4d99ff 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 4bf4345a7e..a3acd018d9 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 - 23.3.0.75-SNAPSHOT + 23.3.0.75 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 1e7f4a73d5..8ac82fe537 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 - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 26c468c1e2..491a94cca2 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 - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index f418d072a1..c19e360af7 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 - 23.3.0.75-SNAPSHOT + 23.3.0.75 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 ad1a0db186..9074cef88d 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 - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/amps/pom.xml b/amps/pom.xml index 03e84d4dbc..3fe2e8702a 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index f23a3a7838..36e5dd1ea0 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/core/pom.xml b/core/pom.xml index f4cb07f3ac..adf1b44f2f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/data-model/pom.xml b/data-model/pom.xml index 7f86dbb49f..5abb502eba 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/mmt/pom.xml b/mmt/pom.xml index 61182f191f..2c9d130cc6 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index c13bf2678f..bebed0bb5a 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index e54afb9dbc..af63ac3304 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/packaging/pom.xml b/packaging/pom.xml index 09dfb2e669..db8e66c639 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index b6f543bd3a..0b64a68f23 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 1d6bebb219..98c8dabbf0 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 - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 97a368d10b..eb29f82fa6 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 - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index e600126fca..aa3060b24c 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 - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 9c748324fb..0fafac5f06 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 - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 345b123d45..4df81bbe01 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 - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 186fd00f9d..6f9a9770b0 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/pom.xml b/pom.xml index d915305d5b..9830fb2f75 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.75-SNAPSHOT + 23.3.0.75 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.75 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index b0dbbd4d82..92eb68e1f7 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.75-SNAPSHOT + 23.3.0.75 diff --git a/repository/pom.xml b/repository/pom.xml index b2ae01115b..3fcf0d556c 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.75-SNAPSHOT + 23.3.0.75 From 10f4b10ae84382cda93e91ee0098fef20ee01a62 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Mon, 15 Jul 2024 16:37:35 +0000 Subject: [PATCH 087/118] [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 3a8d4d99ff..3f22ca5ab7 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index a3acd018d9..fa473a3866 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 - 23.3.0.75 + 23.3.0.76-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 8ac82fe537..7b549a21b5 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 - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 491a94cca2..bfd3475c5b 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 - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index c19e360af7..082611420e 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 - 23.3.0.75 + 23.3.0.76-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 9074cef88d..afb795dfda 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 - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 3fe2e8702a..f7b0f7e8fc 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 36e5dd1ea0..933b512d6e 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index adf1b44f2f..5bfbc66a4a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 5abb502eba..f88c3d4e3b 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 2c9d130cc6..631a068401 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index bebed0bb5a..a03abb6687 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index af63ac3304..daeccb7b14 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index db8e66c639..10654364a1 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 0b64a68f23..04ed959805 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 98c8dabbf0..3dd8248d82 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 - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index eb29f82fa6..0c699594d9 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 - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index aa3060b24c..535472e091 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 - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 0fafac5f06..877788c1c2 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 - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 4df81bbe01..fbf4d8669c 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 - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 6f9a9770b0..9b022dbdf5 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/pom.xml b/pom.xml index 9830fb2f75..ade49d29e4 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.75 + 23.3.0.76-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.75 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 92eb68e1f7..1b273febca 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.75 + 23.3.0.76-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 3fcf0d556c..8c2413e950 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.75 + 23.3.0.76-SNAPSHOT From 51a51ecd6b318e8c3bc1fe095e09d20f2798080b Mon Sep 17 00:00:00 2001 From: Manish Kumar Date: Wed, 17 Jul 2024 13:52:19 +0530 Subject: [PATCH 088/118] [PRODSEC-8922] fix xss vulnerability --- packaging/war/pom.xml | 5 +++++ packaging/war/src/main/webapp/index.jsp | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 9b022dbdf5..ed956ad6a6 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -110,6 +110,11 @@ mysql-connector-java test + + org.owasp.encoder + encoder + 1.2.3 + diff --git a/packaging/war/src/main/webapp/index.jsp b/packaging/war/src/main/webapp/index.jsp index 97357660e6..3628992c3b 100644 --- a/packaging/war/src/main/webapp/index.jsp +++ b/packaging/war/src/main/webapp/index.jsp @@ -34,6 +34,7 @@ <%@ page import="org.alfresco.service.cmr.module.ModuleDetails" %> <%@ page import="org.alfresco.service.cmr.module.ModuleInstallState" %> <%@ page import="java.util.Calendar" %> +<%@ page import="org.owasp.encoder.Encode" %> <% @@ -88,7 +89,7 @@ ModuleDetails shareServicesModule = moduleService.getModule("alfresco-share-serv

Alfresco WebScripts Home (admin only - INTERNAL)

-

Alfresco API Explorer

+

Alfresco API Explorer

<% if (descriptorService.getLicenseDescriptor() == null && transactionService.isReadOnly()) { From 278aa593029c714e6fcffeff88b98bfe2df85ad1 Mon Sep 17 00:00:00 2001 From: Suneet Gupta <89080268+suneet-gupta@users.noreply.github.com> Date: Wed, 17 Jul 2024 15:14:57 +0530 Subject: [PATCH 089/118] [MNT-24310] Fix AGS Rest API returning non RM objects (#2787) * [MNT-24310] Fix AGS Rest API returning non RM objects * [MNT-24310] Fix AGS Rest API returning non RM objects * [MNT-24310] Fix AGS Rest API returning non RM objects * [MNT-24310] Fix AGS Rest API returning non RM objects * [MNT-24310] Fix AGS Rest API returning non RM objects --- .../rm/rest/api/impl/SearchTypesFactory.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/SearchTypesFactory.java b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/SearchTypesFactory.java index 1989162c6b..e8a1f41a9e 100644 --- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/SearchTypesFactory.java +++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/SearchTypesFactory.java @@ -92,7 +92,7 @@ public class SearchTypesFactory boolean includeRecords = false; boolean includeSubTypes = false; - if (q != null) + if (q != null && q.getTree() != null) { // filtering via "where" clause MapBasedQueryWalker propertyWalker = new MapBasedQueryWalker(listFolderChildrenEqualsQueryProperties, null); @@ -101,11 +101,11 @@ public class SearchTypesFactory Boolean isUnfiledRecordFolder = propertyWalker.getProperty(UnfiledChild.PARAM_IS_UNFILED_RECORD_FOLDER, WhereClauseParser.EQUALS, Boolean.class); Boolean isRecord = propertyWalker.getProperty(UnfiledChild.PARAM_IS_RECORD, WhereClauseParser.EQUALS, Boolean.class); - if ((isUnfiledRecordFolder != null && isUnfiledRecordFolder.booleanValue()) || (isRecord != null && !isRecord.booleanValue())) + if (checkIncludeUnfiledRecordFolders(isUnfiledRecordFolder, isRecord)) { includeUnfiledRecordFolders = true; } - else if ((isUnfiledRecordFolder != null && !isUnfiledRecordFolder.booleanValue()) || (isRecord != null && isRecord.booleanValue())) + else if (checkIncludeRecords(isUnfiledRecordFolder, isRecord)) { includeRecords = true; } @@ -199,11 +199,11 @@ public class SearchTypesFactory WhereClauseParser.EQUALS, Boolean.class); Boolean isRecordCategory = propertyWalker.getProperty(RecordCategoryChild.PARAM_IS_RECORD_CATEGORY, WhereClauseParser.EQUALS, Boolean.class); - if ((isRecordFolder != null && isRecordFolder.booleanValue()) || (isRecordCategory != null && !isRecordCategory.booleanValue())) + if (checkIncludeUnfiledRecordFolders(isRecordFolder, isRecordCategory)) { includeRecordFolders = true; } - else if ((isRecordFolder != null && !isRecordFolder.booleanValue()) || (isRecordCategory != null && isRecordCategory.booleanValue())) + else if (checkIncludeRecords(isRecordFolder, isRecordCategory)) { includeRecordCategories = true; } @@ -291,4 +291,16 @@ public class SearchTypesFactory return new Pair<>(filterNodeTypeQName, filterIncludeSubTypes); } + + private static boolean checkIncludeRecords(Boolean isUnfiledRecordFolder, Boolean isRecord) + { + return (isUnfiledRecordFolder != null && !isUnfiledRecordFolder.booleanValue()) || (isRecord != null + && isRecord.booleanValue()); + } + + private static boolean checkIncludeUnfiledRecordFolders(Boolean isUnfiledRecordFolder, Boolean isRecord) + { + return (isUnfiledRecordFolder != null && isUnfiledRecordFolder.booleanValue()) || (isRecord != null + && !isRecord.booleanValue()); + } } From 1ce46c2039c9c3712a1a95ba4cdcb3a2b8bfd82a Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 17 Jul 2024 10:20:50 +0000 Subject: [PATCH 090/118] [maven-release-plugin][skip ci] prepare release 23.3.0.76 --- 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 3f22ca5ab7..57f565c15f 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index fa473a3866..83a7ac4dca 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 - 23.3.0.76-SNAPSHOT + 23.3.0.76 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 7b549a21b5..e6b54a3deb 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 - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index bfd3475c5b..c69f9e14a4 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 - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 082611420e..129bfe12cb 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 - 23.3.0.76-SNAPSHOT + 23.3.0.76 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 afb795dfda..9fab4c2b0c 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 - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/amps/pom.xml b/amps/pom.xml index f7b0f7e8fc..2802d459d5 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 933b512d6e..cfc629422d 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/core/pom.xml b/core/pom.xml index 5bfbc66a4a..4aab8458b9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/data-model/pom.xml b/data-model/pom.xml index f88c3d4e3b..ad656307f8 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/mmt/pom.xml b/mmt/pom.xml index 631a068401..af9bd456da 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index a03abb6687..240947dfe8 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index daeccb7b14..66c59f32cd 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/packaging/pom.xml b/packaging/pom.xml index 10654364a1..99b3b7888b 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 04ed959805..c7d97d10d8 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 3dd8248d82..6e43587eae 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 - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 0c699594d9..bfae07a291 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 - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 535472e091..0801527079 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 - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 877788c1c2..d4381cc20b 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 - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index fbf4d8669c..673cd1fb4f 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 - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 9b022dbdf5..86758aa2e6 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/pom.xml b/pom.xml index ade49d29e4..9c94e2830c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.76-SNAPSHOT + 23.3.0.76 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.76 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 1b273febca..106a5812eb 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.76-SNAPSHOT + 23.3.0.76 diff --git a/repository/pom.xml b/repository/pom.xml index 8c2413e950..631230f3c4 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.76-SNAPSHOT + 23.3.0.76 From b63a3eae9bdd0efc8fa4e3f64c39eb02e45f9385 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 17 Jul 2024 10:20:52 +0000 Subject: [PATCH 091/118] [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 57f565c15f..0e79873945 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 83a7ac4dca..4c5b63686f 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 - 23.3.0.76 + 23.3.0.77-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 e6b54a3deb..0ce3695f5b 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 - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index c69f9e14a4..097d41f279 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 - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 129bfe12cb..efd2bc4dac 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 - 23.3.0.76 + 23.3.0.77-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 9fab4c2b0c..b11ceec08e 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 - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 2802d459d5..9f045d4308 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index cfc629422d..8557f9df11 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 4aab8458b9..2634dc8865 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index ad656307f8..1fc5ad50fe 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index af9bd456da..11ec41a0f8 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 240947dfe8..90da9ba95c 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 66c59f32cd..824c6102bb 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 99b3b7888b..4ce8bf1126 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index c7d97d10d8..1efb20e98e 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 6e43587eae..ffebc357ff 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 - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index bfae07a291..69d8eba255 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 - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 0801527079..961a77fcdf 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 - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index d4381cc20b..d83c2fe302 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 - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 673cd1fb4f..2f4616d2c5 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 - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 86758aa2e6..a898921573 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/pom.xml b/pom.xml index 9c94e2830c..b1bb2e987b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.76 + 23.3.0.77-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.76 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 106a5812eb..b00455d7b8 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.76 + 23.3.0.77-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 631230f3c4..8764615ed0 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.76 + 23.3.0.77-SNAPSHOT From 9ed29967b77e51ec5e2b69e51bd2b72da73523bb Mon Sep 17 00:00:00 2001 From: Eva Vasques Date: Wed, 17 Jul 2024 11:47:06 +0100 Subject: [PATCH 092/118] MNT-24503 - Limits on FixedAclUpdater (#2788) * Limit the job execution to a configurable amount of nodes (system.fixedACLsUpdater.maxItems) * Add query template select_NodesWithAspectIds_Limited that does a left join with alf_store and limits the results * Query executions by the job are now limited to maxItemBatchSize * Imposing the order by in the query is now configurable (system.fixedACLsUpdater.orderNodes) --- .../java/org/alfresco/ibatis/IdsEntity.java | 10 ++ .../repo/domain/node/AbstractNodeDAOImpl.java | 22 ++++ .../alfresco/repo/domain/node/NodeDAO.java | 16 +++ .../repo/domain/node/ibatis/NodeDAOImpl.java | 28 +++++ .../domain/permissions/FixedAclUpdater.java | 59 +++++++++- .../node-common-SqlMap.xml | 19 ++++ .../public-services-security-context.xml | 2 + .../resources/alfresco/repository.properties | 6 +- .../permissions/FixedAclUpdaterTest.java | 101 ++++++++++++++++-- 9 files changed, 251 insertions(+), 12 deletions(-) diff --git a/repository/src/main/java/org/alfresco/ibatis/IdsEntity.java b/repository/src/main/java/org/alfresco/ibatis/IdsEntity.java index 8178745189..96a49a4f07 100644 --- a/repository/src/main/java/org/alfresco/ibatis/IdsEntity.java +++ b/repository/src/main/java/org/alfresco/ibatis/IdsEntity.java @@ -41,6 +41,8 @@ public class IdsEntity private Long idFour; private List ids; private boolean ordered; + private Integer maxResults; + public Long getIdOne() { return idOne; @@ -89,4 +91,12 @@ public class IdsEntity { this.ordered = ordered; } + public int getMaxResults() + { + return maxResults; + } + public void setMaxResults(Integer maxResults) + { + this.maxResults = maxResults; + } } diff --git a/repository/src/main/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java index 1095e7448d..9b223788c5 100644 --- a/repository/src/main/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java +++ b/repository/src/main/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java @@ -2785,6 +2785,23 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO selectNodesWithAspects(qnameIds, minNodeId, maxNodeId, ordered, resultsCallback); } + @Override + public void getNodesWithAspects( + Set aspectQNames, + Long minNodeId, Long maxNodeId, boolean ordered, + int maxResults, + NodeRefQueryCallback resultsCallback) + { + Set qnameIdsSet = qnameDAO.convertQNamesToIds(aspectQNames, false); + if (qnameIdsSet.isEmpty()) + { + // No point running a query + return; + } + List qnameIds = new ArrayList<>(qnameIdsSet); + selectNodesWithAspects(qnameIds, minNodeId, maxNodeId, ordered, maxResults, resultsCallback); + } + /** * @return Returns a writable copy of the cached aspects set */ @@ -4960,6 +4977,10 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO List qnameIds, Long minNodeId, Long maxNodeId, boolean ordered, NodeRefQueryCallback resultsCallback); + protected abstract void selectNodesWithAspects( + List qnameIds, + Long minNodeId, Long maxNodeId, boolean ordered, int maxResults, + NodeRefQueryCallback resultsCallback); protected abstract Long insertNodeAssoc(Long sourceNodeId, Long targetNodeId, Long assocTypeQNameId, int assocIndex); protected abstract int updateNodeAssoc(Long id, int assocIndex); protected abstract int deleteNodeAssoc(Long sourceNodeId, Long targetNodeId, Long assocTypeQNameId); @@ -5088,4 +5109,5 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO protected abstract Long selectMinTxInNodeIdRange(Long fromNodeId, Long toNodeId); protected abstract Long selectMaxTxInNodeIdRange(Long fromNodeId, Long toNodeId); protected abstract Long selectNextTxCommitTime(Long fromCommitTime); + } diff --git a/repository/src/main/java/org/alfresco/repo/domain/node/NodeDAO.java b/repository/src/main/java/org/alfresco/repo/domain/node/NodeDAO.java index 3c1bb2675d..6ef10852ab 100644 --- a/repository/src/main/java/org/alfresco/repo/domain/node/NodeDAO.java +++ b/repository/src/main/java/org/alfresco/repo/domain/node/NodeDAO.java @@ -427,6 +427,22 @@ public interface NodeDAO extends NodeBulkLoader Long minNodeId, Long maxNodeId, boolean ordered, NodeRefQueryCallback resultsCallback); + /** + * Get nodes with aspects between the given ranges, ordering the results optionally + * and limit the result set + * + * @param aspectQNames the aspects that must be on the nodes + * @param minNodeId the minimum node ID (inclusive) + * @param maxNodeId the maximum node ID (exclusive) + * @param ordered if the results are to be ordered by nodeID + * @param maxResults limit query to maxResults + * @param resultsCallback callback to process results + */ + public void getNodesWithAspects( + Set aspectQNames, + Long minNodeId, Long maxNodeId, boolean ordered, int maxResults, + NodeRefQueryCallback resultsCallback); + /* * Node Assocs */ diff --git a/repository/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java index a387385de0..1357975404 100644 --- a/repository/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java +++ b/repository/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java @@ -116,6 +116,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl private static final String SELECT_NODE_MAX_ID = "alfresco.node.select_NodeMaxId"; private static final String SELECT_NODE_INTERVAL_BY_TYPE = "alfresco.node.select_MinMaxNodeIdForNodeType"; private static final String SELECT_NODES_WITH_ASPECT_IDS = "alfresco.node.select_NodesWithAspectIds"; + private static final String SELECT_NODES_WITH_ASPECT_IDS_LIMITED = "alfresco.node.select_NodesWithAspectIds_Limited"; private static final String INSERT_NODE_ASSOC = "alfresco.node.insert.insert_NodeAssoc"; private static final String UPDATE_NODE_ASSOC = "alfresco.node.update_NodeAssoc"; private static final String DELETE_NODE_ASSOC = "alfresco.node.delete_NodeAssoc"; @@ -799,6 +800,33 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl template.select(SELECT_NODES_WITH_ASPECT_IDS, parameters, resultHandler); } + @Override + protected void selectNodesWithAspects( + List qnameIds, + Long minNodeId, Long maxNodeId, boolean ordered, + final int maxResults, + final NodeRefQueryCallback resultsCallback) + { + @SuppressWarnings("rawtypes") + ResultHandler resultHandler = new ResultHandler() + { + public void handleResult(ResultContext context) + { + NodeEntity entity = (NodeEntity) context.getResultObject(); + Pair nodePair = new Pair<>(entity.getId(), entity.getNodeRef()); + resultsCallback.handle(nodePair); + } + }; + + IdsEntity parameters = new IdsEntity(); + parameters.setIdOne(minNodeId); + parameters.setIdTwo(maxNodeId); + parameters.setIds(qnameIds); + parameters.setOrdered(ordered); + parameters.setMaxResults(maxResults); + template.select(SELECT_NODES_WITH_ASPECT_IDS_LIMITED, parameters, resultHandler); + } + @Override protected Long insertNodeAssoc(Long sourceNodeId, Long targetNodeId, Long assocTypeQNameId, int assocIndex) { diff --git a/repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java index f313c25dd8..750c85afaf 100644 --- a/repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java +++ b/repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java @@ -85,8 +85,11 @@ public class FixedAclUpdater extends TransactionListenerAdapter implements Appli public static final String FIXED_ACL_ASYNC_REQUIRED_KEY = "FIXED_ACL_ASYNC_REQUIRED"; public static final String FIXED_ACL_ASYNC_CALL_KEY = "FIXED_ACL_ASYNC_CALL"; + protected static final QName LOCK_Q_NAME = QName.createQName(NamespaceService.SYSTEM_MODEL_1_0_URI, "FixedAclUpdater"); + private static final int DEFAULT_MAX_ITEMS = Integer.MAX_VALUE; + /** A set of listeners to receive callback events whenever permissions are updated by this class. */ private static Set listeners = Sets.newConcurrentHashSet(); @@ -101,6 +104,8 @@ public class FixedAclUpdater extends TransactionListenerAdapter implements Appli private int maxItemBatchSize = 100; private int numThreads = 4; private boolean forceSharedACL = false; + private int maxItems = DEFAULT_MAX_ITEMS; + private boolean orderNodes = true; private ClassPolicyDelegate onInheritPermissionsDisabledDelegate; private PolicyComponent policyComponent; @@ -147,12 +152,22 @@ public class FixedAclUpdater extends TransactionListenerAdapter implements Appli this.forceSharedACL = forceSharedACL; } + public void setOrderNodes(boolean orderNodes) + { + this.orderNodes = orderNodes; + } + public void setLockTimeToLive(long lockTimeToLive) { this.lockTimeToLive = lockTimeToLive; this.lockRefreshTime = lockTimeToLive / 2; } + public void setMaxItems(int maxItems) + { + this.maxItems = maxItems > 0 ? maxItems : DEFAULT_MAX_ITEMS; + } + public void setPolicyComponent(PolicyComponent policyComponent) { this.policyComponent = policyComponent; @@ -209,7 +224,7 @@ public class FixedAclUpdater extends TransactionListenerAdapter implements Appli public List execute() throws Throwable { getNodesCallback.init(); - nodeDAO.getNodesWithAspects(aspects, getNodesCallback.getMinNodeId(), null, true, getNodesCallback); + nodeDAO.getNodesWithAspects(aspects, getNodesCallback.getMinNodeId(), null, orderNodes, maxItemBatchSize, getNodesCallback); getNodesCallback.done(); return getNodesCallback.getNodes(); @@ -231,6 +246,12 @@ public class FixedAclUpdater extends TransactionListenerAdapter implements Appli return countNodesCallback.getCount(); } }, false, true); + + if (count > maxItems) + { + log.info("Total nodes with pending acl: " + count + " Limiting work to " + maxItems); + return maxItems; + } return count; } } @@ -238,6 +259,9 @@ public class FixedAclUpdater extends TransactionListenerAdapter implements Appli private class AclWorkProvider implements BatchProcessWorkProvider { private GetNodesWithAspects getNodesWithAspects; + private long estimatedUpdatedItems; + private long execTime; + private long execBatches; AclWorkProvider() { @@ -259,8 +283,37 @@ public class FixedAclUpdater extends TransactionListenerAdapter implements Appli @Override public Collection getNextWork() { - return getNodesWithAspects.getNodesWithAspects(); + if(estimatedUpdatedItems >= maxItems) + { + log.info("Reached max items to process. Nodes Processed: " + estimatedUpdatedItems + "/" + maxItems); + return Collections.emptyList(); + } + + long initTime = System.currentTimeMillis(); + Collection batchNodes = getNodesWithAspects.getNodesWithAspects(); + long endTime = System.currentTimeMillis(); + + if (log.isDebugEnabled()) + { + log.debug("Query for batch executed in " + (endTime-initTime) + " ms"); + } + + if (!batchNodes.isEmpty()) + { + // Increment estimatedUpdatedItems with the expected number of nodes to process + estimatedUpdatedItems += batchNodes.size(); + execTime+=endTime-initTime; + execBatches++; + } + + return batchNodes; } + + public double getAverageQueryExecutionTime() + { + return execBatches > 0 ? execTime/execBatches : 0; + } + } protected class AclWorker implements BatchProcessor.BatchProcessWorker @@ -451,6 +504,7 @@ public class FixedAclUpdater extends TransactionListenerAdapter implements Appli try { + log.info("Running FixedAclUpdater. Max Items: " + maxItems + ", Impose order: " + orderNodes); lockToken = jobLockService.getLock(LOCK_Q_NAME, lockTimeToLive, 0, 1); jobLockService.refreshLock(lockToken, LOCK_Q_NAME, lockRefreshTime, jobLockRefreshCallback); @@ -460,6 +514,7 @@ public class FixedAclUpdater extends TransactionListenerAdapter implements Appli transactionService.getRetryingTransactionHelper(), provider, numThreads, maxItemBatchSize, applicationContext, log, 100); int count = bp.process(worker, true); + log.info("FixedAclUpdater updated " + count + ". Average query time " + provider.getAverageQueryExecutionTime() + " ms"); return count; } catch (LockAcquisitionException e) diff --git a/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-common-SqlMap.xml b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-common-SqlMap.xml index 1bd8e4844d..9c1a6a0bd8 100644 --- a/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-common-SqlMap.xml +++ b/repository/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-common-SqlMap.xml @@ -782,6 +782,25 @@ order by node.id ASC + + select diff --git a/repository/src/main/resources/alfresco/public-services-security-context.xml b/repository/src/main/resources/alfresco/public-services-security-context.xml index 8f8769493e..6b7806df0a 100644 --- a/repository/src/main/resources/alfresco/public-services-security-context.xml +++ b/repository/src/main/resources/alfresco/public-services-security-context.xml @@ -121,6 +121,8 @@ + + diff --git a/repository/src/main/resources/alfresco/repository.properties b/repository/src/main/resources/alfresco/repository.properties index 02347cc32d..a6774373ca 100644 --- a/repository/src/main/resources/alfresco/repository.properties +++ b/repository/src/main/resources/alfresco/repository.properties @@ -1104,7 +1104,11 @@ system.fixedACLsUpdater.numThreads=4 # fixedACLsUpdater - Force shared ACL to propagate through children even if there is an unexpected ACL system.fixedACLsUpdater.forceSharedACL=false # fixedACLsUpdater cron expression - fire at midnight every day -system.fixedACLsUpdater.cronExpression=0 0 0 * * ? +system.fixedACLsUpdater.cronExpression=0 0 0 * * ? +# fixedACLsUpdater - maximum number of pending ACLs to process overall +system.fixedACLsUpdater.maxItems=-1 +# fixedACLsUpdater - Impose the order by in the query. If false, it may not process all the results but should do the queries faster +system.fixedACLsUpdater.orderNodes=true cmis.disable.hidden.leading.period.files=false diff --git a/repository/src/test/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterTest.java b/repository/src/test/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterTest.java index ad0dabfaf3..f66c3003a5 100644 --- a/repository/src/test/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterTest.java +++ b/repository/src/test/java/org/alfresco/repo/domain/permissions/FixedAclUpdaterTest.java @@ -104,9 +104,9 @@ public class FixedAclUpdaterTest private ContentService contentService; private AuthorityService authorityService; private static final long MAX_TRANSACTION_TIME_DEFAULT = 10; + private static final int LARGE_TRANSACTION_TIME = 86_400_000; private static final int[] filesPerLevelMoreFolders = { 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; private static final int[] filesPerLevelMoreFiles = { 5, 100 }; - private long maxTransactionTime; private static HashMap> errors; private static String TEST_GROUP_NAME = "FixedACLUpdaterTest"; private static String TEST_GROUP_NAME_FULL = PermissionService.GROUP_PREFIX + TEST_GROUP_NAME; @@ -134,8 +134,11 @@ public class FixedAclUpdaterTest AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName()); homeFolderNodeRef = repository.getCompanyHome(); - maxTransactionTime = MAX_TRANSACTION_TIME_DEFAULT; - setFixedAclMaxTransactionTime(permissionsDaoComponent, homeFolderNodeRef, maxTransactionTime); + setFixedAclMaxTransactionTime(permissionsDaoComponent, homeFolderNodeRef, MAX_TRANSACTION_TIME_DEFAULT); + + fixedAclUpdater.setForceSharedACL(false); + fixedAclUpdater.setMaxItems(-1); + fixedAclUpdater.setOrderNodes(true); } @After @@ -155,8 +158,7 @@ public class FixedAclUpdaterTest try { - maxTransactionTime = 86400000; - setFixedAclMaxTransactionTime(permissionsDaoComponent, homeFolderNodeRef, maxTransactionTime); + setFixedAclMaxTransactionTime(permissionsDaoComponent, homeFolderNodeRef, LARGE_TRANSACTION_TIME); setPermissionsOnTree(folderRef, false, false); aclComparator.compareACLs(); @@ -164,6 +166,7 @@ public class FixedAclUpdaterTest } finally { + setFixedAclMaxTransactionTime(permissionsDaoComponent, homeFolderNodeRef, MAX_TRANSACTION_TIME_DEFAULT); deleteNodes(folderRef); } } @@ -344,8 +347,7 @@ public class FixedAclUpdaterTest try { - maxTransactionTime = 86400000; - setFixedAclMaxTransactionTime(permissionsDaoComponent, homeFolderNodeRef, maxTransactionTime); + setFixedAclMaxTransactionTime(permissionsDaoComponent, homeFolderNodeRef, LARGE_TRANSACTION_TIME); // Set permissions on target folder txnHelper.doInTransaction((RetryingTransactionCallback) () -> { @@ -386,6 +388,7 @@ public class FixedAclUpdaterTest } finally { + setFixedAclMaxTransactionTime(permissionsDaoComponent, homeFolderNodeRef, MAX_TRANSACTION_TIME_DEFAULT); deleteNodes(originalRef); deleteNodes(targetRefBase); } @@ -1438,6 +1441,79 @@ public class FixedAclUpdaterTest } } + /* + * Test with maxItems limit + */ + @Test + @RetryAtMost(3) + public void testWithLimits() + { + NodeRef folderRef = createFolderHierarchyInRootForFileTests("testWithLimitsFolder"); + + try + { + int maxItems = 200; + setPermissionsOnTree(folderRef, true, true); + + // Get the current amount of pending ACls + int initialPendingAcls = getNodesCountWithPendingFixedAclAspect(); + + // We need at least maxItems+1 pending ACLs + while (initialPendingAcls <= maxItems && initialPendingAcls > 0) + { + // Trigger the job a single round each time to create new pendings until we have enough + triggerFixedACLJob(false,true,maxItems,1); + initialPendingAcls = getNodesCountWithPendingFixedAclAspect(); + } + + assertTrue("We don't have enough pending acls to test", initialPendingAcls > 0); + + // Increase transaction time to not create new pending ACLs + setFixedAclMaxTransactionTime(permissionsDaoComponent, homeFolderNodeRef, LARGE_TRANSACTION_TIME); + + // Trigger job in single round without timeout + triggerFixedACLJob(false,true,maxItems,1); + + int finalPendingAcls = getNodesCountWithPendingFixedAclAspect(); + + assertTrue("Processed ACLs should not have exceeded 200", (initialPendingAcls - finalPendingAcls) <= maxItems); + } + finally + { + setFixedAclMaxTransactionTime(permissionsDaoComponent, homeFolderNodeRef, MAX_TRANSACTION_TIME_DEFAULT); + deleteNodes(folderRef); + } + } + + /* + * Test without imposing the order by + */ + @Test + @RetryAtMost(3) + public void testUnordered() + { + NodeRef folderRef = createFolderHierarchyInRootForFileTests("testWithLimitsFolder"); + + try + { + setPermissionsOnTree(folderRef, true, true); + + int initialPendingAcls = getNodesCountWithPendingFixedAclAspect(); + assertTrue("We don't have enough pending acls to test", initialPendingAcls > 0); + + triggerFixedACLJob(false,true,-1,30); + + int finalPendingAcls = getNodesCountWithPendingFixedAclAspect(); + + assertEquals("Not all ACls were processed",0, finalPendingAcls); + } + finally + { + setFixedAclMaxTransactionTime(permissionsDaoComponent, homeFolderNodeRef, MAX_TRANSACTION_TIME_DEFAULT); + deleteNodes(folderRef); + } + } + private Long getChild(Long parentId) { List children = fileFolderService.list(nodeDAO.getNodePair(parentId).getSecond()); @@ -1601,13 +1677,18 @@ public class FixedAclUpdaterTest private void triggerFixedACLJob() { - triggerFixedACLJob(false); + // Trigger job 30 times max to process all nodes + triggerFixedACLJob(false, true, -1, 30); } private void triggerFixedACLJob(boolean forceSharedACL) + { + triggerFixedACLJob(forceSharedACL, true, -1, 30); + } + + private void triggerFixedACLJob(boolean forceSharedACL, boolean orderNodes, int maxItems, int rounds) { LOG.debug("Fixing ACL"); - final int rounds = 30; final int enoughZeros = 3; int numberOfConsecutiveZeros = 0; @@ -1615,6 +1696,8 @@ public class FixedAclUpdaterTest { int count = txnHelper.doInTransaction(() -> { fixedAclUpdater.setForceSharedACL(forceSharedACL); + fixedAclUpdater.setMaxItems(maxItems); + fixedAclUpdater.setOrderNodes(orderNodes); return fixedAclUpdater.execute(); }, false, true); numberOfConsecutiveZeros = count == 0 ? numberOfConsecutiveZeros + 1 : 0; From cabc38b386cbb400a901047e7a101b619107d31b Mon Sep 17 00:00:00 2001 From: SathishK-T <166369440+SathishK-T@users.noreply.github.com> Date: Wed, 17 Jul 2024 16:19:19 +0530 Subject: [PATCH 093/118] [MNT-24137] Audit Issue Internal Server Error fix (#2786) * [MNT-24137][ags][tas] Audit Bug Fix * [MNT-24137][ags][tas] Audit Bug Fix * [MNT-24137][ags][tas] Audit Bug Fix * [MNT-24137][ags][tas] Audit Bug Fix * [MNT-24137][ags][tas] Audit Bug Fix * [MNT-24137][ags][tas] Audit Bug Fix * [MNT-24137][ags][tas] Audit Bug Fix --------- Co-authored-by: Sathish Kumar --- ...Mv33HoldAuditEntryValuesPatchUnitTest.java | 6 +- .../org/alfresco/rest/api/impl/AuditImpl.java | 8 +-- .../alfresco/repo/audit/AuditComponent.java | 5 +- .../repo/audit/AuditComponentImpl.java | 10 ++- .../alfresco/repo/audit/AuditServiceImpl.java | 6 +- .../org/alfresco/repo/domain/CrcHelper.java | 63 +++++++++--------- .../alfresco/repo/domain/audit/AuditDAO.java | 5 +- .../domain/audit/ibatis/AuditDAOImpl.java | 4 +- .../propval/PropertyStringValueEntity.java | 64 +++++++++++-------- .../service/cmr/audit/AuditService.java | 5 +- 10 files changed, 92 insertions(+), 84 deletions(-) diff --git a/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java b/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java index 44be8da09d..e89f055e45 100644 --- a/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java +++ b/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java @@ -93,15 +93,15 @@ public class RMv33HoldAuditEntryValuesPatchUnitTest verify(mockedRecordsManagementQueryDAO, times(1)).updatePropertyStringValueEntity(deleteHoldPropertyStringValueEntity); assertEquals("Add To Hold", addToHoldPropertyStringValueEntity.getStringValue()); - assertEquals("add to hold", addToHoldPropertyStringValueEntity.getStringEndLower()); + assertEquals("add to hold", addToHoldPropertyStringValueEntity.getStringLower()); assertEquals(Long.valueOf(770_786_109L), addToHoldPropertyStringValueEntity.getStringCrc()); assertEquals("Remove From Hold", removeFromHoldPropertyStringValueEntity.getStringValue()); - assertEquals("remove from hold", removeFromHoldPropertyStringValueEntity.getStringEndLower()); + assertEquals("remove from hold", removeFromHoldPropertyStringValueEntity.getStringLower()); assertEquals(Long.valueOf(2_967_613_012L), removeFromHoldPropertyStringValueEntity.getStringCrc()); assertEquals("Delete Hold", deleteHoldPropertyStringValueEntity.getStringValue()); - assertEquals("delete hold", deleteHoldPropertyStringValueEntity.getStringEndLower()); + assertEquals("delete hold", deleteHoldPropertyStringValueEntity.getStringLower()); assertEquals(Long.valueOf(132_640_810L), deleteHoldPropertyStringValueEntity.getStringCrc()); } diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/AuditImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/AuditImpl.java index cf44a92f9c..d2259e3c6c 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/AuditImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/AuditImpl.java @@ -2,7 +2,7 @@ * #%L * Alfresco Remote API * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -909,16 +909,14 @@ public class AuditImpl implements Audit public int getAuditEntriesCountByAppAndProperties(AuditService.AuditApplication auditApplication, AuditEntryQueryWalker propertyWalker) { - final String applicationName = auditApplication.getKey().substring(1); - AuditQueryParameters parameters = new AuditQueryParameters(); - parameters.setApplicationName(applicationName); + parameters.setApplicationName(auditApplication.getName()); parameters.setFromTime(propertyWalker.getFromTime()); parameters.setToTime(propertyWalker.getToTime()); parameters.setFromId(propertyWalker.getFromId()); parameters.setToId(propertyWalker.getToId()); parameters.setUser(propertyWalker.getCreatedByUser()); - return auditService.getAuditEntriesCountByAppAndProperties(applicationName, parameters); + return auditService.getAuditEntriesCountByAppAndProperties(parameters); } } diff --git a/repository/src/main/java/org/alfresco/repo/audit/AuditComponent.java b/repository/src/main/java/org/alfresco/repo/audit/AuditComponent.java index 821c0c4759..29955432a7 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/AuditComponent.java +++ b/repository/src/main/java/org/alfresco/repo/audit/AuditComponent.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -276,11 +276,10 @@ public interface AuditComponent /** * Issue an audit query to retrieve count of records for a given application and properties * - * @param applicationName the name of the application * @param parameters audit parameters provided by the where clause on the ReST API * @return a map containing min/max and the associated value */ - default int getAuditEntriesCountByAppAndProperties(String applicationName, AuditQueryParameters parameters) + default int getAuditEntriesCountByAppAndProperties(AuditQueryParameters parameters) { return -1; } diff --git a/repository/src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java b/repository/src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java index 38fbd5ff69..98479db3af 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java +++ b/repository/src/main/java/org/alfresco/repo/audit/AuditComponentImpl.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -956,10 +956,8 @@ public class AuditComponentImpl implements AuditComponent return auditDAO.getAuditEntriesCountByApp(applicationId); } - @Override public int getAuditEntriesCountByAppAndProperties(String applicationName, AuditQueryParameters parameters) + @Override public int getAuditEntriesCountByAppAndProperties(AuditQueryParameters parameters) { - org.alfresco.repo.domain.audit.AuditQueryParameters dbParameters = new org.alfresco.repo.domain.audit.AuditQueryParameters(); - - return auditDAO.getAuditEntriesCountByAppAndProperties(applicationName, parameters); + return auditDAO.getAuditEntriesCountByAppAndProperties(parameters); } -} +} \ No newline at end of file diff --git a/repository/src/main/java/org/alfresco/repo/audit/AuditServiceImpl.java b/repository/src/main/java/org/alfresco/repo/audit/AuditServiceImpl.java index 7c92ec8e3f..4824914e51 100644 --- a/repository/src/main/java/org/alfresco/repo/audit/AuditServiceImpl.java +++ b/repository/src/main/java/org/alfresco/repo/audit/AuditServiceImpl.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -190,8 +190,8 @@ public class AuditServiceImpl implements AuditService /** * {@inheritDoc} */ - @Override public int getAuditEntriesCountByAppAndProperties(String applicationName, AuditQueryParameters parameters) + @Override public int getAuditEntriesCountByAppAndProperties(AuditQueryParameters parameters) { - return auditComponent.getAuditEntriesCountByAppAndProperties(applicationName, parameters); + return auditComponent.getAuditEntriesCountByAppAndProperties(parameters); } } \ No newline at end of file diff --git a/repository/src/main/java/org/alfresco/repo/domain/CrcHelper.java b/repository/src/main/java/org/alfresco/repo/domain/CrcHelper.java index 8c71789809..d3cdb157b6 100644 --- a/repository/src/main/java/org/alfresco/repo/domain/CrcHelper.java +++ b/repository/src/main/java/org/alfresco/repo/domain/CrcHelper.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 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% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2024 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.domain; @@ -102,21 +102,22 @@ public class CrcHelper { throw new RuntimeException("UTF-8 encoding is not supported"); } - // Get the short value (case-sensitive or not) + // Crc Value will change based on the case-sensitive, So we need to get the short value based on case-sensitive String valueShort = null; - int valueLen = valueLowerCase.length(); + String currentValue = caseSensitive ? value : valueLowerCase; + int valueLen = currentValue.length(); if (valueLen < dataLength) { - valueShort = valueLowerCase; + valueShort = currentValue; } else if (useCharsFromStart) { - valueShort = valueLowerCase.substring(0, dataLength - 1); + valueShort = currentValue.substring(0, dataLength - 1); } else { - valueShort = valueLowerCase.substring(valueLen - dataLength); + valueShort = currentValue.substring(valueLen - dataLength); } return new Pair(valueShort, valueCrc); } -} +} \ No newline at end of file diff --git a/repository/src/main/java/org/alfresco/repo/domain/audit/AuditDAO.java b/repository/src/main/java/org/alfresco/repo/domain/audit/AuditDAO.java index f8c61d0a8c..cac517706e 100644 --- a/repository/src/main/java/org/alfresco/repo/domain/audit/AuditDAO.java +++ b/repository/src/main/java/org/alfresco/repo/domain/audit/AuditDAO.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -248,11 +248,10 @@ public interface AuditDAO /** * Issue an audit query to retrieve count of records for a given application and properties * - * @param applicationName name of the application to be queried * @param parameters audit parameters provided by the where clause on the ReST API * @return a map containing min/max and the associated value */ - default int getAuditEntriesCountByAppAndProperties(String applicationName, org.alfresco.service.cmr.audit.AuditQueryParameters parameters) + default int getAuditEntriesCountByAppAndProperties(org.alfresco.service.cmr.audit.AuditQueryParameters parameters) { return -1; } diff --git a/repository/src/main/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java b/repository/src/main/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java index 89f602dba5..12468dbf8e 100644 --- a/repository/src/main/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java +++ b/repository/src/main/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -237,7 +237,7 @@ public class AuditDAOImpl extends AbstractAuditDAOImpl } @Override - public int getAuditEntriesCountByAppAndProperties(String applicationName, org.alfresco.service.cmr.audit.AuditQueryParameters parameters) + public int getAuditEntriesCountByAppAndProperties(org.alfresco.service.cmr.audit.AuditQueryParameters parameters) { AuditQueryParameters dbParameters = convertFromRestAuditQueryParameters(parameters); diff --git a/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java index dbc3090298..56e188fbf6 100644 --- a/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java +++ b/repository/src/main/java/org/alfresco/repo/domain/propval/PropertyStringValueEntity.java @@ -1,28 +1,28 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2016 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% - */ +/* + * #%L + * Alfresco Repository + * %% + * Copyright (C) 2005 - 2024 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.domain.propval; import org.alfresco.repo.domain.CrcHelper; @@ -44,6 +44,7 @@ public class PropertyStringValueEntity private String stringValue; private String stringEndLower; private Long stringCrc; + private String stringLower; public PropertyStringValueEntity() { @@ -115,6 +116,9 @@ public class PropertyStringValueEntity Pair crcPair = CrcHelper.getStringCrcPair(value, 16, false, true); stringEndLower = crcPair.getFirst(); stringCrc = crcPair.getSecond(); + // Calculate the crc value with case-insensitive + Pair crcPairWithCaseInSensitive = CrcHelper.getStringCrcPair(value, 16, false, false); + stringLower = crcPairWithCaseInSensitive.getFirst(); } public Long getId() @@ -156,4 +160,14 @@ public class PropertyStringValueEntity { this.stringCrc = stringCrc; } + + public String getStringLower() + { + return stringLower; + } + + public void setStringLower(String stringLower) + { + this.stringLower = stringLower; + } } diff --git a/repository/src/main/java/org/alfresco/service/cmr/audit/AuditService.java b/repository/src/main/java/org/alfresco/service/cmr/audit/AuditService.java index 4a7bcd0091..bbb2f886ac 100644 --- a/repository/src/main/java/org/alfresco/service/cmr/audit/AuditService.java +++ b/repository/src/main/java/org/alfresco/service/cmr/audit/AuditService.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2016 Alfresco Software Limited + * Copyright (C) 2005 - 2024 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -256,11 +256,10 @@ public interface AuditService /** * Issue an audit query to retrieve min / max audit record id for a given application and properties * - * @param applicationName the name of the application * @param parameters audit parameters provided by the where clause on the ReST API * @return a map containing min/max and the associated value */ - default int getAuditEntriesCountByAppAndProperties(String applicationName, AuditQueryParameters parameters) + default int getAuditEntriesCountByAppAndProperties(AuditQueryParameters parameters) { return -1; } From a98f44803a261f23770d4a9b1e07304d3483907c Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 17 Jul 2024 11:25:19 +0000 Subject: [PATCH 094/118] [maven-release-plugin][skip ci] prepare release 23.3.0.77 --- 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 0e79873945..9358213a00 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 4c5b63686f..cc30fe8f76 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 - 23.3.0.77-SNAPSHOT + 23.3.0.77 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 0ce3695f5b..cd1dd592d0 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 - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 097d41f279..d11cd8d229 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 - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index efd2bc4dac..d936b3e4e1 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 - 23.3.0.77-SNAPSHOT + 23.3.0.77 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 b11ceec08e..e3be891609 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 - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/amps/pom.xml b/amps/pom.xml index 9f045d4308..7e2c0b3329 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 8557f9df11..571e61a007 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/core/pom.xml b/core/pom.xml index 2634dc8865..cc4bab9cc9 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/data-model/pom.xml b/data-model/pom.xml index 1fc5ad50fe..829fb664be 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/mmt/pom.xml b/mmt/pom.xml index 11ec41a0f8..5257cc99d6 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 90da9ba95c..0a9e34a92c 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 824c6102bb..acdc63fbed 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/packaging/pom.xml b/packaging/pom.xml index 4ce8bf1126..7f3e3c4636 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 1efb20e98e..442d735323 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index ffebc357ff..9adaed46fd 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 - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 69d8eba255..7848feaef2 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 - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 961a77fcdf..217fefe5be 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 - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index d83c2fe302..a4fb002588 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 - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 2f4616d2c5..6f7899db74 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 - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index a898921573..18e5b9210f 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/pom.xml b/pom.xml index b1bb2e987b..091d7dd313 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.77-SNAPSHOT + 23.3.0.77 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.77 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index b00455d7b8..5ce2bf5c69 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.77-SNAPSHOT + 23.3.0.77 diff --git a/repository/pom.xml b/repository/pom.xml index 8764615ed0..7d37f64c28 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.77-SNAPSHOT + 23.3.0.77 From a01d375e6f43d4a1074f9f89e7af81f9ed181009 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 17 Jul 2024 11:25:21 +0000 Subject: [PATCH 095/118] [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 9358213a00..14a00ee4ec 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index cc30fe8f76..a4a08f482f 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 - 23.3.0.77 + 23.3.0.78-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 cd1dd592d0..55311a706d 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 - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index d11cd8d229..6dd76a3d2c 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 - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index d936b3e4e1..23f8620601 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 - 23.3.0.77 + 23.3.0.78-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 e3be891609..592505c65b 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 - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 7e2c0b3329..588a8618f2 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 571e61a007..bc890ce9d7 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index cc4bab9cc9..a230bb9a31 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 829fb664be..7fbc6a943c 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 5257cc99d6..021bda252c 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 0a9e34a92c..53c240507b 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index acdc63fbed..6f78ecb2eb 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 7f3e3c4636..2befd7e28a 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 442d735323..32bd5197ff 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 9adaed46fd..727bd8fa74 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 - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 7848feaef2..13beee6f03 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 - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 217fefe5be..bcd272a7a9 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 - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index a4fb002588..a644e89483 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 - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 6f7899db74..1a1035e094 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 - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 18e5b9210f..d6527d5c89 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/pom.xml b/pom.xml index 091d7dd313..31b68d7755 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.77 + 23.3.0.78-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.77 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 5ce2bf5c69..54e599614b 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.77 + 23.3.0.78-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 7d37f64c28..b0950aed9b 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.77 + 23.3.0.78-SNAPSHOT From e39606aec5166dfd8a2ae2e0d9da62d370c28b8e Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 18 Jul 2024 08:49:21 +0000 Subject: [PATCH 096/118] [maven-release-plugin][skip ci] prepare release 23.3.0.78 --- 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 14a00ee4ec..098d826561 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index a4a08f482f..212e836884 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 - 23.3.0.78-SNAPSHOT + 23.3.0.78 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 55311a706d..93d3d02072 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 - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 6dd76a3d2c..dec1761031 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 - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 23f8620601..33c3ac3fe1 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 - 23.3.0.78-SNAPSHOT + 23.3.0.78 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 592505c65b..816f0fa065 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 - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/amps/pom.xml b/amps/pom.xml index 588a8618f2..614ece474f 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index bc890ce9d7..426ca7c371 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/core/pom.xml b/core/pom.xml index a230bb9a31..6d57c33794 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/data-model/pom.xml b/data-model/pom.xml index 7fbc6a943c..6802479b42 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/mmt/pom.xml b/mmt/pom.xml index 021bda252c..bb4c3b3c04 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 53c240507b..061f0ad9bc 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 6f78ecb2eb..826a699d57 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/packaging/pom.xml b/packaging/pom.xml index 2befd7e28a..18c1667155 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 32bd5197ff..bfc8e9c647 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 727bd8fa74..f017c186a7 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 - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 13beee6f03..aa6d82c5f9 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 - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index bcd272a7a9..9577623e76 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 - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index a644e89483..a9fd126864 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 - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 1a1035e094..b7b5c52f8a 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 - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index cfb7ebeb09..08f0cfc047 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/pom.xml b/pom.xml index 31b68d7755..2e67d9cfe3 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.78-SNAPSHOT + 23.3.0.78 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.78 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 54e599614b..cc92649d51 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.78-SNAPSHOT + 23.3.0.78 diff --git a/repository/pom.xml b/repository/pom.xml index b0950aed9b..b80fc9ac61 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.78-SNAPSHOT + 23.3.0.78 From 64baf03818eae03c66d1228b059d6ef74bd8ef36 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 18 Jul 2024 08:49:23 +0000 Subject: [PATCH 097/118] [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 098d826561..d80b9c2c79 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 212e836884..9666ae57fe 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 - 23.3.0.78 + 23.3.0.79-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 93d3d02072..2ac030e967 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 - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index dec1761031..e03e0838c9 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 - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 33c3ac3fe1..d4f108c0b4 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 - 23.3.0.78 + 23.3.0.79-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 816f0fa065..3ac8c0e479 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 - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 614ece474f..bbb82d1881 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 426ca7c371..f7d46bf778 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 6d57c33794..3b0125f54c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 6802479b42..a618614c20 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index bb4c3b3c04..65d7b0c263 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 061f0ad9bc..ac9c21b513 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 826a699d57..a66d73b625 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 18c1667155..cd740f3879 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index bfc8e9c647..322075833b 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index f017c186a7..dbfcbd1fb1 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 - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index aa6d82c5f9..c935da9b60 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 - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 9577623e76..f425a98ef5 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 - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index a9fd126864..497bb3fcaa 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 - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index b7b5c52f8a..279d89c643 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 - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 08f0cfc047..85d67a35ad 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/pom.xml b/pom.xml index 2e67d9cfe3..1932152c19 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.78 + 23.3.0.79-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.78 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index cc92649d51..fa180b52ff 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.78 + 23.3.0.79-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index b80fc9ac61..f743538093 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.78 + 23.3.0.79-SNAPSHOT From 93d4701d80d1a5cc61d912de3b8cfebfc36a6f3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jul 2024 10:22:28 +0200 Subject: [PATCH 098/118] Bump dependency.cxf.version from 4.0.4 to 4.0.5 (#2794) Bumps `dependency.cxf.version` from 4.0.4 to 4.0.5. Updates `org.apache.cxf:cxf-rt-frontend-jaxws` from 4.0.4 to 4.0.5 Updates `org.apache.cxf:cxf-rt-frontend-jaxrs` from 4.0.4 to 4.0.5 Updates `org.apache.cxf:cxf-rt-rs-client` from 4.0.4 to 4.0.5 Updates `org.apache.cxf:cxf-rt-transports-http` from 4.0.4 to 4.0.5 Updates `org.apache.cxf:cxf-rt-ws-policy` from 4.0.4 to 4.0.5 --- updated-dependencies: - dependency-name: org.apache.cxf:cxf-rt-frontend-jaxws dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-frontend-jaxrs dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-rs-client dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-transports-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-ws-policy 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 1932152c19..5f48538e6a 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 6.3.1 3.5.3 2.15.2 - 4.0.4 + 4.0.5 1.0.0-jakarta-1 9.0 1.78.1 From eacdbd37706a6b782b5e54c5b02e7454f061ff6d Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 19 Jul 2024 09:04:21 +0000 Subject: [PATCH 099/118] [maven-release-plugin][skip ci] prepare release 23.3.0.79 --- 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 d80b9c2c79..032102fa2d 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 9666ae57fe..108d1933f0 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 - 23.3.0.79-SNAPSHOT + 23.3.0.79 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 2ac030e967..a73806900b 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 - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index e03e0838c9..76eb664e6b 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 - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index d4f108c0b4..d4a3890ad1 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 - 23.3.0.79-SNAPSHOT + 23.3.0.79 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 3ac8c0e479..6351fb093d 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 - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/amps/pom.xml b/amps/pom.xml index bbb82d1881..2c45203512 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index f7d46bf778..b923e5ae0d 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/core/pom.xml b/core/pom.xml index 3b0125f54c..2b83d4b62f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/data-model/pom.xml b/data-model/pom.xml index a618614c20..6d2b0cb535 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/mmt/pom.xml b/mmt/pom.xml index 65d7b0c263..587afccd5c 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index ac9c21b513..4118df02a1 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index a66d73b625..7b6e647119 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/packaging/pom.xml b/packaging/pom.xml index cd740f3879..e2cbfb60f6 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 322075833b..8b03b0f3c9 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index dbfcbd1fb1..bf75367ad3 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 - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index c935da9b60..b75f5f0500 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 - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index f425a98ef5..6eb35e66d1 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 - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 497bb3fcaa..e4c1b07bd9 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 - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 279d89c643..1e7e9b87eb 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 - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 85d67a35ad..7ec910fd6c 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/pom.xml b/pom.xml index 5f48538e6a..d5ab1f58e2 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.79-SNAPSHOT + 23.3.0.79 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.79 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index fa180b52ff..9986db8771 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.79-SNAPSHOT + 23.3.0.79 diff --git a/repository/pom.xml b/repository/pom.xml index f743538093..fcb871ca73 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.79-SNAPSHOT + 23.3.0.79 From 120f45ba92db028c2b49614bede49992bc36293f Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 19 Jul 2024 09:04:23 +0000 Subject: [PATCH 100/118] [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 032102fa2d..347cd372e8 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 108d1933f0..39e14f20a7 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 - 23.3.0.79 + 23.3.0.80-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 a73806900b..0d1217f028 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 - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 76eb664e6b..b8c9377303 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 - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index d4a3890ad1..29ae489cc7 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 - 23.3.0.79 + 23.3.0.80-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 6351fb093d..8e14ce4341 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 - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 2c45203512..9fc6e5b514 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index b923e5ae0d..095a2b7685 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 2b83d4b62f..069162d068 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 6d2b0cb535..2edf1f6b36 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 587afccd5c..9476018b00 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 4118df02a1..39023646e4 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 7b6e647119..fbfc2fcbdb 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index e2cbfb60f6..01fe3c6fe1 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 8b03b0f3c9..bf717f814e 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index bf75367ad3..68ab77cdd2 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 - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index b75f5f0500..09dc823a05 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 - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 6eb35e66d1..61c47b54bf 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 - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index e4c1b07bd9..5559ef0e16 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 - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 1e7e9b87eb..211ebe73ae 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 - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 7ec910fd6c..4bab98d722 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/pom.xml b/pom.xml index d5ab1f58e2..b78e500dab 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.79 + 23.3.0.80-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.79 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 9986db8771..fbc887d52e 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.79 + 23.3.0.80-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index fcb871ca73..e399a20f2a 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.79 + 23.3.0.80-SNAPSHOT From 55c9cf3407d25a8a269d1732c169231f97399160 Mon Sep 17 00:00:00 2001 From: Alfresco CI User Date: Sun, 21 Jul 2024 00:04:10 +0000 Subject: [PATCH 101/118] [force] Force release for 2024-07-21. From 9cc93de7b2fd62b94e721a96acb166b935c88f55 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 21 Jul 2024 00:07:00 +0000 Subject: [PATCH 102/118] [maven-release-plugin][skip ci] prepare release 23.3.0.80 --- 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 347cd372e8..03a99dee59 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 39e14f20a7..c6a6575715 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 - 23.3.0.80-SNAPSHOT + 23.3.0.80 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 0d1217f028..92ba73ae13 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 - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index b8c9377303..6d722d3322 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 - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 29ae489cc7..fc7e6eb31c 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 - 23.3.0.80-SNAPSHOT + 23.3.0.80 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 8e14ce4341..8dc613441b 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 - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/amps/pom.xml b/amps/pom.xml index 9fc6e5b514..56c3decb5f 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 095a2b7685..60ca977f6a 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/core/pom.xml b/core/pom.xml index 069162d068..21f43795c0 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/data-model/pom.xml b/data-model/pom.xml index 2edf1f6b36..e1894758c2 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/mmt/pom.xml b/mmt/pom.xml index 9476018b00..9501fe46bf 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 39023646e4..4b2b4a2b51 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index fbfc2fcbdb..36c55e5e27 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/packaging/pom.xml b/packaging/pom.xml index 01fe3c6fe1..29b772cc4a 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index bf717f814e..035bf12643 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 68ab77cdd2..8f79c563ca 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 - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 09dc823a05..90c5a65d9e 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 - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 61c47b54bf..dd97ca4b4b 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 - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 5559ef0e16..3cbf700cba 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 - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 211ebe73ae..4e182d3cdc 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 - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 4bab98d722..2561797ff1 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/pom.xml b/pom.xml index b78e500dab..5434ac0b4d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.80-SNAPSHOT + 23.3.0.80 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.80 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index fbc887d52e..1810cf09d3 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.80-SNAPSHOT + 23.3.0.80 diff --git a/repository/pom.xml b/repository/pom.xml index e399a20f2a..fbb6acb2bc 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.80-SNAPSHOT + 23.3.0.80 From 79219692226889f6c383f1cf9a10dea8b616952e Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 21 Jul 2024 00:07:02 +0000 Subject: [PATCH 103/118] [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 03a99dee59..a38de804e6 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index c6a6575715..6df4238551 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 - 23.3.0.80 + 23.3.0.81-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 92ba73ae13..69fdc1ebd8 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 - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 6d722d3322..73a02f0e54 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 - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index fc7e6eb31c..aef14c072b 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 - 23.3.0.80 + 23.3.0.81-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 8dc613441b..d6dc03f7aa 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 - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 56c3decb5f..3102611f80 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 60ca977f6a..dcb667f0d2 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 21f43795c0..3744eb568c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index e1894758c2..0f5f8368a7 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 9501fe46bf..af7abfb7b4 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 4b2b4a2b51..f12f103130 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 36c55e5e27..cc693a8d77 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 29b772cc4a..5fc928d20a 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 035bf12643..f7a5e7ab71 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 8f79c563ca..8e2b518488 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 - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 90c5a65d9e..fb59cf47bd 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 - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index dd97ca4b4b..bc7b4fd27f 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 - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 3cbf700cba..10ab607ca0 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 - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 4e182d3cdc..3184c2f6cf 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 - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 2561797ff1..6eedc13f46 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/pom.xml b/pom.xml index 5434ac0b4d..c4cc162a8e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.80 + 23.3.0.81-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.80 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 1810cf09d3..1601cc3923 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.80 + 23.3.0.81-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index fbb6acb2bc..1c9d2a93b2 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.80 + 23.3.0.81-SNAPSHOT From 1a7027327e317bc959d98ff584eaf7b6a87d67ad Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 23 Jul 2024 08:19:54 +0100 Subject: [PATCH 104/118] [skip tests] PRODENG-291 Upgrade ya-pmd-scan. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc24f5d3ee..48c793de7f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -138,7 +138,7 @@ jobs: - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2 - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2 - - uses: Alfresco/ya-pmd-scan@v3.0.2 + - uses: Alfresco/ya-pmd-scan@v4.0.0 with: classpath-build-command: "mvn test-compile -ntp -Pags -pl \"-:alfresco-community-repo-docker\"" From 1342c6a7bbda96cf7b933e0822f30d6599a96665 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 23 Jul 2024 11:55:45 +0000 Subject: [PATCH 105/118] [maven-release-plugin][skip ci] prepare release 23.3.0.81 --- 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 a38de804e6..21a9a2a978 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 6df4238551..f5cadd4675 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 - 23.3.0.81-SNAPSHOT + 23.3.0.81 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 69fdc1ebd8..3df184f891 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 - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 73a02f0e54..da18190dcb 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 - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index aef14c072b..eb1e07a19c 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 - 23.3.0.81-SNAPSHOT + 23.3.0.81 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 d6dc03f7aa..7520b09279 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 - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/amps/pom.xml b/amps/pom.xml index 3102611f80..ebafbe5eaf 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index dcb667f0d2..4ab131735d 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/core/pom.xml b/core/pom.xml index 3744eb568c..34d244e78c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/data-model/pom.xml b/data-model/pom.xml index 0f5f8368a7..2e76d10c71 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/mmt/pom.xml b/mmt/pom.xml index af7abfb7b4..bb17c10e7f 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index f12f103130..93a9b68a01 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index cc693a8d77..4ef101dec6 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/packaging/pom.xml b/packaging/pom.xml index 5fc928d20a..313c19a10e 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index f7a5e7ab71..b62bdeb401 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 8e2b518488..bee63207e6 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 - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index fb59cf47bd..9a28683532 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 - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index bc7b4fd27f..22dffb1b8d 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 - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 10ab607ca0..a54115a109 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 - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 3184c2f6cf..437736ae59 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 - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 6eedc13f46..b94ade229d 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/pom.xml b/pom.xml index c4cc162a8e..b1a64000cf 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.81-SNAPSHOT + 23.3.0.81 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.81 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 1601cc3923..a9b55a91f2 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.81-SNAPSHOT + 23.3.0.81 diff --git a/repository/pom.xml b/repository/pom.xml index 1c9d2a93b2..072e9f2b41 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.81-SNAPSHOT + 23.3.0.81 From 8d1d2b4f1bb420d6a1696e2258d56cfdc7c43bac Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 23 Jul 2024 11:55:48 +0000 Subject: [PATCH 106/118] [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 21a9a2a978..47c0ebdc0c 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index f5cadd4675..2041affde7 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 - 23.3.0.81 + 23.3.0.82-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 3df184f891..efc8fb0595 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 - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index da18190dcb..3bae1a43b3 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 - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index eb1e07a19c..a8252878e8 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 - 23.3.0.81 + 23.3.0.82-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 7520b09279..51fcaa2f24 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 - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index ebafbe5eaf..a2485badcf 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 4ab131735d..ce336bb768 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 34d244e78c..ed14465526 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 2e76d10c71..41225a10b8 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index bb17c10e7f..449ddb0d11 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 93a9b68a01..eeea8509cb 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 4ef101dec6..567bde1925 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 313c19a10e..3dba3af938 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index b62bdeb401..c3adc616b9 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index bee63207e6..48588c903e 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 - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 9a28683532..4dca194831 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 - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 22dffb1b8d..13d02835b3 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 - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index a54115a109..6917b7960a 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 - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 437736ae59..420be71286 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 - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index b94ade229d..da9eeadedb 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/pom.xml b/pom.xml index b1a64000cf..432d6ed8a8 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.81 + 23.3.0.82-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.81 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index a9b55a91f2..adc44ca05e 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.81 + 23.3.0.82-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 072e9f2b41..97b73e45fb 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.81 + 23.3.0.82-SNAPSHOT From 03625565e98a34549daf335565e7e9b65be27806 Mon Sep 17 00:00:00 2001 From: purusothaman-mm <164840115+purusothaman-mm@users.noreply.github.com> Date: Wed, 24 Jul 2024 10:45:14 +0530 Subject: [PATCH 107/118] [MNT-24292] fix for delete vulnerability (#2806) --- .../capability/rm-capabilities-recordfolder-context.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml b/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml index 97f9aee406..5cfeda829e 100644 --- a/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml +++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml @@ -125,7 +125,7 @@ parent="declarativeCapability"> - + RECORD_FOLDER From fe5a01e2bd7cb07add494523fb81e37cf4b1246f Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 24 Jul 2024 05:54:20 +0000 Subject: [PATCH 108/118] [maven-release-plugin][skip ci] prepare release 23.3.0.82 --- 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 47c0ebdc0c..7d53225cf6 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 2041affde7..efda759409 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 - 23.3.0.82-SNAPSHOT + 23.3.0.82 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 efc8fb0595..803c82d5b3 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 - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 3bae1a43b3..b06fa88332 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 - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index a8252878e8..91f4c6331c 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 - 23.3.0.82-SNAPSHOT + 23.3.0.82 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 51fcaa2f24..7d98627897 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 - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/amps/pom.xml b/amps/pom.xml index a2485badcf..4900a83c80 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index ce336bb768..c5848400a5 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/core/pom.xml b/core/pom.xml index ed14465526..867765dcf4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/data-model/pom.xml b/data-model/pom.xml index 41225a10b8..9214a4a1c4 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/mmt/pom.xml b/mmt/pom.xml index 449ddb0d11..3e8d12dfb5 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index eeea8509cb..fb8bdc160a 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 567bde1925..b84738d44e 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/packaging/pom.xml b/packaging/pom.xml index 3dba3af938..57f2573e0a 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index c3adc616b9..1d8864f318 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 48588c903e..ef0c582cb0 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 - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 4dca194831..9ebda2f866 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 - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 13d02835b3..4622fc8543 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 - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 6917b7960a..b0e188b1df 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 - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 420be71286..1822072b35 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 - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index da9eeadedb..9e8db340a3 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/pom.xml b/pom.xml index 432d6ed8a8..e0fab15ed6 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.82-SNAPSHOT + 23.3.0.82 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.82 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index adc44ca05e..af8f16e3e9 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.82-SNAPSHOT + 23.3.0.82 diff --git a/repository/pom.xml b/repository/pom.xml index 97b73e45fb..e436d722ef 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.82-SNAPSHOT + 23.3.0.82 From afffc7e870d827cdb52d549a409b99c7f21caf35 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 24 Jul 2024 05:54:22 +0000 Subject: [PATCH 109/118] [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 7d53225cf6..8d89c63494 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index efda759409..92b1ae0453 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 - 23.3.0.82 + 23.3.0.83-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 803c82d5b3..5c2130e083 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 - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index b06fa88332..73ece88a66 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 - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 91f4c6331c..3a7a8795d8 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 - 23.3.0.82 + 23.3.0.83-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 7d98627897..5ceba73366 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 - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 4900a83c80..d0b63e9087 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index c5848400a5..f741396c79 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 867765dcf4..69ef66d122 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 9214a4a1c4..429f157012 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 3e8d12dfb5..07e7fbd0ec 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index fb8bdc160a..f82170ce4a 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index b84738d44e..13728c92c1 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 57f2573e0a..cbcf7c80e8 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 1d8864f318..7af842d998 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index ef0c582cb0..3b355a2650 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 - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 9ebda2f866..3a573d39ac 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 - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 4622fc8543..8441c65335 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 - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index b0e188b1df..d478d59c6d 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 - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 1822072b35..33c5aa4548 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 - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 9e8db340a3..66387f8eac 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/pom.xml b/pom.xml index e0fab15ed6..f49e6af473 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.82 + 23.3.0.83-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.82 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index af8f16e3e9..d6209a24a0 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.82 + 23.3.0.83-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index e436d722ef..55067b9c0c 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.82 + 23.3.0.83-SNAPSHOT From a3f6e13a7c7c0b07f653ca700c74374bc67af951 Mon Sep 17 00:00:00 2001 From: Eva Vasques Date: Wed, 24 Jul 2024 13:40:50 +0100 Subject: [PATCH 110/118] MNT-24503 - FixedAclUpdater Job - Skip count if maxSize is set (#2809) --- .../repo/domain/permissions/FixedAclUpdater.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java b/repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java index 750c85afaf..b9da62f6e3 100644 --- a/repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java +++ b/repository/src/main/java/org/alfresco/repo/domain/permissions/FixedAclUpdater.java @@ -235,6 +235,11 @@ public class FixedAclUpdater extends TransactionListenerAdapter implements Appli int countNodesWithAspects() { + if (maxItems < DEFAULT_MAX_ITEMS) { + log.info("Job limited to process a maximum of " + maxItems + " Pending Acls"); + return maxItems; + } + final CountNodesWithAspectCallback countNodesCallback = new CountNodesWithAspectCallback(); int count = transactionService.getRetryingTransactionHelper() .doInTransaction(new RetryingTransactionCallback() @@ -246,12 +251,6 @@ public class FixedAclUpdater extends TransactionListenerAdapter implements Appli return countNodesCallback.getCount(); } }, false, true); - - if (count > maxItems) - { - log.info("Total nodes with pending acl: " + count + " Limiting work to " + maxItems); - return maxItems; - } return count; } } From b812c7856e12672c4b4c2e4bb0a9f4fdaa2fc24c Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 24 Jul 2024 13:18:40 +0000 Subject: [PATCH 111/118] [maven-release-plugin][skip ci] prepare release 23.3.0.83 --- 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 8d89c63494..dcf7be74ec 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 92b1ae0453..32555815e8 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 - 23.3.0.83-SNAPSHOT + 23.3.0.83 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 5c2130e083..7206f040f4 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 - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 73ece88a66..733b70e63a 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 - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 3a7a8795d8..0d2bdc5ec8 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 - 23.3.0.83-SNAPSHOT + 23.3.0.83 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 5ceba73366..fe5e2c64f1 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 - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/amps/pom.xml b/amps/pom.xml index d0b63e9087..8a2826d39d 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index f741396c79..cc8bf60458 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/core/pom.xml b/core/pom.xml index 69ef66d122..472cb39f31 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/data-model/pom.xml b/data-model/pom.xml index 429f157012..76154ae9cf 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/mmt/pom.xml b/mmt/pom.xml index 07e7fbd0ec..4cf6e082eb 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index f82170ce4a..0338892ab5 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 13728c92c1..f220df5a85 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/packaging/pom.xml b/packaging/pom.xml index cbcf7c80e8..0cabdc3cd8 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 7af842d998..8b467577c2 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 3b355a2650..667c4648f2 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 - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 3a573d39ac..7aa0616af5 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 - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 8441c65335..dbdf6f7ae7 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 - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index d478d59c6d..b8ce50a8ae 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 - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 33c5aa4548..29b13f14d9 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 - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 66387f8eac..7cf988afc0 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/pom.xml b/pom.xml index f49e6af473..4d75b06e1d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.83-SNAPSHOT + 23.3.0.83 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.83 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index d6209a24a0..05d4b08ef6 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.83-SNAPSHOT + 23.3.0.83 diff --git a/repository/pom.xml b/repository/pom.xml index 55067b9c0c..e219ec7bfe 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.83-SNAPSHOT + 23.3.0.83 From f9946827c488f577659ab0243aa68455b7caad7e Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 24 Jul 2024 13:18:42 +0000 Subject: [PATCH 112/118] [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 dcf7be74ec..bdfbf4092a 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 32555815e8..102eb1460e 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 - 23.3.0.83 + 23.3.0.84-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 7206f040f4..4982a86ded 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 - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 733b70e63a..8ea1e79f16 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 - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 0d2bdc5ec8..7660781040 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 - 23.3.0.83 + 23.3.0.84-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 fe5e2c64f1..6f613f646a 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 - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 8a2826d39d..6ffc878d19 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index cc8bf60458..5ee370e9a4 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 472cb39f31..2e107f3b57 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 76154ae9cf..91af9a5683 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 4cf6e082eb..74fafacf73 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 0338892ab5..6a8b31a320 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index f220df5a85..3456368d62 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 0cabdc3cd8..358fc54f79 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 8b467577c2..eea1373458 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 667c4648f2..dde2f3b75d 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 - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 7aa0616af5..b2f1deb8b0 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 - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index dbdf6f7ae7..c043a7ace8 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 - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index b8ce50a8ae..159f519106 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 - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 29b13f14d9..6245e44074 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 - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 7cf988afc0..80db2829f6 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/pom.xml b/pom.xml index 4d75b06e1d..6186679864 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.83 + 23.3.0.84-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.83 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 05d4b08ef6..f204aaec2e 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.83 + 23.3.0.84-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index e219ec7bfe..72d7bc1615 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.83 + 23.3.0.84-SNAPSHOT From 8a61badabc1f3f7e36af345e70906ea4d8394cef Mon Sep 17 00:00:00 2001 From: Tiago Salvado <9038083+tiagosalvado10@users.noreply.github.com> Date: Thu, 25 Jul 2024 21:23:51 +0100 Subject: [PATCH 113/118] [MNT-24513] Immutable user (IDS): allow to change enabled status (#2789) * [MNT-24513] Immutable user: allow enabled status change * [MNT-24513] Created 'allow.immutable.user.enabled.status.update' to control whether an immutabled user enabled status can be changed or not * [MNT-24513] Regardless user details enabled status, the person nodeRef enabled status is also checked * [MNT-24513] Prevent LDAP users from being disabled. Changed variable name. --- .../alfresco/rest/api/impl/PeopleImpl.java | 51 +++++++++++++--- .../alfresco/public-rest-context.xml | 1 + .../AuthenticationContextImpl.java | 61 ++++++++++++++++++- .../authentication-services-context.xml | 9 +++ .../resources/alfresco/repository.properties | 3 + 5 files changed, 116 insertions(+), 9 deletions(-) diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java index 706e5238dd..d789a58d4e 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/PeopleImpl.java @@ -125,7 +125,7 @@ public class PeopleImpl implements People protected ResetPasswordService resetPasswordService; protected UserRegistrySynchronizer userRegistrySynchronizer; protected Renditions renditions; - + private Boolean allowImmutableEnabledUpdate; private final static Map sort_params_to_qnames; static @@ -202,6 +202,11 @@ public class PeopleImpl implements People this.userRegistrySynchronizer = userRegistrySynchronizer; } + public void setAllowImmutableEnabledUpdate(Boolean allowImmutableEnabledUpdate) + { + this.allowImmutableEnabledUpdate = allowImmutableEnabledUpdate; + } + /** * Validate, perform -me- substitution and canonicalize the person ID. * @@ -708,16 +713,26 @@ public class PeopleImpl implements People // if requested, update password updatePassword(isAdmin, personIdToUpdate, person); - if (person.isEnabled() != null) + Set immutableProperties = userRegistrySynchronizer.getPersonMappedProperties(personIdToUpdate); + + Boolean isEnabled = person.isEnabled(); + if (isEnabled != null) { if (isAdminAuthority(personIdToUpdate)) { throw new PermissionDeniedException("Admin authority cannot be disabled."); } - // note: if current user is not an admin then permission denied exception is thrown - MutableAuthenticationService mutableAuthenticationService = (MutableAuthenticationService) authenticationService; - mutableAuthenticationService.setAuthenticationEnabled(personIdToUpdate, person.isEnabled()); + if (allowImmutableEnabledStatusUpdate(personIdToUpdate, isAdmin, immutableProperties)) + { + LOGGER.info("User " + personIdToUpdate + " is immutable but enabled status will be set to: " + isEnabled); + } + else + { + // note: if current user is not an admin then permission denied exception is thrown + MutableAuthenticationService mutableAuthenticationService = (MutableAuthenticationService) authenticationService; + mutableAuthenticationService.setAuthenticationEnabled(personIdToUpdate, person.isEnabled()); + } } NodeRef personNodeRef = personService.getPerson(personIdToUpdate, false); @@ -742,9 +757,7 @@ public class PeopleImpl implements People properties.putAll(nodes.mapToNodeProperties(customProps)); } - // MNT-21150 LDAP synced attributes can be changed using REST API - Set immutableProperties = userRegistrySynchronizer.getPersonMappedProperties(personIdToUpdate); - + // MNT-21150 LDAP synced attributes can't be changed using REST API immutableProperties.forEach(immutableProperty -> { if (properties.containsKey(immutableProperty)) { @@ -768,6 +781,28 @@ public class PeopleImpl implements People return getPerson(personId); } + private boolean allowImmutableEnabledStatusUpdate(String userId, boolean isAdmin, Set immutableProperties) + { + if (allowImmutableEnabledUpdate) + { + boolean containLdapUserAccountStatus = false; + QName propertyNameToCheck = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "userAccountStatusProperty"); + + for (QName immutableProperty : immutableProperties) + { + if (immutableProperty.equals(propertyNameToCheck)) + { + containLdapUserAccountStatus = true; + break; + } + } + + return isAdmin && !containLdapUserAccountStatus && !isMutableAuthority(userId); + } + + return false; + } + private boolean checkCurrentUserOrAdmin(String personId) { boolean isAdmin = isAdminAuthority(); diff --git a/remote-api/src/main/resources/alfresco/public-rest-context.xml b/remote-api/src/main/resources/alfresco/public-rest-context.xml index 2f8497a061..a438e038a8 100644 --- a/remote-api/src/main/resources/alfresco/public-rest-context.xml +++ b/remote-api/src/main/resources/alfresco/public-rest-context.xml @@ -764,6 +764,7 @@ + diff --git a/repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationContextImpl.java b/repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationContextImpl.java index c9c4a84bb5..39b57d155f 100644 --- a/repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationContextImpl.java +++ b/repository/src/main/java/org/alfresco/repo/security/authentication/AuthenticationContextImpl.java @@ -36,7 +36,11 @@ import net.sf.acegisecurity.UserDetails; import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken; import net.sf.acegisecurity.providers.dao.User; +import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; import org.alfresco.repo.tenant.TenantService; +import org.alfresco.service.cmr.security.AuthenticationService; +import org.alfresco.service.cmr.security.MutableAuthenticationService; +import org.alfresco.service.cmr.security.PersonService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -49,12 +53,30 @@ public class AuthenticationContextImpl implements AuthenticationContext private final Log logger = LogFactory.getLog(getClass()); private TenantService tenantService; + private PersonService personService; + private AuthenticationService authenticationService; + private Boolean allowImmutableEnabledUpdate; public void setTenantService(TenantService tenantService) { this.tenantService = tenantService; } + public void setPersonService(PersonService personService) + { + this.personService = personService; + } + + public void setAuthenticationService(AuthenticationService authenticationService) + { + this.authenticationService = authenticationService; + } + + public void setAllowImmutableEnabledUpdate(Boolean allowImmutableEnabledUpdate) + { + this.allowImmutableEnabledUpdate = allowImmutableEnabledUpdate; + } + /** * Explicitly set the given validated user details to be authenticated. * @@ -70,7 +92,7 @@ public class AuthenticationContextImpl implements AuthenticationContext { // Apply the same validation that ACEGI would have to the user details - we may be going through a 'back // door'. - if (!ud.isEnabled()) + if (isDisabled(userId, ud)) { throw new DisabledException("User is disabled"); } @@ -114,6 +136,43 @@ public class AuthenticationContextImpl implements AuthenticationContext } } + private boolean isDisabled(String userId, UserDetails ud) + { + boolean isDisabled = !ud.isEnabled(); + boolean isSystemUser = isSystemUserName(userId); + + if (allowImmutableEnabledUpdate && !isSystemUser) + { + try + { + boolean isImmutable = isImmutableAuthority(userId); + boolean isPersonEnabled = personService.isEnabled(userId); + isDisabled = isDisabled || (isImmutable && !isPersonEnabled); + } + catch (Exception e) + { + if (logger.isWarnEnabled()) + { + logger.warn("Failed to determine if person is enabled: " + userId + ", using user details status: " + isDisabled); + } + } + } + + return isDisabled; + } + + private boolean isImmutableAuthority(String authorityName) + { + return AuthenticationUtil.runAsSystem(new RunAsWork() + { + @Override public Boolean doWork() throws Exception + { + MutableAuthenticationService mutableAuthenticationService = (MutableAuthenticationService) authenticationService; + return !mutableAuthenticationService.isAuthenticationMutable(authorityName); + } + }); + } + public Authentication setSystemUserAsCurrentUser() { return setSystemUserAsCurrentUser(TenantService.DEFAULT_DOMAIN); diff --git a/repository/src/main/resources/alfresco/authentication-services-context.xml b/repository/src/main/resources/alfresco/authentication-services-context.xml index 1925c02d35..7d4f6d9666 100644 --- a/repository/src/main/resources/alfresco/authentication-services-context.xml +++ b/repository/src/main/resources/alfresco/authentication-services-context.xml @@ -274,6 +274,15 @@ + + + + + + + + ${allow.immutable.user.enabled.status.update} + diff --git a/repository/src/main/resources/alfresco/repository.properties b/repository/src/main/resources/alfresco/repository.properties index a6774373ca..a429143f61 100644 --- a/repository/src/main/resources/alfresco/repository.properties +++ b/repository/src/main/resources/alfresco/repository.properties @@ -435,6 +435,9 @@ repo.remote.endpoint=/service # persisted. create.missing.people=${server.transaction.allow-writes} +# Allow an immutable user to have its enabled status changed +allow.immutable.user.enabled.status.update=false + # Create home folders (unless disabled, see next property) as people are created (true) or create them lazily (false) home.folder.creation.eager=true # Disable home folder creation - if true then home folders are not created (neither eagerly nor lazily) From 6290c46d6243e64a144757872f28fdcfea0238a3 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 25 Jul 2024 21:03:09 +0000 Subject: [PATCH 114/118] [maven-release-plugin][skip ci] prepare release 23.3.0.84 --- 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 bdfbf4092a..d2c4f76ad5 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 102eb1460e..45516d85ef 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 - 23.3.0.84-SNAPSHOT + 23.3.0.84 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 4982a86ded..64f94643c1 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 - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 8ea1e79f16..94ca7ec5eb 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 - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 7660781040..a183639bfb 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 - 23.3.0.84-SNAPSHOT + 23.3.0.84 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 6f613f646a..ec1c04e225 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 - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/amps/pom.xml b/amps/pom.xml index 6ffc878d19..919e1f8a4f 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 5ee370e9a4..19f25d0fd9 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/core/pom.xml b/core/pom.xml index 2e107f3b57..5f1343025e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/data-model/pom.xml b/data-model/pom.xml index 91af9a5683..9476f640f8 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/mmt/pom.xml b/mmt/pom.xml index 74fafacf73..47f57d70aa 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 6a8b31a320..294c8b825d 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 3456368d62..7b243c6633 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/packaging/pom.xml b/packaging/pom.xml index 358fc54f79..518cd72cde 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index eea1373458..f1682b36dc 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index dde2f3b75d..dae492167f 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 - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index b2f1deb8b0..f620f4f809 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 - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index c043a7ace8..6cd8f54872 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 - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 159f519106..d56fc47b3d 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 - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 6245e44074..4ad5abeb13 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 - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 80db2829f6..e14744d995 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/pom.xml b/pom.xml index 6186679864..62f0d22085 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.84-SNAPSHOT + 23.3.0.84 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.84 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index f204aaec2e..143948e89f 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.84-SNAPSHOT + 23.3.0.84 diff --git a/repository/pom.xml b/repository/pom.xml index 72d7bc1615..8f71a15496 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.84-SNAPSHOT + 23.3.0.84 From 10e78191ddc53dad09374049d88dbfe1ec1fb687 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 25 Jul 2024 21:03:12 +0000 Subject: [PATCH 115/118] [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 d2c4f76ad5..e8bd2753d6 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 45516d85ef..e1d2ce46db 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 - 23.3.0.84 + 23.3.0.85-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 64f94643c1..923dee7e3e 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 - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 94ca7ec5eb..1147bd3dad 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 - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index a183639bfb..cd96145b20 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 - 23.3.0.84 + 23.3.0.85-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 ec1c04e225..204df06a2f 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 - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 919e1f8a4f..df57b2964a 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 19f25d0fd9..187c338305 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 5f1343025e..6f03ce796e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 9476f640f8..d5109c90a0 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 47f57d70aa..33dee8c350 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 294c8b825d..6fc9379248 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 7b243c6633..8033922807 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 518cd72cde..35e1c7ea2d 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index f1682b36dc..9a865e0cea 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index dae492167f..11d7717130 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 - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index f620f4f809..a484d4d2cc 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 - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 6cd8f54872..1e33cb1da2 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 - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index d56fc47b3d..af0e2ebb14 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 - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 4ad5abeb13..7a1598c5fc 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 - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index e14744d995..00850ec2bc 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/pom.xml b/pom.xml index 62f0d22085..4979079e34 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.84 + 23.3.0.85-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.84 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 143948e89f..626ea62fa6 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.84 + 23.3.0.85-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 8f71a15496..edef72bdea 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.84 + 23.3.0.85-SNAPSHOT From b35a64d14f6738dc038ac7319f1fb1e8a1de156f Mon Sep 17 00:00:00 2001 From: Alfresco CI User Date: Sun, 28 Jul 2024 00:04:10 +0000 Subject: [PATCH 116/118] [force] Force release for 2024-07-28. From 3cac4e820622423841d4e67da6baf23b22b1993f Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 28 Jul 2024 00:07:05 +0000 Subject: [PATCH 117/118] [maven-release-plugin][skip ci] prepare release 23.3.0.85 --- 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 e8bd2753d6..5173465afd 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index e1d2ce46db..f194ae74f1 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 - 23.3.0.85-SNAPSHOT + 23.3.0.85 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 923dee7e3e..568fc4a4ae 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 - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 1147bd3dad..0369bf3461 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 - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index cd96145b20..70702f7259 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 - 23.3.0.85-SNAPSHOT + 23.3.0.85 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 204df06a2f..4a9bd85b48 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 - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/amps/pom.xml b/amps/pom.xml index df57b2964a..e2e8e8c2b8 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 187c338305..83c35e1181 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/core/pom.xml b/core/pom.xml index 6f03ce796e..5611b73f23 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/data-model/pom.xml b/data-model/pom.xml index d5109c90a0..a896845cc8 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/mmt/pom.xml b/mmt/pom.xml index 33dee8c350..559d7c1bf3 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 6fc9379248..b1a9530ae0 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 8033922807..367c0ed964 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/packaging/pom.xml b/packaging/pom.xml index 35e1c7ea2d..433eb81ff8 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 9a865e0cea..76f4f21440 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 11d7717130..0bb601afd2 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 - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index a484d4d2cc..b3f2fa93a9 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 - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 1e33cb1da2..1756627e3e 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 - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index af0e2ebb14..822d6ce262 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 - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 7a1598c5fc..750c23964a 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 - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 00850ec2bc..07f1f9f0d2 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/pom.xml b/pom.xml index 4979079e34..00d40dc572 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.85-SNAPSHOT + 23.3.0.85 pom Alfresco Community Repo Parent @@ -151,7 +151,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 + 23.3.0.85 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 626ea62fa6..64e9619344 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.85-SNAPSHOT + 23.3.0.85 diff --git a/repository/pom.xml b/repository/pom.xml index edef72bdea..d2d28fa5a1 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.85-SNAPSHOT + 23.3.0.85 From d60172e860f66c46080ac9ab15184cacb25f6025 Mon Sep 17 00:00:00 2001 From: alfresco-build <8039454+alfresco-build@users.noreply.github.com> Date: Sun, 28 Jul 2024 00:07:08 +0000 Subject: [PATCH 118/118] [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 5173465afd..154d14bacc 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index f194ae74f1..2b99744168 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 - 23.3.0.85 + 23.3.0.86-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 568fc4a4ae..b9eec43068 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 - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 0369bf3461..3590017280 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 - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 70702f7259..d8d84dc294 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 - 23.3.0.85 + 23.3.0.86-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 4a9bd85b48..f64993a239 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 - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index e2e8e8c2b8..321a3b0e4f 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 83c35e1181..e942744bc4 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 5611b73f23..cd35445e37 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index a896845cc8..332902e75b 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 559d7c1bf3..bd86a5e488 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index b1a9530ae0..406118bf79 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 367c0ed964..b46c5fdca4 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 433eb81ff8..c8d043eeee 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 76f4f21440..d56592fb96 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 0bb601afd2..fea2fb2287 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 - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index b3f2fa93a9..77ecceba2e 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 - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 1756627e3e..df1b40a5b9 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 - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 822d6ce262..1f2348ff9f 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 - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 750c23964a..3ce0d6125f 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 - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 07f1f9f0d2..0204ed928d 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/pom.xml b/pom.xml index 00d40dc572..afb283668d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 23.3.0.85 + 23.3.0.86-SNAPSHOT pom Alfresco Community Repo Parent @@ -151,7 +151,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 - 23.3.0.85 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 64e9619344..0ed3dbf0ca 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.85 + 23.3.0.86-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index d2d28fa5a1..0de9b0aac4 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 23.3.0.85 + 23.3.0.86-SNAPSHOT