From 0aae95b2554a53550251aa11260bf69c3b9a67f4 Mon Sep 17 00:00:00 2001 From: Maciej Pichura <41297682+mpichura@users.noreply.github.com> Date: Tue, 13 Dec 2022 17:13:02 +0100 Subject: [PATCH 01/12] ACS-4031 list category children (#1617) * ACS-4031: Get category children endpoint. * ACS-4031: Fix in E2E test. * ACS-4031: Adding more unit tests. * Fix test description Co-authored-by: Tom Page * Fix test description Co-authored-by: Tom Page * ACS-4031: Refactoring after code review. * ACS-4031: Updating E2E test after latest logic refactor. Co-authored-by: Tom Page --- .../alfresco/rest/requests/Categories.java | 18 +- .../categories/CreateCategoriesTests.java | 2 +- .../rest/categories/GetCategoriesTests.java | 143 ++++++++++++- .../org/alfresco/rest/api/Categories.java | 3 + .../api/categories/SubcategoriesRelation.java | 12 +- .../rest/api/impl/CategoriesImpl.java | 58 +++++- .../categories/SubcategoriesRelationTest.java | 105 ++++++++++ .../rest/api/impl/CategoriesImplTest.java | 189 +++++++++++++++++- 8 files changed, 501 insertions(+), 29 deletions(-) create mode 100644 remote-api/src/test/java/org/alfresco/rest/api/categories/SubcategoriesRelationTest.java diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Categories.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Categories.java index e5a3843201..27ed2f5bc7 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Categories.java +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Categories.java @@ -33,7 +33,6 @@ import org.alfresco.rest.core.RestRequest; import org.alfresco.rest.core.RestWrapper; import org.alfresco.rest.model.RestCategoryModel; import org.alfresco.rest.model.RestCategoryModelsCollection; -import org.alfresco.rest.model.RestRuleModelsCollection; import org.springframework.http.HttpMethod; public class Categories extends ModelRequest @@ -75,9 +74,22 @@ public class Categories extends ModelRequest * @param restCategoryModel The categories to create. * @return Created category with additional data populated by the repository. */ - public RestCategoryModel createSingleCategory(RestCategoryModel restCategoryModel) { - RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, restCategoryModel.toJson(), "categories/{categoryId}/subcategories", category.getId()); + public RestCategoryModel createSingleCategory(RestCategoryModel restCategoryModel) + { + RestRequest request = RestRequest + .requestWithBody(HttpMethod.POST, restCategoryModel.toJson(), "categories/{categoryId}/subcategories", category.getId()); return restWrapper.processModel(RestCategoryModel.class, request); } + /** + * Get parent category children. + * + * @return The list of child categories. + */ + public RestCategoryModelsCollection getCategoryChildren() + { + RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "categories/{categoryId}/subcategories", category.getId()); + return restWrapper.processModels(RestCategoryModelsCollection.class, request); + } + } diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/CreateCategoriesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/CreateCategoriesTests.java index 74200018f0..68e199dcf9 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/CreateCategoriesTests.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/CreateCategoriesTests.java @@ -260,7 +260,7 @@ public class CreateCategoriesTests extends RestTest restClient.assertStatusCodeIs(BAD_REQUEST).assertLastError().containsSummary("Node id does not refer to a valid category"); } - private List getCategoriesToCreate(final int count) + static List getCategoriesToCreate(final int count) { return IntStream.range(0, count) .mapToObj(i -> { diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/GetCategoriesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/GetCategoriesTests.java index d02312442b..a8d2da0340 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/GetCategoriesTests.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/GetCategoriesTests.java @@ -28,11 +28,20 @@ package org.alfresco.rest.categories; import static org.alfresco.utility.report.log.Step.STEP; import static org.springframework.http.HttpStatus.BAD_REQUEST; +import static org.springframework.http.HttpStatus.CREATED; import static org.springframework.http.HttpStatus.NOT_FOUND; import static org.springframework.http.HttpStatus.OK; +import static org.testng.Assert.assertTrue; + +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import org.alfresco.rest.RestTest; +import org.alfresco.rest.core.RestResponse; import org.alfresco.rest.model.RestCategoryModel; +import org.alfresco.rest.model.RestCategoryModelsCollection; +import org.alfresco.utility.data.RandomData; import org.alfresco.utility.model.FolderModel; import org.alfresco.utility.model.SiteModel; import org.alfresco.utility.model.TestGroup; @@ -42,6 +51,10 @@ import org.testng.annotations.Test; public class GetCategoriesTests extends RestTest { + private static final List DEFAULT_ROOT_CATEGORIES = List.of("Software Document Classification", "Languages", "Regions", "Tags"); + private static final String ROOT = "-root-"; + private static final String NON_EXISTING_CATEGORY_ID = "non-existing-category-id"; + private UserModel user; @BeforeClass(alwaysRun = true) @@ -57,11 +70,29 @@ public class GetCategoriesTests extends RestTest @Test(groups = {TestGroup.REST_API}) public void testGetCategoryById() { - STEP("Get category with -root- as id (which does not exist)"); + STEP("Create a category under root category (as admin)"); final RestCategoryModel rootCategory = new RestCategoryModel(); - rootCategory.setId("-root-"); - restClient.authenticateUser(user).withCoreAPI().usingCategory(rootCategory).getCategory(); - restClient.assertStatusCodeIs(NOT_FOUND); + rootCategory.setId(ROOT); + final RestCategoryModel aCategory = new RestCategoryModel(); + aCategory.setName(RandomData.getRandomName("Category")); + final RestCategoryModel createdCategory = restClient.authenticateUser(dataUser.getAdminUser()) + .withCoreAPI() + .usingCategory(rootCategory) + .createSingleCategory(aCategory); + restClient.assertStatusCodeIs(CREATED); + + createdCategory.assertThat() + .field("name").is(aCategory.getName()); + createdCategory.assertThat() + .field("parentId").is(rootCategory.getId()); + createdCategory.assertThat() + .field("hasChildren").is(false); + + STEP("Get the created category (as regular user)"); + final RestCategoryModel categoryFromGet = + restClient.authenticateUser(user).withCoreAPI().usingCategory(createdCategory).getCategory(); + restClient.assertStatusCodeIs(OK); + categoryFromGet.assertThat().isEqualTo(createdCategory); } /** @@ -70,15 +101,15 @@ public class GetCategoriesTests extends RestTest @Test(groups = {TestGroup.REST_API}) public void testGetCategoryByIdProvidingRootAsId() { - STEP("Get category with -root- as id (which does not exist)"); + STEP("Get category with -root- as id"); final RestCategoryModel rootCategory = new RestCategoryModel(); - rootCategory.setId("-root-"); + rootCategory.setId(ROOT); restClient.authenticateUser(user).withCoreAPI().usingCategory(rootCategory).getCategory(); - restClient.assertStatusCodeIs(NOT_FOUND); + restClient.assertStatusCodeIs(BAD_REQUEST).assertLastError().containsSummary("Node id does not refer to a valid category"); } /** - * Check we get an error when passing as category id + * Check we get an error when passing folder node id as category id */ @Test(groups = {TestGroup.REST_API}) public void testGetCategoryByIdProvidingFolderAsId() @@ -91,7 +122,101 @@ public class GetCategoriesTests extends RestTest final RestCategoryModel rootCategory = new RestCategoryModel(); rootCategory.setId(folder.getNodeRef()); restClient.authenticateUser(user).withCoreAPI().usingCategory(rootCategory).getCategory(); - restClient.assertStatusCodeIs(BAD_REQUEST); + restClient.assertStatusCodeIs(BAD_REQUEST).assertLastError().containsSummary("Node id does not refer to a valid category"); } + /** + * Check we get an error when passing non existing as category id + */ + @Test(groups = {TestGroup.REST_API}) + public void testGetCategoryByIdProvidingNonExistingId() + { + STEP("Get category with id which does not exist"); + final RestCategoryModel rootCategory = new RestCategoryModel(); + final String id = NON_EXISTING_CATEGORY_ID; + rootCategory.setId(id); + restClient.authenticateUser(user).withCoreAPI().usingCategory(rootCategory).getCategory(); + restClient.assertStatusCodeIs(NOT_FOUND).assertLastError().containsSummary(id); + } + + /** + * Check we can get children category of a root category + */ + @Test(groups = {TestGroup.REST_API}) + public void testGetCategoryChildren() + { + STEP("Get category children with -root- as parent id"); + final RestCategoryModel rootCategory = new RestCategoryModel(); + rootCategory.setId(ROOT); + RestCategoryModelsCollection childCategoriesList = + restClient.authenticateUser(user).withCoreAPI().usingCategory(rootCategory).getCategoryChildren(); + restClient.assertStatusCodeIs(OK); + + childCategoriesList.assertThat().entriesListIsNotEmpty(); + assertTrue(childCategoriesList.getEntries().stream() + .map(RestCategoryModel::onModel) + .map(RestCategoryModel::getName) + .collect(Collectors.toList()) + .containsAll(DEFAULT_ROOT_CATEGORIES)); + STEP("Create a new category under root and make sure it is returned as one of root's children"); + final RestCategoryModel aCategory = new RestCategoryModel(); + aCategory.setName((RandomData.getRandomName("newCategoryUnderRoot"))); + final RestCategoryModel createdCategory = restClient.authenticateUser(dataUser.getAdminUser()) + .withCoreAPI() + .usingCategory(rootCategory) + .createSingleCategory(aCategory); + restClient.assertStatusCodeIs(CREATED); + + childCategoriesList = restClient.authenticateUser(user).withCoreAPI().usingCategory(rootCategory).getCategoryChildren(); + restClient.assertStatusCodeIs(OK); + assertTrue(childCategoriesList.getEntries().stream() + .map(RestCategoryModel::onModel) + .map(RestCategoryModel::getId) + .collect(Collectors.toList()) + .contains(createdCategory.getId())); + + STEP("Create 2 more categories under newCategoryUnderRoot and make sure they are returned as children"); + final int categoriesCount = 2; + final List categoriesToCreate = CreateCategoriesTests.getCategoriesToCreate(categoriesCount); + final RestCategoryModelsCollection createdSubCategories = restClient.authenticateUser(dataUser.getAdminUser()) + .withCoreAPI() + .usingCategory(createdCategory) + .createCategoriesList(categoriesToCreate); + restClient.assertStatusCodeIs(CREATED); + childCategoriesList = restClient.authenticateUser(user).withCoreAPI().usingCategory(rootCategory).getCategoryChildren(); + restClient.assertStatusCodeIs(OK); + childCategoriesList.getEntries().containsAll(createdSubCategories.getEntries()); + } + + /** + * Check we get an error when passing folder node id as parent category id when getting children. + */ + @Test(groups = {TestGroup.REST_API}) + public void testGetCategoryChildrenProvidingFolderAsId() + { + STEP("Create a site and a folder inside it"); + final SiteModel site = dataSite.usingUser(user).createPublicRandomSite(); + final FolderModel folder = dataContent.usingUser(user).usingSite(site).createFolder(); + + STEP("Get category children with folder id passed as parent id"); + final RestCategoryModel parentCategory = new RestCategoryModel(); + parentCategory.setId(folder.getNodeRef()); + restClient.authenticateUser(user).withCoreAPI().usingCategory(parentCategory).getCategoryChildren(); + restClient.assertStatusCodeIs(BAD_REQUEST).assertLastError().containsSummary("Node id does not refer to a valid category"); + } + + /** + * Check we get an error when passing a non-existent node id as parent category id when getting children. + */ + @Test(groups = {TestGroup.REST_API}) + public void testGetCategoryChildrenProvidingNonExistingParent() + { + + STEP("Get category with folder id passed as id"); + final RestCategoryModel parentCategory = new RestCategoryModel(); + final String parentId = NON_EXISTING_CATEGORY_ID; + parentCategory.setId(parentId); + restClient.authenticateUser(user).withCoreAPI().usingCategory(parentCategory).getCategoryChildren(); + restClient.assertStatusCodeIs(NOT_FOUND).assertLastError().containsSummary(parentId); + } } diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Categories.java b/remote-api/src/main/java/org/alfresco/rest/api/Categories.java index 6c18d06fd2..7e03067e50 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/Categories.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/Categories.java @@ -29,6 +29,7 @@ package org.alfresco.rest.api; import java.util.List; import org.alfresco.rest.api.model.Category; +import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo; import org.alfresco.rest.framework.resource.parameters.Parameters; import org.alfresco.service.Experimental; import org.alfresco.service.cmr.repository.NodeRef; @@ -39,4 +40,6 @@ public interface Categories Category getCategoryById(String id, Parameters params); List createSubcategories(String parentCategoryId, List categories, Parameters parameters); + + CollectionWithPagingInfo getCategoryChildren(String parentCategoryId, Parameters params); } diff --git a/remote-api/src/main/java/org/alfresco/rest/api/categories/SubcategoriesRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/categories/SubcategoriesRelation.java index 1516ca44b8..bd3ccbce5d 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/categories/SubcategoriesRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/categories/SubcategoriesRelation.java @@ -35,10 +35,11 @@ import org.alfresco.rest.api.model.Category; import org.alfresco.rest.framework.WebApiDescription; import org.alfresco.rest.framework.resource.RelationshipResource; import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction; +import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo; import org.alfresco.rest.framework.resource.parameters.Parameters; @RelationshipResource(name = "subcategories", entityResource = CategoriesEntityResource.class, title = "Subcategories") -public class SubcategoriesRelation implements RelationshipResourceAction.Create +public class SubcategoriesRelation implements RelationshipResourceAction.Create, RelationshipResourceAction.Read { private final Categories categories; @@ -56,4 +57,13 @@ public class SubcategoriesRelation implements RelationshipResourceAction.Create< { return categories.createSubcategories(parentCategoryId, categoryList, parameters); } + + @WebApiDescription(title = "List category direct children", + description = "Lists direct children of a parent category", + successStatus = HttpServletResponse.SC_OK) + @Override + public CollectionWithPagingInfo readAll(String parentCategoryId, Parameters params) + { + return categories.getCategoryChildren(parentCategoryId, params); + } } diff --git a/remote-api/src/main/java/org/alfresco/rest/api/impl/CategoriesImpl.java b/remote-api/src/main/java/org/alfresco/rest/api/impl/CategoriesImpl.java index 8db2796b16..8f017d5b14 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/impl/CategoriesImpl.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/impl/CategoriesImpl.java @@ -39,6 +39,8 @@ import org.alfresco.rest.api.model.Node; import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException; import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException; import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException; +import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo; +import org.alfresco.rest.framework.resource.parameters.ListPage; import org.alfresco.rest.framework.resource.parameters.Parameters; import org.alfresco.service.Experimental; import org.alfresco.service.cmr.repository.ChildAssociationRef; @@ -74,8 +76,8 @@ public class CategoriesImpl implements Categories @Override public Category getCategoryById(final String id, final Parameters params) { - final NodeRef nodeRef = nodes.validateNode(id); - if (isNotACategory(nodeRef) || isRootCategory(nodeRef)) + final NodeRef nodeRef = getCategoryNodeRef(id); + if (isRootCategory(nodeRef)) { throw new InvalidArgumentException(NOT_A_VALID_CATEGORY, new String[]{id}); } @@ -90,14 +92,7 @@ public class CategoriesImpl implements Categories { throw new PermissionDeniedException(NO_PERMISSION_TO_CREATE_A_CATEGORY); } - final NodeRef parentNodeRef = PATH_ROOT.equals(parentCategoryId) ? - categoryService.getRootCategoryNodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE) - .orElseThrow(() -> new EntityNotFoundException(parentCategoryId)) : - nodes.validateNode(parentCategoryId); - if (isNotACategory(parentNodeRef)) - { - throw new InvalidArgumentException(NOT_A_VALID_CATEGORY, new String[]{parentCategoryId}); - } + final NodeRef parentNodeRef = getCategoryNodeRef(parentCategoryId); final List categoryNodeRefs = categories.stream() .map(c -> createCategoryNodeRef(parentNodeRef, c)) .collect(Collectors.toList()); @@ -106,6 +101,49 @@ public class CategoriesImpl implements Categories .collect(Collectors.toList()); } + @Override + public CollectionWithPagingInfo getCategoryChildren(String parentCategoryId, Parameters params) + { + final NodeRef parentNodeRef = getCategoryNodeRef(parentCategoryId); + final List childCategoriesAssocs = nodeService.getChildAssocs(parentNodeRef).stream() + .filter(ca -> ContentModel.ASSOC_SUBCATEGORIES.equals(ca.getTypeQName())) + .collect(Collectors.toList()); + final List categories = childCategoriesAssocs.stream() + .map(c -> mapToCategory(c.getChildRef())) + .collect(Collectors.toList()); + return ListPage.of(categories, params.getPaging()); + } + + /** + * This method gets category NodeRef for a given category id. + * If '-root-' is passed as category id, then it's retrieved as a call to {@link org.alfresco.service.cmr.search.CategoryService#getRootCategoryNodeRef} + * In all other cases it's retrieved as a node of a category type {@link #validateCategoryNode(String)} + * @param nodeId category node id + * @return NodRef of category node + */ + private NodeRef getCategoryNodeRef(String nodeId) + { + return PATH_ROOT.equals(nodeId) ? + categoryService.getRootCategoryNodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE) + .orElseThrow(() -> new EntityNotFoundException(nodeId)) : + validateCategoryNode(nodeId); + } + + /** + * Validates if the node exists and is a category. + * @param nodeId (presumably) category node id + * @return category NodeRef + */ + private NodeRef validateCategoryNode(String nodeId) + { + final NodeRef nodeRef = nodes.validateNode(nodeId); + if (isNotACategory(nodeRef)) + { + throw new InvalidArgumentException(NOT_A_VALID_CATEGORY, new String[]{nodeId}); + } + return nodeRef; + } + private NodeRef createCategoryNodeRef(NodeRef parentNodeRef, Category c) { if (StringUtils.isEmpty(c.getName())) { diff --git a/remote-api/src/test/java/org/alfresco/rest/api/categories/SubcategoriesRelationTest.java b/remote-api/src/test/java/org/alfresco/rest/api/categories/SubcategoriesRelationTest.java new file mode 100644 index 0000000000..7b1948f7d2 --- /dev/null +++ b/remote-api/src/test/java/org/alfresco/rest/api/categories/SubcategoriesRelationTest.java @@ -0,0 +1,105 @@ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2022 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.rest.api.categories; + +import static org.junit.Assert.assertEquals; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.then; + +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import org.alfresco.rest.api.Categories; +import org.alfresco.rest.api.model.Category; +import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo; +import org.alfresco.rest.framework.resource.parameters.Paging; +import org.alfresco.rest.framework.resource.parameters.Parameters; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +@RunWith(MockitoJUnitRunner.class) +public class SubcategoriesRelationTest +{ + private static final String PARENT_CATEGORY_ID = "parent-category-node-id"; + private static final String CATEGORY_ID = "category-node-id"; + private static final String CATEGORY_NAME = "categoryName"; + private static final String SUBCATEGORY_NAME_PREFIX = "childCategoryName"; + + @Mock + private Categories categoriesMock; + @Mock + private Parameters parametersMock; + + @InjectMocks + private SubcategoriesRelation objectUnderTest; + + @Test + public void testCreateSubcategory() + { + final Category categoryToCreate = Category.builder().name(CATEGORY_NAME).create(); + final Category category = Category.builder().name(CATEGORY_NAME).parentId(PARENT_CATEGORY_ID).hasChildren(false).id(CATEGORY_ID).create(); + final List categoriesToCreate = List.of(categoryToCreate); + given(categoriesMock.createSubcategories(PARENT_CATEGORY_ID, categoriesToCreate, parametersMock)).willReturn(List.of(category)); + + //when + List categories = objectUnderTest.create(PARENT_CATEGORY_ID, categoriesToCreate, parametersMock); + + then(categoriesMock).should().createSubcategories(PARENT_CATEGORY_ID, categoriesToCreate, parametersMock); + then(categoriesMock).shouldHaveNoMoreInteractions(); + assertEquals(List.of(category), categories); + } + + @Test + public void testGetCategoryChildren() { + final CollectionWithPagingInfo categoryChildren = getCategories(3); + given(categoriesMock.getCategoryChildren(PARENT_CATEGORY_ID, parametersMock)).willReturn(categoryChildren); + + //when + final CollectionWithPagingInfo returnedChildren = objectUnderTest.readAll(PARENT_CATEGORY_ID, parametersMock); + + then(categoriesMock).should().getCategoryChildren(PARENT_CATEGORY_ID, parametersMock); + then(categoriesMock).shouldHaveNoMoreInteractions(); + assertEquals(categoryChildren, returnedChildren); + } + + private CollectionWithPagingInfo getCategories(final int count) + { + return CollectionWithPagingInfo.asPaged(Paging.DEFAULT, + IntStream.range(0, count) + .mapToObj(i -> Category.builder().name(SUBCATEGORY_NAME_PREFIX + "-" + i) + .parentId(PARENT_CATEGORY_ID) + .hasChildren(false) + .id(CATEGORY_ID + "-" + i) + .create()) + .collect(Collectors.toList()) + ); + } +} diff --git a/remote-api/src/test/java/org/alfresco/rest/api/impl/CategoriesImplTest.java b/remote-api/src/test/java/org/alfresco/rest/api/impl/CategoriesImplTest.java index 7787e19812..482977366e 100644 --- a/remote-api/src/test/java/org/alfresco/rest/api/impl/CategoriesImplTest.java +++ b/remote-api/src/test/java/org/alfresco/rest/api/impl/CategoriesImplTest.java @@ -31,10 +31,15 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.then; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import org.alfresco.model.ContentModel; import org.alfresco.rest.api.Nodes; @@ -43,6 +48,7 @@ import org.alfresco.rest.api.model.Node; import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException; import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException; import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException; +import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo; import org.alfresco.rest.framework.resource.parameters.Parameters; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; @@ -231,7 +237,6 @@ public class CategoriesImplTest final NodeRef parentCategoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PATH_ROOT); given(categoryServiceMock.getRootCategoryNodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE)) .willReturn(Optional.of(parentCategoryNodeRef)); - given(nodesMock.isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(true); final NodeRef categoryNodeRef = prepareCategoryNodeRef(); given(categoryServiceMock.createCategory(parentCategoryNodeRef, CATEGORY_NAME)).willReturn(categoryNodeRef); given(nodesMock.getNode(CATEGORY_ID)).willReturn(prepareCategoryNode()); @@ -246,7 +251,6 @@ public class CategoriesImplTest then(authorityServiceMock).should().hasAdminAuthority(); then(authorityServiceMock).shouldHaveNoMoreInteractions(); - then(nodesMock).should().isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false); then(nodesMock).should().getNode(CATEGORY_ID); then(nodesMock).shouldHaveNoMoreInteractions(); then(nodeServiceMock).should().getPrimaryParent(categoryNodeRef); @@ -366,12 +370,151 @@ public class CategoriesImplTest then(categoryServiceMock).shouldHaveNoInteractions(); } + @Test + public void testGetRootCategoryChildren() + { + final NodeRef parentCategoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PATH_ROOT); + given(categoryServiceMock.getRootCategoryNodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE)) + .willReturn(Optional.of(parentCategoryNodeRef)); + final int childrenCount = 3; + final List childAssociationRefMocks = prepareChildAssocMocks(childrenCount, parentCategoryNodeRef); + given(nodeServiceMock.getChildAssocs(parentCategoryNodeRef)).willReturn(childAssociationRefMocks); + childAssociationRefMocks.forEach(this::prepareCategoryNodeMocks); + + //when + final CollectionWithPagingInfo categoryChildren = objectUnderTest.getCategoryChildren(PATH_ROOT, parametersMock); + + then(categoryServiceMock).should().getRootCategoryNodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE); + then(categoryServiceMock).shouldHaveNoMoreInteractions(); + then(nodeServiceMock).should().getChildAssocs(parentCategoryNodeRef); + childAssociationRefMocks.forEach(ca -> { + then(nodesMock).should().getNode(ca.getChildRef().getId()); + then(nodeServiceMock).should() + .getChildAssocs(ca.getChildRef(), RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL, false); + then(nodeServiceMock).should().getPrimaryParent(ca.getChildRef()); + }); + then(nodeServiceMock).should(times(childrenCount)).getParentAssocs(parentCategoryNodeRef); + + then(nodesMock).shouldHaveNoMoreInteractions(); + then(nodeServiceMock).shouldHaveNoMoreInteractions(); + + then(authorityServiceMock).shouldHaveNoInteractions(); + + assertEquals(childAssociationRefMocks.size(), categoryChildren.getTotalItems().intValue()); + final List categoryChildrenList = new ArrayList<>(categoryChildren.getCollection()); + assertEquals(childAssociationRefMocks.size(), categoryChildrenList.size()); + IntStream.range(0, childrenCount).forEach(i -> doCategoryAssertions(categoryChildrenList.get(i), i, PATH_ROOT)); + } + + @Test + public void testGetCategoryChildren() + { + final NodeRef parentCategoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARENT_ID); + given(nodesMock.validateNode(PARENT_ID)).willReturn(parentCategoryNodeRef); + given(nodesMock.isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(true); + final int childrenCount = 3; + final List childAssociationRefMocks = prepareChildAssocMocks(childrenCount, parentCategoryNodeRef); + given(nodeServiceMock.getChildAssocs(parentCategoryNodeRef)).willReturn(childAssociationRefMocks); + childAssociationRefMocks.forEach(this::prepareCategoryNodeMocks); + + //when + final CollectionWithPagingInfo categoryChildren = objectUnderTest.getCategoryChildren(PARENT_ID, parametersMock); + + then(nodesMock).should().validateNode(PARENT_ID); + then(nodesMock).should().isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false); + then(nodeServiceMock).should().getChildAssocs(parentCategoryNodeRef); + childAssociationRefMocks.forEach(ca -> { + then(nodesMock).should().getNode(ca.getChildRef().getId()); + then(nodeServiceMock).should() + .getChildAssocs(ca.getChildRef(), RegexQNamePattern.MATCH_ALL, RegexQNamePattern.MATCH_ALL, false); + then(nodeServiceMock).should().getPrimaryParent(ca.getChildRef()); + }); + then(nodeServiceMock).should(times(childrenCount)).getParentAssocs(parentCategoryNodeRef); + + then(nodesMock).shouldHaveNoMoreInteractions(); + then(nodeServiceMock).shouldHaveNoMoreInteractions(); + + then(authorityServiceMock).shouldHaveNoInteractions(); + then(categoryServiceMock).shouldHaveNoInteractions(); + + assertEquals(childAssociationRefMocks.size(), categoryChildren.getTotalItems().intValue()); + final List categoryChildrenList = new ArrayList<>(categoryChildren.getCollection()); + assertEquals(childAssociationRefMocks.size(), categoryChildrenList.size()); + IntStream.range(0, childrenCount).forEach(i -> doCategoryAssertions(categoryChildrenList.get(i), i, PARENT_ID)); + } + + @Test + public void testGetCategoryChildren_noChildren() + { + final NodeRef parentCategoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARENT_ID); + given(nodesMock.validateNode(PARENT_ID)).willReturn(parentCategoryNodeRef); + given(nodesMock.isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(true); + + given(nodeServiceMock.getChildAssocs(parentCategoryNodeRef)).willReturn(Collections.emptyList()); + + + //when + final CollectionWithPagingInfo categoryChildren = objectUnderTest.getCategoryChildren(PARENT_ID, parametersMock); + + then(nodesMock).should().validateNode(PARENT_ID); + then(nodesMock).should().isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false); + then(nodesMock).shouldHaveNoMoreInteractions(); + then(nodeServiceMock).should().getChildAssocs(parentCategoryNodeRef); + then(nodeServiceMock).shouldHaveNoMoreInteractions(); + + then(authorityServiceMock).shouldHaveNoInteractions(); + then(categoryServiceMock).shouldHaveNoInteractions(); + + assertEquals(0, categoryChildren.getTotalItems().intValue()); + } + + @Test + public void testGetCategoryChildren_wrongParentNodeType() + { + final NodeRef parentCategoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARENT_ID); + given(nodesMock.validateNode(PARENT_ID)).willReturn(parentCategoryNodeRef); + given(nodesMock.isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(false); + + //when + assertThrows(InvalidArgumentException.class, () -> objectUnderTest.getCategoryChildren(PARENT_ID, parametersMock)); + + then(nodesMock).should().validateNode(PARENT_ID); + then(nodesMock).should().isSubClass(parentCategoryNodeRef, ContentModel.TYPE_CATEGORY, false); + then(nodesMock).shouldHaveNoMoreInteractions(); + + then(nodeServiceMock).shouldHaveNoInteractions(); + then(categoryServiceMock).shouldHaveNoInteractions(); + then(authorityServiceMock).shouldHaveNoInteractions(); + } + + @Test + public void testGetCategoryChildren_nonExistingParentNode() + { + given(nodesMock.validateNode(PARENT_ID)).willThrow(EntityNotFoundException.class); + + //when + assertThrows(EntityNotFoundException.class, () -> objectUnderTest.getCategoryChildren(PARENT_ID, parametersMock)); + + + then(nodesMock).should().validateNode(PARENT_ID); + then(nodesMock).shouldHaveNoMoreInteractions(); + + then(nodeServiceMock).shouldHaveNoInteractions(); + then(categoryServiceMock).shouldHaveNoInteractions(); + then(authorityServiceMock).shouldHaveNoInteractions(); + } + private Node prepareCategoryNode() { - final Node categoryNode = new Node(); - categoryNode.setName(CATEGORY_NAME); - categoryNode.setNodeId(CATEGORY_ID); final NodeRef parentNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, PARENT_ID); + return prepareCategoryNode(CATEGORY_NAME, CATEGORY_ID, parentNodeRef); + } + + private Node prepareCategoryNode(final String name, final String id, final NodeRef parentNodeRef) + { + final Node categoryNode = new Node(); + categoryNode.setName(name); + categoryNode.setNodeId(id); categoryNode.setParentId(parentNodeRef); return categoryNode; } @@ -387,4 +530,40 @@ public class CategoriesImplTest .name(CATEGORY_NAME) .create()); } + + private List prepareChildAssocMocks(final int count, NodeRef parentCategoryNodeRef) + { + return IntStream.range(0, count).mapToObj(i -> { + ChildAssociationRef dummyChildAssocMock = mock(ChildAssociationRef.class); + given(dummyChildAssocMock.getTypeQName()).willReturn(ContentModel.ASSOC_SUBCATEGORIES); + given(dummyChildAssocMock.getChildRef()) + .willReturn(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CATEGORY_ID + "-" + i)); + given(dummyChildAssocMock.getParentRef()).willReturn(parentCategoryNodeRef); + return dummyChildAssocMock; + }) + .collect(Collectors.toList()); + } + + private void prepareCategoryNodeMocks(ChildAssociationRef childAssociationRef) + { + final NodeRef childRef = childAssociationRef.getChildRef(); + final String id = childRef.getId(); + final String name = id.replace(CATEGORY_ID, CATEGORY_NAME); + final NodeRef parentRef = childAssociationRef.getParentRef(); + given(nodesMock.getNode(id)).willReturn(prepareCategoryNode(name, id, parentRef)); + final ChildAssociationRef parentAssoc = new ChildAssociationRef(null, parentRef, null, childRef); + given(nodeServiceMock.getPrimaryParent(childRef)).willReturn(parentAssoc); + given(nodeServiceMock.getParentAssocs(parentRef)).willReturn(List.of(parentAssoc)); + } + + private void doCategoryAssertions(final Category category, final int index, final String parentId) + { + final Category expectedCategory = Category.builder() + .id(CATEGORY_ID + "-" + index) + .name(CATEGORY_NAME + "-" + index) + .parentId(parentId) + .hasChildren(false) + .create(); + assertEquals(expectedCategory, category); + } } From 78e1d5863c550bbc992a824b4f02318d38a7b556 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 13 Dec 2022 16:59:52 +0000 Subject: [PATCH 02/12] [maven-release-plugin][skip ci] prepare release 20.41 --- 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 368fdadb2a..33ce6e4003 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 20.41-SNAPSHOT + 20.41 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 83f4b18ca1..2d54d649f1 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 - 20.41-SNAPSHOT + 20.41 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 92d6cb86a9..8b5a62998c 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 - 20.41-SNAPSHOT + 20.41 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index a149001911..27d13e11cc 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 - 20.41-SNAPSHOT + 20.41 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 0a07aa28ee..5fde803f04 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 - 20.41-SNAPSHOT + 20.41 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 dae56a6e0b..dd2276466d 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 - 20.41-SNAPSHOT + 20.41 diff --git a/amps/pom.xml b/amps/pom.xml index d4dbb3a5fd..722339470a 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.41-SNAPSHOT + 20.41 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index ed0697c0b4..579e37d263 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 20.41-SNAPSHOT + 20.41 diff --git a/core/pom.xml b/core/pom.xml index f95335b303..962df1fe29 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.41-SNAPSHOT + 20.41 diff --git a/data-model/pom.xml b/data-model/pom.xml index dcae4f74c3..5071aa9491 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.41-SNAPSHOT + 20.41 diff --git a/mmt/pom.xml b/mmt/pom.xml index c84563075c..ac9dc977ff 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.41-SNAPSHOT + 20.41 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 24937dadcc..bb6147efaf 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 20.41-SNAPSHOT + 20.41 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 70dc62b2ae..d125121b33 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.41-SNAPSHOT + 20.41 diff --git a/packaging/pom.xml b/packaging/pom.xml index a6f54d86f8..a3cf710825 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.41-SNAPSHOT + 20.41 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index ef43555ad2..01eef10683 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 20.41-SNAPSHOT + 20.41 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 11b8729383..486ab21ae0 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 - 20.41-SNAPSHOT + 20.41 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 312f92e976..bba74d68ad 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 - 20.41-SNAPSHOT + 20.41 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index a5b26852cb..90d0cf4c7b 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 - 20.41-SNAPSHOT + 20.41 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 258f4aa6fb..f37cb96198 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 - 20.41-SNAPSHOT + 20.41 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 21614ddd38..72d768bdd6 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 - 20.41-SNAPSHOT + 20.41 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 0cae073a7c..2e3d1ca166 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.41-SNAPSHOT + 20.41 diff --git a/pom.xml b/pom.xml index e7e4878733..d21b0787bd 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 20.41-SNAPSHOT + 20.41 pom Alfresco Community Repo Parent @@ -148,7 +148,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 + 20.41 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 38a8d8cffb..3545cb22ba 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.41-SNAPSHOT + 20.41 diff --git a/repository/pom.xml b/repository/pom.xml index 0b74a64168..ab03e07a63 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.41-SNAPSHOT + 20.41 From 28114338c849c8d408de6df417d9a46dea4f1994 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Tue, 13 Dec 2022 16:59:55 +0000 Subject: [PATCH 03/12] [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 33ce6e4003..26c263290d 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 20.41 + 20.42-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 2d54d649f1..29a0c49068 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 - 20.41 + 20.42-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 8b5a62998c..c69b5716d6 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 - 20.41 + 20.42-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 27d13e11cc..2d9a56cfb1 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 - 20.41 + 20.42-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 5fde803f04..065bcc80e8 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 - 20.41 + 20.42-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 dd2276466d..73eb6a0cd5 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 - 20.41 + 20.42-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index 722339470a..4e7ce0e44b 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.41 + 20.42-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 579e37d263..a1399af469 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 20.41 + 20.42-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 962df1fe29..5e46c5e81e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.41 + 20.42-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 5071aa9491..fa5ff74124 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.41 + 20.42-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index ac9dc977ff..41f5c3b54b 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.41 + 20.42-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index bb6147efaf..ae009d282b 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 20.41 + 20.42-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index d125121b33..60a796c59c 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.41 + 20.42-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index a3cf710825..672c650093 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.41 + 20.42-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 01eef10683..62581c7351 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 20.41 + 20.42-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 486ab21ae0..db63ac2b4f 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 - 20.41 + 20.42-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index bba74d68ad..780bdd72ae 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 - 20.41 + 20.42-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 90d0cf4c7b..a8711fa220 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 - 20.41 + 20.42-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index f37cb96198..5cfbe671cb 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 - 20.41 + 20.42-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 72d768bdd6..a7de223758 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 - 20.41 + 20.42-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 2e3d1ca166..be0333a9e1 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.41 + 20.42-SNAPSHOT diff --git a/pom.xml b/pom.xml index d21b0787bd..0f427f430f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 20.41 + 20.42-SNAPSHOT pom Alfresco Community Repo Parent @@ -148,7 +148,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 - 20.41 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 3545cb22ba..9aab758d9f 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.41 + 20.42-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index ab03e07a63..e7a79ccbba 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.41 + 20.42-SNAPSHOT From 88b6a8e5b37a6e46d4eb5fb4e0ef08410f0cda87 Mon Sep 17 00:00:00 2001 From: George Evangelopoulos Date: Wed, 14 Dec 2022 16:00:59 +0000 Subject: [PATCH 04/12] ACS-4030: Delete category endpoint (#1618) * ACS-4030: Delete category endpoint implementation and tests --- .../alfresco/rest/requests/Categories.java | 12 ++ .../categories/DeleteCategoriesTests.java | 133 ++++++++++++++++++ .../org/alfresco/rest/api/Categories.java | 4 +- .../categories/CategoriesEntityResource.java | 11 +- .../rest/api/impl/CategoriesImpl.java | 18 +++ .../rest/api/impl/CategoriesImplTest.java | 86 +++++++++++ 6 files changed, 262 insertions(+), 2 deletions(-) create mode 100644 packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/DeleteCategoriesTests.java diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Categories.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Categories.java index 27ed2f5bc7..33697d5a65 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Categories.java +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Categories.java @@ -92,4 +92,16 @@ public class Categories extends ModelRequest return restWrapper.processModels(RestCategoryModelsCollection.class, request); } + /** + * Delete category. + * + * - DELETE /categories/{categoryId} + */ + public void deleteCategory() + { + RestRequest request = RestRequest. + simpleRequest(HttpMethod.DELETE, "/categories/{categoryId}", category.getId()); + restWrapper.processEmptyModel(request); + } + } diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/DeleteCategoriesTests.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/DeleteCategoriesTests.java new file mode 100644 index 0000000000..e0b11e582c --- /dev/null +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/categories/DeleteCategoriesTests.java @@ -0,0 +1,133 @@ +/* + * #%L + * Alfresco Remote API + * %% + * Copyright (C) 2005 - 2022 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.rest.categories; + +import org.alfresco.rest.RestTest; +import org.alfresco.rest.model.RestCategoryModel; +import org.alfresco.utility.data.RandomData; +import org.alfresco.utility.model.FolderModel; +import org.alfresco.utility.model.SiteModel; +import org.alfresco.utility.model.TestGroup; +import org.alfresco.utility.model.UserModel; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +import static org.alfresco.utility.report.log.Step.STEP; +import static org.springframework.http.HttpStatus.BAD_REQUEST; +import static org.springframework.http.HttpStatus.CREATED; +import static org.springframework.http.HttpStatus.FORBIDDEN; +import static org.springframework.http.HttpStatus.NOT_FOUND; +import static org.springframework.http.HttpStatus.NO_CONTENT; + +public class DeleteCategoriesTests extends RestTest { + + private UserModel user; + + + @BeforeClass(alwaysRun = true) + public void dataPreparation() throws Exception + { + STEP("Create a user"); + user = dataUser.createRandomTestUser(); + } + + /** + * Check we can delete a category. + */ + @Test(groups = {TestGroup.REST_API}) + public void testDeleteCategory() + { + STEP("Create a category and send a request to delete it."); + RestCategoryModel aCategory = createCategory(); + restClient.authenticateUser(dataUser.getAdminUser()).withCoreAPI().usingCategory(aCategory).deleteCategory(); + restClient.assertStatusCodeIs(NO_CONTENT); + + STEP("Ensure that the category has been deleted by sending a GET request and receiving 404."); + restClient.authenticateUser(user).withCoreAPI().usingCategory(aCategory).getCategory(); + restClient.assertStatusCodeIs(NOT_FOUND); + } + + /** + * Check we get an error when trying to delete a category as a non-admin user. + */ + @Test(groups = {TestGroup.REST_API}) + public void testDeleteCategoryAsRegularUser_andFail() + { + RestCategoryModel aCategory = createCategory(); + restClient.authenticateUser(user).withCoreAPI().usingCategory(aCategory).deleteCategory(); + restClient.assertStatusCodeIs(FORBIDDEN).assertLastError().containsSummary("Current user does not have permission to delete a category"); + } + + /** + * Check we receive 404 error when trying to delete a category with a non-existent node id. + */ + @Test(groups = {TestGroup.REST_API}) + public void testDeleteNonExistentCategory() + { + STEP("Get category with non-existent id"); + final RestCategoryModel rootCategory = new RestCategoryModel(); + final String id = "non-existing-dummy-id"; + rootCategory.setId(id); + + STEP("Attempt to delete category with non-existent id and receive 404"); + restClient.authenticateUser(dataUser.getAdminUser()).withCoreAPI().usingCategory(rootCategory).deleteCategory(); + restClient.assertStatusCodeIs(NOT_FOUND); + } + + /** + * Attempt to delete a category when providing a node id that doesn't belong to a category + */ + @Test(groups = {TestGroup.REST_API}) + public void testDeleteCategory_givenNonCategoryNodeId() + { + STEP("Create a site and a folder inside it"); + final SiteModel site = dataSite.usingUser(user).createPublicRandomSite(); + final FolderModel folder = dataContent.usingUser(user).usingSite(site).createFolder(); + String id = folder.getNodeRef(); + + STEP("Create a category, set its id to the folder id and attempt to delete it"); + final RestCategoryModel aCategory = new RestCategoryModel(); + aCategory.setId(id); + restClient.authenticateUser(dataUser.getAdminUser()).withCoreAPI().usingCategory(aCategory).deleteCategory(); + restClient.assertStatusCodeIs(BAD_REQUEST).assertLastError().containsSummary("Node id does not refer to a valid category"); + } + + public RestCategoryModel createCategory() + { + final RestCategoryModel rootCategory = new RestCategoryModel(); + rootCategory.setId("-root-"); + final RestCategoryModel aCategory = new RestCategoryModel(); + aCategory.setName(RandomData.getRandomName("Category")); + final RestCategoryModel createdCategory = restClient.authenticateUser(dataUser.getAdminUser()) + .withCoreAPI() + .usingCategory(rootCategory) + .createSingleCategory(aCategory); + restClient.assertStatusCodeIs(CREATED); + + return createdCategory; + } +} diff --git a/remote-api/src/main/java/org/alfresco/rest/api/Categories.java b/remote-api/src/main/java/org/alfresco/rest/api/Categories.java index 7e03067e50..a3babc5905 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/Categories.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/Categories.java @@ -32,7 +32,6 @@ import org.alfresco.rest.api.model.Category; import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo; import org.alfresco.rest.framework.resource.parameters.Parameters; import org.alfresco.service.Experimental; -import org.alfresco.service.cmr.repository.NodeRef; @Experimental public interface Categories @@ -42,4 +41,7 @@ public interface Categories List createSubcategories(String parentCategoryId, List categories, Parameters parameters); CollectionWithPagingInfo getCategoryChildren(String parentCategoryId, Parameters params); + + void deleteCategoryById(String id, Parameters params); + } diff --git a/remote-api/src/main/java/org/alfresco/rest/api/categories/CategoriesEntityResource.java b/remote-api/src/main/java/org/alfresco/rest/api/categories/CategoriesEntityResource.java index 3bde251ca0..df8483958f 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/categories/CategoriesEntityResource.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/categories/CategoriesEntityResource.java @@ -41,7 +41,8 @@ import org.alfresco.rest.framework.resource.parameters.Parameters; * @author mpichura */ @EntityResource(name = "categories", title = "Categories") -public class CategoriesEntityResource implements EntityResourceAction.ReadById +public class CategoriesEntityResource implements EntityResourceAction.ReadById, + EntityResourceAction.Delete { private final Categories categories; @@ -58,4 +59,12 @@ public class CategoriesEntityResource implements EntityResourceAction.ReadById objectUnderTest.deleteCategoryById(CATEGORY_ID, parametersMock)); + + then(authorityServiceMock).should().hasAdminAuthority(); + then(authorityServiceMock).shouldHaveNoMoreInteractions(); + + then(nodesMock).shouldHaveNoInteractions(); + then(nodeServiceMock).shouldHaveNoInteractions(); + } + + @Test + public void testDeleteCategoryById_nonCategoryId() + { + given(authorityServiceMock.hasAdminAuthority()).willReturn(true); + final NodeRef categoryNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CATEGORY_ID); + given(nodesMock.validateNode(CATEGORY_ID)).willReturn(categoryNodeRef); + given(nodesMock.isSubClass(categoryNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(false); + + //when + assertThrows(InvalidArgumentException.class, () -> objectUnderTest.deleteCategoryById(CATEGORY_ID, parametersMock)); + + then(authorityServiceMock).should().hasAdminAuthority(); + then(authorityServiceMock).shouldHaveNoMoreInteractions(); + + then(nodesMock).should().validateNode(CATEGORY_ID); + then(nodesMock).should().isSubClass(categoryNodeRef, ContentModel.TYPE_CATEGORY, false); + then(nodesMock).shouldHaveNoMoreInteractions(); + } + + @Test + public void testDeleteCategoryById_rootCategory() + { + given(authorityServiceMock.hasAdminAuthority()).willReturn(true); + final NodeRef categoryRootNodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CAT_ROOT_NODE_ID); + given(nodesMock.validateNode(CAT_ROOT_NODE_ID)).willReturn(categoryRootNodeRef); + given(nodesMock.isSubClass(categoryRootNodeRef, ContentModel.TYPE_CATEGORY, false)).willReturn(true); + given(categoryChildAssociationRefMock.getQName()).willReturn(ContentModel.ASPECT_GEN_CLASSIFIABLE); + given(nodeServiceMock.getParentAssocs(categoryRootNodeRef)).willReturn(List.of(categoryChildAssociationRefMock)); + + //when + assertThrows(InvalidArgumentException.class, () -> objectUnderTest.deleteCategoryById(CAT_ROOT_NODE_ID, parametersMock)); + + then(authorityServiceMock).should().hasAdminAuthority(); + then(authorityServiceMock).shouldHaveNoMoreInteractions(); + + then(nodesMock).should().validateNode(CAT_ROOT_NODE_ID); + then(nodesMock).should().isSubClass(categoryRootNodeRef, ContentModel.TYPE_CATEGORY, false); + then(nodesMock).shouldHaveNoMoreInteractions(); + + then(nodeServiceMock).should().getParentAssocs(categoryRootNodeRef); + then(nodeServiceMock).shouldHaveNoMoreInteractions(); + } + @Test public void testCreateCategoryUnderRoot() { From eea23b0d2af7251301f043bada46206f05bcbdf1 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 14 Dec 2022 16:39:48 +0000 Subject: [PATCH 05/12] [maven-release-plugin][skip ci] prepare release 20.42 --- 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 26c263290d..10a19554aa 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 20.42-SNAPSHOT + 20.42 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 29a0c49068..d792380348 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 - 20.42-SNAPSHOT + 20.42 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 c69b5716d6..ff85d048bf 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 - 20.42-SNAPSHOT + 20.42 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 2d9a56cfb1..b811aa8454 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 - 20.42-SNAPSHOT + 20.42 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 065bcc80e8..ddf55b8237 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 - 20.42-SNAPSHOT + 20.42 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 73eb6a0cd5..344267b3cb 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 - 20.42-SNAPSHOT + 20.42 diff --git a/amps/pom.xml b/amps/pom.xml index 4e7ce0e44b..ea0b45fbd5 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.42-SNAPSHOT + 20.42 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index a1399af469..e7aae1a396 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 20.42-SNAPSHOT + 20.42 diff --git a/core/pom.xml b/core/pom.xml index 5e46c5e81e..b4ca36ba3a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.42-SNAPSHOT + 20.42 diff --git a/data-model/pom.xml b/data-model/pom.xml index fa5ff74124..8f9a2821b4 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.42-SNAPSHOT + 20.42 diff --git a/mmt/pom.xml b/mmt/pom.xml index 41f5c3b54b..73ba659d33 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.42-SNAPSHOT + 20.42 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index ae009d282b..792f4c7df8 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 20.42-SNAPSHOT + 20.42 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 60a796c59c..7b93f10363 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.42-SNAPSHOT + 20.42 diff --git a/packaging/pom.xml b/packaging/pom.xml index 672c650093..d288c41388 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.42-SNAPSHOT + 20.42 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 62581c7351..e65872243b 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 20.42-SNAPSHOT + 20.42 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index db63ac2b4f..48c08571c1 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 - 20.42-SNAPSHOT + 20.42 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 780bdd72ae..186b12d68a 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 - 20.42-SNAPSHOT + 20.42 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index a8711fa220..a3cffb0f74 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 - 20.42-SNAPSHOT + 20.42 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 5cfbe671cb..3d7fc1f1de 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 - 20.42-SNAPSHOT + 20.42 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index a7de223758..5fc29ae097 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 - 20.42-SNAPSHOT + 20.42 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index be0333a9e1..6bc954edfc 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.42-SNAPSHOT + 20.42 diff --git a/pom.xml b/pom.xml index 0f427f430f..c6b4bd4f4d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 20.42-SNAPSHOT + 20.42 pom Alfresco Community Repo Parent @@ -148,7 +148,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 + 20.42 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 9aab758d9f..68398cb4e2 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.42-SNAPSHOT + 20.42 diff --git a/repository/pom.xml b/repository/pom.xml index e7a79ccbba..5f4e6f3755 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.42-SNAPSHOT + 20.42 From 1749b2d74bd8927ccd0aa8b2df076ba351a499d2 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Wed, 14 Dec 2022 16:39:51 +0000 Subject: [PATCH 06/12] [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 10a19554aa..79313cbc68 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 20.42 + 20.43-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index d792380348..78f94d83ad 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 - 20.42 + 20.43-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 ff85d048bf..fb43dc97c0 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 - 20.42 + 20.43-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index b811aa8454..848a11e3c1 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 - 20.42 + 20.43-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index ddf55b8237..61362c2674 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 - 20.42 + 20.43-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 344267b3cb..0576c4de62 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 - 20.42 + 20.43-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index ea0b45fbd5..aee55682c9 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.42 + 20.43-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index e7aae1a396..e182a2e286 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 20.42 + 20.43-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index b4ca36ba3a..5328b7b040 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.42 + 20.43-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 8f9a2821b4..460f55319a 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.42 + 20.43-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 73ba659d33..fe8fa67eed 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.42 + 20.43-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 792f4c7df8..d4b6107e11 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 20.42 + 20.43-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 7b93f10363..5832fcf4e5 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.42 + 20.43-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index d288c41388..52a99f1bb9 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.42 + 20.43-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index e65872243b..22ca93ef8c 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 20.42 + 20.43-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 48c08571c1..806062578f 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 - 20.42 + 20.43-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 186b12d68a..3b22c0abc7 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 - 20.42 + 20.43-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index a3cffb0f74..32204df148 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 - 20.42 + 20.43-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 3d7fc1f1de..d79a9a5668 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 - 20.42 + 20.43-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 5fc29ae097..826a6fc3b8 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 - 20.42 + 20.43-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 6bc954edfc..16c5b0a671 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.42 + 20.43-SNAPSHOT diff --git a/pom.xml b/pom.xml index c6b4bd4f4d..231fda916b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 20.42 + 20.43-SNAPSHOT pom Alfresco Community Repo Parent @@ -148,7 +148,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 - 20.42 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 68398cb4e2..2252a69836 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.42 + 20.43-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 5f4e6f3755..1f93258b61 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.42 + 20.43-SNAPSHOT From 077752ad862a2aa438788d676deedca7b4cb4fca Mon Sep 17 00:00:00 2001 From: kcichonczyk <88378534+kcichonczyk@users.noreply.github.com> Date: Thu, 15 Dec 2022 14:28:46 +0100 Subject: [PATCH 07/12] bumped IE version to 2.0.6 (ACS-4054) (#1628) --- 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 fc37bc79cc..9c612ce1fb 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.6-A4 +SOLR6_TAG=2.0.6 POSTGRES_TAG=14.4 ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8 diff --git a/packaging/tests/environment/.env b/packaging/tests/environment/.env index fc37bc79cc..9c612ce1fb 100644 --- a/packaging/tests/environment/.env +++ b/packaging/tests/environment/.env @@ -1,3 +1,3 @@ -SOLR6_TAG=2.0.6-A4 +SOLR6_TAG=2.0.6 POSTGRES_TAG=14.4 ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8 From c66bb48258ae1b0d0e102257f12cd683392d4315 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 15 Dec 2022 14:09:41 +0000 Subject: [PATCH 08/12] [maven-release-plugin][skip ci] prepare release 20.43 --- 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 79313cbc68..f187925531 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 20.43-SNAPSHOT + 20.43 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 78f94d83ad..0367dcffd6 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 - 20.43-SNAPSHOT + 20.43 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 fb43dc97c0..16ea53ed11 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 - 20.43-SNAPSHOT + 20.43 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 848a11e3c1..24006bc0b8 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 - 20.43-SNAPSHOT + 20.43 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 61362c2674..5e9f1efb10 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 - 20.43-SNAPSHOT + 20.43 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 0576c4de62..5963fa4ec4 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 - 20.43-SNAPSHOT + 20.43 diff --git a/amps/pom.xml b/amps/pom.xml index aee55682c9..c5cd14fac6 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.43-SNAPSHOT + 20.43 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index e182a2e286..cd0b4e1032 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 20.43-SNAPSHOT + 20.43 diff --git a/core/pom.xml b/core/pom.xml index 5328b7b040..58c86ed6cf 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.43-SNAPSHOT + 20.43 diff --git a/data-model/pom.xml b/data-model/pom.xml index 460f55319a..bcc11c0cb7 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.43-SNAPSHOT + 20.43 diff --git a/mmt/pom.xml b/mmt/pom.xml index fe8fa67eed..b8aa27d0b7 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.43-SNAPSHOT + 20.43 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index d4b6107e11..a303dc88ca 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 20.43-SNAPSHOT + 20.43 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 5832fcf4e5..85de34785d 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.43-SNAPSHOT + 20.43 diff --git a/packaging/pom.xml b/packaging/pom.xml index 52a99f1bb9..2a0ace7faa 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.43-SNAPSHOT + 20.43 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 22ca93ef8c..ebe6f786b7 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 20.43-SNAPSHOT + 20.43 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 806062578f..22baecdb4d 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 - 20.43-SNAPSHOT + 20.43 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 3b22c0abc7..35c6148754 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 - 20.43-SNAPSHOT + 20.43 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 32204df148..ba454714c3 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 - 20.43-SNAPSHOT + 20.43 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index d79a9a5668..23a9c5ca32 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 - 20.43-SNAPSHOT + 20.43 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 826a6fc3b8..bb24d83976 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 - 20.43-SNAPSHOT + 20.43 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 16c5b0a671..5c2a0127ad 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.43-SNAPSHOT + 20.43 diff --git a/pom.xml b/pom.xml index 231fda916b..c4b9e7d7ff 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 20.43-SNAPSHOT + 20.43 pom Alfresco Community Repo Parent @@ -148,7 +148,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 + 20.43 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 2252a69836..bd29ea4eb4 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.43-SNAPSHOT + 20.43 diff --git a/repository/pom.xml b/repository/pom.xml index 1f93258b61..4b369aa367 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.43-SNAPSHOT + 20.43 From 54843fa3360c179ca00f9df7eac712464fc99b2f Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Thu, 15 Dec 2022 14:09:45 +0000 Subject: [PATCH 09/12] [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 f187925531..888b712a23 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 20.43 + 20.44-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index 0367dcffd6..ad9bc250c7 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 - 20.43 + 20.44-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 16ea53ed11..56b9198151 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 - 20.43 + 20.44-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 24006bc0b8..20c2e54439 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 - 20.43 + 20.44-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 5e9f1efb10..1a0f08ca5a 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 - 20.43 + 20.44-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 5963fa4ec4..358e1b5fcc 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 - 20.43 + 20.44-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index c5cd14fac6..db9e91fa56 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.43 + 20.44-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index cd0b4e1032..99ea308f1f 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 20.43 + 20.44-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 58c86ed6cf..afe5433e42 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.43 + 20.44-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index bcc11c0cb7..48d941b053 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.43 + 20.44-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index b8aa27d0b7..04111ac757 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.43 + 20.44-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index a303dc88ca..90284b8166 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 20.43 + 20.44-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 85de34785d..3733b75c0d 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.43 + 20.44-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index 2a0ace7faa..8606e74580 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.43 + 20.44-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index ebe6f786b7..4b0567c7a4 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 20.43 + 20.44-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 22baecdb4d..8ba46a8060 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 - 20.43 + 20.44-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 35c6148754..8b4f10c16c 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 - 20.43 + 20.44-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index ba454714c3..9d6fb1a283 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 - 20.43 + 20.44-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 23a9c5ca32..978b5930be 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 - 20.43 + 20.44-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index bb24d83976..9b3c7298e2 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 - 20.43 + 20.44-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index 5c2a0127ad..a301f19b3c 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.43 + 20.44-SNAPSHOT diff --git a/pom.xml b/pom.xml index c4b9e7d7ff..f3dd18ab29 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 20.43 + 20.44-SNAPSHOT pom Alfresco Community Repo Parent @@ -148,7 +148,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 - 20.43 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index bd29ea4eb4..9d13b5f37f 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.43 + 20.44-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index 4b369aa367..497c2de8ba 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.43 + 20.44-SNAPSHOT From cdbe3292e026684e137bf2048aad8fb03e22aae5 Mon Sep 17 00:00:00 2001 From: Damian Ujma <92095156+damianujma@users.noreply.github.com> Date: Fri, 16 Dec 2022 11:27:02 +0100 Subject: [PATCH 10/12] ACS-3841 Add missing logs for WebDAV TAS tests (#1629) * ACS-3841 Add missing logs * ACS-3841 Reformat code + fix grep --- packaging/tests/scripts/output_tests_run.sh | 2 +- .../java/org/alfresco/webdav/WebDavTest.java | 22 ++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/packaging/tests/scripts/output_tests_run.sh b/packaging/tests/scripts/output_tests_run.sh index ca1c9355c4..cd7c630cbf 100755 --- a/packaging/tests/scripts/output_tests_run.sh +++ b/packaging/tests/scripts/output_tests_run.sh @@ -4,4 +4,4 @@ TAS_DIRECTORY=$1 cd ${TAS_DIRECTORY} -cat target/reports/alfresco-tas.log | grep "*** STARTING" +cat target/reports/alfresco-tas.log | grep -a "*** STARTING" diff --git a/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/WebDavTest.java b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/WebDavTest.java index f75eed0f92..ca71c0ab91 100644 --- a/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/WebDavTest.java +++ b/packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/WebDavTest.java @@ -1,17 +1,25 @@ package org.alfresco.webdav; +import java.lang.reflect.Method; + import org.alfresco.utility.data.DataContent; import org.alfresco.utility.data.DataSite; import org.alfresco.utility.data.DataUser; +import org.alfresco.utility.LogFactory; import org.alfresco.utility.network.ServerHealth; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.testng.AbstractTestNGSpringContextTests; +import org.slf4j.Logger; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeSuite; @ContextConfiguration("classpath:alfresco-webdav-context.xml") public abstract class WebDavTest extends AbstractTestNGSpringContextTests { + private static final Logger LOG = LogFactory.getLogger(); + @Autowired protected DataSite dataSite; @@ -36,4 +44,16 @@ public abstract class WebDavTest extends AbstractTestNGSpringContextTests // The webdav protocol is enabled by default. //webDavProtocol.assertThat().protocolIsEnabled(); } -} + + @BeforeMethod(alwaysRun=true) + public void showStartTestInfo(Method method) + { + LOG.info(String.format("*** STARTING Test: [%s] ***", method.getName())); + } + + @AfterMethod(alwaysRun=true) + public void showEndTestInfo(Method method) + { + LOG.info(String.format("*** ENDING Test: [%s] ***", method.getName())); + } +} \ No newline at end of file From c50c10ef2be7abf0bb2650a5f6f16136c7c16af0 Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 16 Dec 2022 11:03:01 +0000 Subject: [PATCH 11/12] [maven-release-plugin][skip ci] prepare release 20.44 --- 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 888b712a23..c6bf92cb82 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 20.44-SNAPSHOT + 20.44 diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index ad9bc250c7..ef7555b543 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 - 20.44-SNAPSHOT + 20.44 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 56b9198151..2315c232d0 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 - 20.44-SNAPSHOT + 20.44 diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 20c2e54439..33e638e67f 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 - 20.44-SNAPSHOT + 20.44 diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 1a0f08ca5a..77964c55a5 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 - 20.44-SNAPSHOT + 20.44 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 358e1b5fcc..4faca3575b 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 - 20.44-SNAPSHOT + 20.44 diff --git a/amps/pom.xml b/amps/pom.xml index db9e91fa56..f43489216f 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.44-SNAPSHOT + 20.44 diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 99ea308f1f..8babf3877d 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 20.44-SNAPSHOT + 20.44 diff --git a/core/pom.xml b/core/pom.xml index afe5433e42..fd1711699a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.44-SNAPSHOT + 20.44 diff --git a/data-model/pom.xml b/data-model/pom.xml index 48d941b053..0120c86828 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.44-SNAPSHOT + 20.44 diff --git a/mmt/pom.xml b/mmt/pom.xml index 04111ac757..35a23714ab 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.44-SNAPSHOT + 20.44 diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index 90284b8166..a20293f466 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 20.44-SNAPSHOT + 20.44 diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 3733b75c0d..4db77a1fc8 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.44-SNAPSHOT + 20.44 diff --git a/packaging/pom.xml b/packaging/pom.xml index 8606e74580..c6b909edfa 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.44-SNAPSHOT + 20.44 diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 4b0567c7a4..24cb42cf12 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 20.44-SNAPSHOT + 20.44 diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 8ba46a8060..435fa196ed 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 - 20.44-SNAPSHOT + 20.44 diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index 8b4f10c16c..a2b0a0c898 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 - 20.44-SNAPSHOT + 20.44 diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 9d6fb1a283..3deaf7748c 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 - 20.44-SNAPSHOT + 20.44 diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index 978b5930be..e2714a6803 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 - 20.44-SNAPSHOT + 20.44 diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 9b3c7298e2..9c7b594bcb 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 - 20.44-SNAPSHOT + 20.44 diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index a301f19b3c..e04ca1d860 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.44-SNAPSHOT + 20.44 diff --git a/pom.xml b/pom.xml index f3dd18ab29..447129e45a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 20.44-SNAPSHOT + 20.44 pom Alfresco Community Repo Parent @@ -148,7 +148,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 + 20.44 diff --git a/remote-api/pom.xml b/remote-api/pom.xml index 9d13b5f37f..fba54fa23f 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.44-SNAPSHOT + 20.44 diff --git a/repository/pom.xml b/repository/pom.xml index 497c2de8ba..df4c90722d 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.44-SNAPSHOT + 20.44 From 60a04b0402bdeff903c341e0a36d646e3939da6f Mon Sep 17 00:00:00 2001 From: Travis CI User <8039454+alfresco-build@users.noreply.github.com> Date: Fri, 16 Dec 2022 11:03:04 +0000 Subject: [PATCH 12/12] [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 c6bf92cb82..7ea46aa1b7 100644 --- a/amps/ags/pom.xml +++ b/amps/ags/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-amps - 20.44 + 20.45-SNAPSHOT diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml index ef7555b543..b60e5ec611 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 - 20.44 + 20.45-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 2315c232d0..e0f6bf31e4 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 - 20.44 + 20.45-SNAPSHOT diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml index 33e638e67f..4743beb7e7 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 - 20.44 + 20.45-SNAPSHOT diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml index 77964c55a5..8e85cc0f94 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 - 20.44 + 20.45-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 4faca3575b..ce5a6d46bd 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 - 20.44 + 20.45-SNAPSHOT diff --git a/amps/pom.xml b/amps/pom.xml index f43489216f..a9d1866061 100644 --- a/amps/pom.xml +++ b/amps/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.44 + 20.45-SNAPSHOT diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml index 8babf3877d..90d7cf5448 100644 --- a/amps/share-services/pom.xml +++ b/amps/share-services/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-community-repo-amps - 20.44 + 20.45-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index fd1711699a..4d48e8b4e3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.44 + 20.45-SNAPSHOT diff --git a/data-model/pom.xml b/data-model/pom.xml index 0120c86828..9ca95416cc 100644 --- a/data-model/pom.xml +++ b/data-model/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.44 + 20.45-SNAPSHOT diff --git a/mmt/pom.xml b/mmt/pom.xml index 35a23714ab..f075a4c335 100644 --- a/mmt/pom.xml +++ b/mmt/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.44 + 20.45-SNAPSHOT diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml index a20293f466..51e2ecc6d3 100644 --- a/packaging/distribution/pom.xml +++ b/packaging/distribution/pom.xml @@ -9,6 +9,6 @@ org.alfresco alfresco-community-repo-packaging - 20.44 + 20.45-SNAPSHOT diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 4db77a1fc8..37c25ae4d7 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.44 + 20.45-SNAPSHOT diff --git a/packaging/pom.xml b/packaging/pom.xml index c6b909edfa..59ec7e5d0e 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.44 + 20.45-SNAPSHOT diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml index 24cb42cf12..9a596006c7 100644 --- a/packaging/tests/pom.xml +++ b/packaging/tests/pom.xml @@ -6,7 +6,7 @@ org.alfresco alfresco-community-repo-packaging - 20.44 + 20.45-SNAPSHOT diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml index 435fa196ed..6eeacfc3e9 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 - 20.44 + 20.45-SNAPSHOT diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml index a2b0a0c898..6bea3a195a 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 - 20.44 + 20.45-SNAPSHOT diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml index 3deaf7748c..3580670ea2 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 - 20.44 + 20.45-SNAPSHOT diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml index e2714a6803..149a190861 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 - 20.44 + 20.45-SNAPSHOT diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml index 9c7b594bcb..c6510867a2 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 - 20.44 + 20.45-SNAPSHOT diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml index e04ca1d860..1c8075a60c 100644 --- a/packaging/war/pom.xml +++ b/packaging/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo-packaging - 20.44 + 20.45-SNAPSHOT diff --git a/pom.xml b/pom.xml index 447129e45a..9e6845e241 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 alfresco-community-repo - 20.44 + 20.45-SNAPSHOT pom Alfresco Community Repo Parent @@ -148,7 +148,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 - 20.44 + HEAD diff --git a/remote-api/pom.xml b/remote-api/pom.xml index fba54fa23f..0c485a45a4 100644 --- a/remote-api/pom.xml +++ b/remote-api/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.44 + 20.45-SNAPSHOT diff --git a/repository/pom.xml b/repository/pom.xml index df4c90722d..3b22b8a836 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-community-repo - 20.44 + 20.45-SNAPSHOT