[maven-release-plugin][skip ci] prepare release 23.1.0.173

ACS-5624 Search and Favorites API enhancements - E2E test (#2091 )
* ACS-5624: Seacrh and Favorites API enhancements. * ACS-5624: Reverting unwanted test change. * ACS-5624: Adding isFavorite to SearchNodeModel. * ACS-5624: Moving E2E test from InsightEngine/SearchServices project. * ACS-5624: Moving E2E test from InsightEngine/SearchServices project. * ACS-5624: Splitting test into 2 methods. * ACS-5624: Fixing test method name Co-authored-by: Tom Page <tpage-alfresco@users.noreply.github.com> * ACS-5624: Fixing some static code scan issues. --------- Co-authored-by: Tom Page <tpage-alfresco@users.noreply.github.com>
2025-09-10 14:11:58 +00:00 · 2023-07-27 19:25:32 +00:00 · 2023-07-27 18:01:41 +02:00 · 2023-07-27 13:46:15 +00:00 · 2023-07-27 13:46:12 +00:00 · 2023-07-27 14:25:57 +02:00
36 changed files with 560 additions and 591 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
    runs-on: ubuntu-latest
    if: >
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -52,7 +52,7 @@ jobs:
    if: >
      ((github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) && github.event_name != 'pull_request') &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -87,7 +87,7 @@ jobs:
    if: >
      !contains(github.event.head_commit.message, '[skip repo]') &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -108,7 +108,7 @@ jobs:
    if: >
      !contains(github.event.head_commit.message, '[skip repo]') &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    strategy:
      fail-fast: false
      matrix:
@@ -153,7 +153,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip db]')) ||
      contains(github.event.head_commit.message, '[db]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    strategy:
      fail-fast: false
      matrix:
@@ -183,7 +183,7 @@ jobs:
      contains(github.event.head_commit.message, '[latest db]') ||
      contains(github.event.head_commit.message, '[db]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -209,7 +209,7 @@ jobs:
      contains(github.event.head_commit.message, '[latest db]') ||
      contains(github.event.head_commit.message, '[db]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -234,7 +234,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip db]')) ||
      contains(github.event.head_commit.message, '[db]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -259,7 +259,7 @@ jobs:
      contains(github.event.head_commit.message, '[latest db]') ||
      contains(github.event.head_commit.message, '[db]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -282,7 +282,7 @@ jobs:
    if: >
      !contains(github.event.head_commit.message, '[skip repo]') &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -303,7 +303,7 @@ jobs:
    if: >
      !contains(github.event.head_commit.message, '[skip repo]') &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    strategy:
      fail-fast: false
      matrix:
@@ -372,7 +372,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tas]')) ||
      contains(github.event.head_commit.message, '[tas]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    strategy:
      fail-fast: false
      matrix:
@@ -439,7 +439,7 @@ jobs:
    if: >
      !contains(github.event.head_commit.message, '[skip repo]') &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
@@ -462,7 +462,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip ags]')) ||
      contains(github.event.head_commit.message, '[ags]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    strategy:
      fail-fast: false
      matrix:
@@ -493,7 +493,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip ags]')) ||
      contains(github.event.head_commit.message, '[ags on MySQL]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    strategy:
      fail-fast: false
      matrix:
@@ -524,7 +524,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip ags]') && !contains(github.event.head_commit.message, '[skip tas]')) ||
      (contains(github.event.head_commit.message, '[ags]') && contains(github.event.head_commit.message, '[tas]'))) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
+      !contains(github.event.head_commit.message, '[force')
    env:
      REQUIRES_LOCAL_IMAGES: true
    steps:
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.1.0.167-SNAPSHOT</version>
+      <version>23.1.0.173</version>
   </parent>

   <modules>
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.1.0.167-SNAPSHOT</version>
+      <version>23.1.0.173</version>
   </parent>

   <modules>
--- 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 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>23.1.0.167-SNAPSHOT</version>
+      <version>23.1.0.173</version>
   </parent>

   <build>
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.1.0.167-SNAPSHOT</version>
+      <version>23.1.0.173</version>
   </parent>

   <modules>
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -8,7 +8,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>23.1.0.167-SNAPSHOT</version>
+      <version>23.1.0.173</version>
   </parent>

   <properties>
--- 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 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <build>
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <modules>
--- a/amps/share-services/pom.xml
+++ b/amps/share-services/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <properties>
--- a/amps/share-services/src/main/resources/alfresco/bootstrap/team-sample-sites/swsdp/Contents.acp
+++ b/amps/share-services/src/main/resources/alfresco/bootstrap/team-sample-sites/swsdp/Contents.acp
--- a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/collaboration/tagQuery.get.js
+++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/collaboration/tagQuery.get.js
@@ -48,7 +48,7 @@ function tagQuery()
   }
   query += "ASPECT:\"{http://www.alfresco.org/model/content/1.0}taggable\"";
   //MNT-2118 Share inconsistencies when displaying locked files with tags
-   query += " -ASPECT:\"{http://www.alfresco.org/model/content/1.0}workingcopy\"";
+   query += " AND -ASPECT:\"{http://www.alfresco.org/model/content/1.0}workingcopy\"";

   // MNT-20091 check to prevent cm:taggable with NULL
   query += " AND ISNOTNULL:\"{http://www.alfresco.org/model/content/1.0}taggable\"";
@@ -60,7 +60,7 @@ function tagQuery()
         query: query,
         language: "lucene",
         page: {
-            // query minimum rows because all usefull info will come with facets 
+            // query minimum rows because all useful info will come with facets
            maxItems: 1,
            skipCount: 0
         },
--- a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/categorynode.get.js
+++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/categorynode.get.js
@@ -24,7 +24,7 @@ function getCategoryNode()
      else
      {
         var queryPath = "/" + catAspect + "/" + encodePath(path);
-         categoryResults = search.luceneSearch("+PATH:\"" + queryPath + "/*\" -PATH:\"" + queryPath + "/member\"");
+         categoryResults = search.luceneSearch("+PATH:\"" + queryPath + "/*\" AND -PATH:\"" + queryPath + "/member\"");
      }
      
      // make each result an object and indicate it is selectable in the UI
@@ -71,4 +71,4 @@ function encodePath(path)
 function sortByName(a, b)
 {
   return (b.node.name.toLowerCase() > a.node.name.toLowerCase() ? -1 : 1);
-}
+}
--- a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/images.get.js
+++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/images.get.js
@@ -29,7 +29,7 @@ function main()
   {
      query = "+PATH:\"" + parsedArgs.pathNode.qnamePath + "//*\" ";
   }
-   query += "+TYPE:\"cm:content\" +@cm\\:content.mimetype:image/*";
+   query += "AND +TYPE:\"cm:content\" AND +@cm\\:content.mimetype:\"image/*\"";
   
   // Sort the list before trimming to page chunks 
   assets = search.query(
@@ -52,4 +52,4 @@ function main()
 /**
 * Images List Component: images
 */
-model.images = main();
+model.images = main();
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo</artifactId>
-      <version>23.1.0.167-SNAPSHOT</version>
+      <version>23.1.0.173</version>
   </parent>

   <dependencies>
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <properties>
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <dependencies>
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>
 </project>
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <properties>
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <modules>
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <modules>
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <organization>
--- a/packaging/tests/tas-email/pom.xml
+++ b/packaging/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-integration/pom.xml
+++ b/packaging/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <developers>
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <properties>
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoritesTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/favorites/GetFavoritesTests.java
@@ -1,11 +1,16 @@
 package org.alfresco.rest.favorites;

+import java.util.List;
+
 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.rest.model.RestPersonFavoritesModel;
 import org.alfresco.rest.model.RestPersonFavoritesModelsCollection;
 import org.alfresco.rest.model.RestSiteModel;
+import org.alfresco.rest.search.RestRequestQueryModel;
+import org.alfresco.rest.search.SearchRequest;
+import org.alfresco.utility.Utility;
 import org.alfresco.utility.constants.UserRole;
 import org.alfresco.utility.data.DataUser.ListUserWithRoles;
 import org.alfresco.utility.model.FileModel;
@@ -15,6 +20,7 @@ import org.alfresco.utility.model.TestGroup;
 import org.alfresco.utility.model.UserModel;
 import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
+import org.hamcrest.Matchers;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -61,7 +67,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.SANITY,
            description = "Verify Manager user gets favorites with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.SANITY })
-    public void managerIsAbleToRetrieveFavorites() throws Exception
+    public void managerIsAbleToRetrieveFavorites()
    {
        restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteManager));
        restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
@@ -77,7 +83,7 @@ public class GetFavoritesTests extends RestTest
            description = "Verify user gets status code 401 if authentication call fails")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.SANITY })
 //    @Bug(id = "MNT-16904", description = "It fails only on environment with tenants")
-    public void userIsNotAbleToRetrieveFavoritesIfAuthenticationFails() throws Exception
+    public void userIsNotAbleToRetrieveFavoritesIfAuthenticationFails()
    {
        UserModel siteManager = firstSiteUsers.getOneUserWithRole(UserRole.SiteManager);
        siteManager.setPassword("wrongPassword");
@@ -88,7 +94,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify Admin user gets favorites sites with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void adminIsAbleToRetrieveFavoritesSites() throws Exception
+    public void adminIsAbleToRetrieveFavoritesSites()
    {
        restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(adminUserModel).addSiteToFavorites(firstSiteModel);
        restClient.withCoreAPI().usingUser(adminUserModel).addSiteToFavorites(secondSiteModel);
@@ -103,7 +109,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify Admin user gets favorites folders with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void adminIsAbleToRetrieveFavoritesFolders() throws Exception
+    public void adminIsAbleToRetrieveFavoritesFolders()
    {
        restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(adminUserModel).addFolderToFavorites(firstFolderModel);
        restClient.withCoreAPI().usingUser(adminUserModel).addFolderToFavorites(secondFolderModel);
@@ -118,7 +124,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify Admin user gets favorites files with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void adminIsAbleToRetrieveFavoritesFiles() throws Exception
+    public void adminIsAbleToRetrieveFavoritesFiles()
    {
        restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(adminUserModel).addFileToFavorites(firstFileModel);
        restClient.withCoreAPI().usingUser(adminUserModel).addFileToFavorites(secondFileModel);
@@ -133,7 +139,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify Collaborator user gets favorites with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void collaboratorIsAbleToRetrieveFavorites() throws Exception
+    public void collaboratorIsAbleToRetrieveFavorites()
    {
        restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator))
                  .withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
@@ -148,7 +154,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify Contributor user gets favorites with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void contributorIsAbleToRetrieveFavorites() throws Exception
+    public void contributorIsAbleToRetrieveFavorites()
    {
        restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteContributor))
                  .withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
@@ -163,7 +169,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify Consumer user gets favorites with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void consumerIsAbleToRetrieveFavorites() throws Exception
+    public void consumerIsAbleToRetrieveFavorites()
    {
        restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteConsumer))
                  .withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
@@ -178,7 +184,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify user doesn't have permission to get favorites of another user with Rest API and status code is 404")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsNotAbleToRetrieveFavoritesOfAnotherUser() throws Exception
+    public void userIsNotAbleToRetrieveFavoritesOfAnotherUser()
    {
        restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteConsumer))
                  .withCoreAPI().usingUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator)).getFavorites();
@@ -189,7 +195,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify user doesn't have permission to get favorites of admin user with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION  })
-    public void userIsNotAbleToRetrieveFavoritesOfAdminUser() throws Exception
+    public void userIsNotAbleToRetrieveFavoritesOfAdminUser()
    {
        restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteConsumer)).withCoreAPI()
                  .usingUser(adminUserModel).getFavorites();
@@ -200,7 +206,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify admin user doesn't have permission to get favorites of another user with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void adminIsNotAbleToRetrieveFavoritesOfAnotherUser() throws Exception
+    public void adminIsNotAbleToRetrieveFavoritesOfAnotherUser()
    {
        restClient.authenticateUser(adminUserModel).withCoreAPI().usingUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator))
                  .getFavorites();
@@ -211,7 +217,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify User gets only favorites sites with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsAbleToRetrieveOnlyFavoritesSites() throws Exception
+    public void userIsAbleToRetrieveOnlyFavoritesSites()
    {
        restClient.authenticateUser(secondSiteUsers.getOneUserWithRole(UserRole.SiteManager));
        restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
@@ -229,7 +235,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify User gets only favorites files with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsAbleToRetrieveOnlyFavoritesFiles() throws Exception
+    public void userIsAbleToRetrieveOnlyFavoritesFiles()
    {
        restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator));
        restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
@@ -247,7 +253,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify User gets only favorites folders with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsAbleToRetrieveOnlyFavoritesFolders() throws Exception
+    public void userIsAbleToRetrieveOnlyFavoritesFolders()
    {
        restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator));
        restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
@@ -265,7 +271,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify User gets only favorites files or folders with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsAbleToRetrieveFavoritesFilesOrFolders() throws Exception
+    public void userIsAbleToRetrieveFavoritesFilesOrFolders()
    {
        restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteConsumer));
        restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
@@ -286,7 +292,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify User gets only favorites files or sites with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsAbleToRetrieveFavoritesFilesOrSites() throws Exception
+    public void userIsAbleToRetrieveFavoritesFilesOrSites()
    {
        restClient.authenticateUser(secondSiteUsers.getOneUserWithRole(UserRole.SiteManager));
        restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
@@ -307,7 +313,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify User gets only favorites folders or sites with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsAbleToRetrieveFavoritesFoldersOrSites() throws Exception
+    public void userIsAbleToRetrieveFavoritesFoldersOrSites()
    {
        restClient.authenticateUser(secondSiteUsers.getOneUserWithRole(UserRole.SiteManager));
        restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
@@ -328,7 +334,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify User gets all favorites with Rest API and status code is 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsAbleToRetrieveAllFavorites() throws Exception
+    public void userIsAbleToRetrieveAllFavorites()
    {
        restClient.authenticateUser(secondSiteUsers.getOneUserWithRole(UserRole.SiteCollaborator));
        restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
@@ -359,7 +365,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify request for a user with no favorites returns status 200")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userHasNoFavorites() throws Exception
+    public void userHasNoFavorites()
    {
        restClient.authenticateUser(secondSiteUsers.getOneUserWithRole(UserRole.SiteContributor));

@@ -371,7 +377,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify request using invalid where parameter returns status 400")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void getFavoritesUsingInvalidWhereParameter() throws Exception
+    public void getFavoritesUsingInvalidWhereParameter()
    {
        restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteConsumer));
        restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
@@ -387,7 +393,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify User gets correct favorites after deleting a favorite")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void checkFavoriteFolderIsRemoved() throws Exception
+    public void checkFavoriteFolderIsRemoved()
    {
        restClient.authenticateUser(firstSiteUsers.getOneUserWithRole(UserRole.SiteManager));
        restClient.withCoreAPI().usingAuthUser().addSiteToFavorites(firstSiteModel);
@@ -405,7 +411,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify get favorites specifying -me- string in place of <personid> for request")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsAbleToGetFavoritesWhenUsingMeAsUsername() throws Exception
+    public void userIsAbleToGetFavoritesWhenUsingMeAsUsername()
    {
        userFavorites = restClient.authenticateUser(userModel).withCoreAPI().usingMe().getFavorites();
        restClient.assertStatusCodeIs(HttpStatus.OK);
@@ -415,7 +421,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify get favorites using empty for where parameter for request")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsAbleToGetFavoritesWhenUsingEmptyWhereParameter() throws Exception
+    public void userIsAbleToGetFavoritesWhenUsingEmptyWhereParameter()
    {
        userFavorites = restClient.authenticateUser(adminUserModel).withCoreAPI().usingAuthUser().where().getFavorites();
        restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST)
@@ -425,7 +431,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API,TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify that for invalid maxItems parameter status code returned is 400.")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void checkInvalidMaxItemsStatusCode() throws Exception
+    public void checkInvalidMaxItemsStatusCode()
    {
        restClient.authenticateUser(adminUserModel).withParams("maxItems=AB").withCoreAPI().usingUser(adminUserModel).getFavorites();
        restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError().containsSummary("Invalid paging parameter");
@@ -434,7 +440,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API,TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify that for invalid skipCount parameter status code returned is 400.")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void checkInvalidSkipCountStatusCode() throws Exception
+    public void checkInvalidSkipCountStatusCode()
    {
        restClient.authenticateUser(adminUserModel).withParams("skipCount=AB").withCoreAPI().usingUser(adminUserModel).getFavorites();
        restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError().containsSummary("Invalid paging parameter");
@@ -443,7 +449,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify get favorites when using invalid network id for non-tenant user")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void getFavoritesWhenNetworkIdIsInvalid() throws Exception
+    public void getFavoritesWhenNetworkIdIsInvalid()
    {
        UserModel networkUserModel = dataUser.createRandomTestUser();
        networkUserModel.setDomain("invalidNetwork");
@@ -454,7 +460,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify get favorites using AND instead of OR in where parameter for request")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsNotAbleToGetFavoritesWhenUsingANDInWhereParameter() throws Exception
+    public void userIsNotAbleToGetFavoritesWhenUsingANDInWhereParameter()
    {
        userFavorites = restClient.withCoreAPI().usingAuthUser().where().targetFolderExist().invalidWhereParameter("AND").targetFileExist().getFavorites();
        restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST)
@@ -464,7 +470,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify get favorites using wrong name instead of EXISTS in where parameter for request")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsNotAbleToGetFavoritesWhenUsingWrongWhereParameter() throws Exception
+    public void userIsNotAbleToGetFavoritesWhenUsingWrongWhereParameter()
    {
        userFavorites = restClient.withCoreAPI().usingAuthUser().where().invalidWhereParameter("EXIST((target/site))").targetFileExist().getFavorites();
        restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST)
@@ -474,7 +480,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify get favorites except the first one for request")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsAbleToGetFavoritesExceptTheFirstOne() throws Exception
+    public void userIsAbleToGetFavoritesExceptTheFirstOne()
    {
        userFavorites = restClient.authenticateUser(userModel).withParams("skipCount=1").withCoreAPI().usingUser(userModel).getFavorites();
        restClient.assertStatusCodeIs(HttpStatus.OK);
@@ -487,7 +493,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify get first two favorites sites")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsAbleToGetFirstTwoFavorites() throws Exception
+    public void userIsAbleToGetFirstTwoFavorites()
    {
        userFavorites = restClient.authenticateUser(userModel).withParams("maxItems=2").withCoreAPI().usingUser(userModel).getFavorites();
        restClient.assertStatusCodeIs(HttpStatus.OK);
@@ -503,7 +509,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify get favorites sites when using empty values for skipCount and maxItems")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsAbleToGetFavoritesWhenSkipCountAndMaxItemsAreEmpty() throws Exception
+    public void userIsAbleToGetFavoritesWhenSkipCountAndMaxItemsAreEmpty()
    {
        restClient.authenticateUser(userModel).withParams("skipCount= ").withCoreAPI().usingUser(userModel).getFavorites();
        restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError().containsSummary(String.format(RestErrorModel.INVALID_SKIPCOUNT, " "));
@@ -515,7 +521,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify the get favorites request for a high value for skipCount parameter")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsAbleToGetFavoritesWithHighSkipCount() throws Exception
+    public void userIsAbleToGetFavoritesWithHighSkipCount()
    {
        userFavorites = restClient.authenticateUser(userModel).withParams("skipCount=999999999").withCoreAPI().usingUser(userModel).getFavorites();
        restClient.assertStatusCodeIs(HttpStatus.OK);
@@ -526,7 +532,7 @@ public class GetFavoritesTests extends RestTest
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION,
            description = "Verify the get favorites request with properties parameter applied")
    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    public void userIsAbleToGetFavoritesWithPropertiesParamApplied() throws Exception
+    public void userIsAbleToGetFavoritesWithPropertiesParamApplied()
    {
        userFavorites = restClient.authenticateUser(userModel).withParams("properties=targetGuid").withCoreAPI().usingUser(userModel).getFavorites();
        restClient.assertStatusCodeIs(HttpStatus.OK);
@@ -537,7 +543,7 @@ public class GetFavoritesTests extends RestTest

    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, description = "Verify entry details for get favorites response with Rest API")
-    public void checkResponseSchemaForGetFavorites() throws Exception
+    public void checkResponseSchemaForGetFavorites()
    {
        userFavorites = restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser().getFavorites();
        restClient.assertStatusCodeIs(HttpStatus.OK);
@@ -553,11 +559,12 @@ public class GetFavoritesTests extends RestTest
                .field("title").is(thirdSiteModel.getTitle());
    }

-    @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, description = "Verify if get favorites response returns allowableOperations object when requested")
-    public void checkResponseForGetFavoritesWithAllowableOperations()
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
+            description = "Verify if get favorites response returns allowableOperations object when requested")
+    public void checkResponsesForGetFavoritesWithAllowableOperations()
    {
-        RestPersonFavoritesModelsCollection adminFavorites =
+        final RestPersonFavoritesModelsCollection adminFavorites =
                restClient.authenticateUser(adminUserModel).withCoreAPI().usingAuthUser().include(ALLOWABLE_OPERATIONS).getFavorites();
        restClient.assertStatusCodeIs(HttpStatus.OK);

@@ -565,4 +572,22 @@ public class GetFavoritesTests extends RestTest
                .map(RestPersonFavoritesModel::onModel)
                .forEach(m -> m.assertThat().field(ALLOWABLE_OPERATIONS).isNotEmpty());
    }
+
+    @TestRail(section = {TestGroup.REST_API, TestGroup.FAVORITES}, executionType = ExecutionType.REGRESSION,
+            description = "Verify the get favorites request with properties parameter applied")
+    @Test(groups = {TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION})
+    public void checkSearchResponseContainsIsFavoriteWhenRequested() throws InterruptedException {
+        final SearchRequest query = new SearchRequest();
+        final RestRequestQueryModel queryReq = new RestRequestQueryModel();
+        queryReq.setQuery(firstFileModel.getName());
+        query.setQuery(queryReq);
+        query.setInclude(List.of("isFavorite"));
+
+        Utility.sleep(500, 60000, () ->
+                {
+                    restClient.authenticateUser(adminUserModel).withSearchAPI().search(query);
+                    restClient.onResponse().assertThat().body("list.entries.entry[0].isFavorite", Matchers.notNullValue());
+                }
+        );
+    }
 }
--- a/packaging/tests/tas-webdav/pom.xml
+++ b/packaging/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <developers>
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <properties>
--- a/packaging/war/src/main/webapp/WEB-INF/web.xml
+++ b/packaging/war/src/main/webapp/WEB-INF/web.xml
@@ -388,12 +388,6 @@
        <load-on-startup>8</load-on-startup>
    </servlet>

-   <servlet>
-      <servlet-name>cmistck</servlet-name>
-      <servlet-class>org.apache.chemistry.opencmis.tck.runner.WebRunnerServlet</servlet-class>
-      <load-on-startup>8</load-on-startup>
-   </servlet>
-
   <servlet>
      <servlet-name>publicapiServlet</servlet-name>
      <servlet-class>org.alfresco.rest.api.PublicApiWebScriptServlet</servlet-class>
@@ -469,14 +463,6 @@
      <servlet-name>publicapiServlet</servlet-name>
      <url-pattern>/api/*</url-pattern>
   </servlet-mapping>
-    
-   <!-- The CMIS TCK is deactivated by default. -->
-   <!-- CMISTCK
-   <servlet-mapping>
-      <servlet-name>cmistck</servlet-name>
-      <url-pattern>/cmistck</url-pattern>
-   </servlet-mapping>
-   CMISTCK -->

   <!-- Enterprise servlet-mapping placeholder -->

--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <artifactId>alfresco-community-repo</artifactId>
-    <version>23.1.0.167-SNAPSHOT</version>
+    <version>23.1.0.173</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -63,7 +63,7 @@
        <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
        <dependency.webscripts.version>8.45</dependency.webscripts.version>
        <dependency.bouncycastle.version>1.70</dependency.bouncycastle.version>
-        <dependency.mockito-core.version>4.9.0</dependency.mockito-core.version>
+        <dependency.mockito-core.version>5.4.0</dependency.mockito-core.version>
        <dependency.assertj.version>3.24.2</dependency.assertj.version>
        <dependency.org-json.version>20230618</dependency.org-json.version>
        <dependency.commons-dbcp.version>2.9.0</dependency.commons-dbcp.version>
@@ -84,10 +84,8 @@
        <dependency.poi.version>5.2.2</dependency.poi.version>
        <dependency.poi-ooxml-lite.version>5.2.3</dependency.poi-ooxml-lite.version>
        <dependency.jboss.logging.version>3.5.0.Final</dependency.jboss.logging.version>
-        <dependency.camel.version>3.20.2</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
-        <dependency.netty.version>4.1.87.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
-        <dependency.netty.qpid.version>4.1.82.Final</dependency.netty.qpid.version> <!-- must be in sync with camels transitive dependencies: native-unix-common/native-epoll/native-kqueue -->
-        <dependency.netty-tcnative.version>2.0.56.Final</dependency.netty-tcnative.version> <!-- must be in sync with camels transitive dependencies -->
+        <dependency.camel.version>3.21.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
+        <dependency.netty.version>4.1.95.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
        <dependency.activemq.version>5.17.4</dependency.activemq.version>
        <dependency.apache-compress.version>1.23.0</dependency.apache-compress.version>
        <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
@@ -150,7 +148,7 @@
        <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
        <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
        <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>HEAD</tag>
+        <tag>23.1.0.173</tag>
    </scm>

    <distributionManagement>
@@ -388,7 +386,11 @@
                <artifactId>commons-fileupload</artifactId>
                <version>1.5</version>
            </dependency>
-
+            <dependency>
+                <groupId>commons-net</groupId>
+                <artifactId>commons-net</artifactId>
+                <version>3.9.0</version>
+            </dependency>
            <dependency>
                <groupId>org.apache.httpcomponents</groupId>
                <artifactId>httpclient</artifactId>
@@ -851,17 +853,6 @@
                <artifactId>camel-mock</artifactId>
                <version>${dependency.camel.version}</version>
            </dependency>
-            <!-- Netty non-transitive dependencies declared for depending projects usage in conjunction with Camel's other transitive netty dependencies -->
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-handler-proxy</artifactId>
-                <version>${dependency.netty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-tcnative-classes</artifactId>
-                <version>${dependency.netty-tcnative.version}</version>
-            </dependency>

            <dependency>
                <groupId>org.apache.taglibs</groupId>
@@ -906,6 +897,15 @@
                    </exclusion>
                </exclusions>
            </dependency>
+
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-bom</artifactId>
+                <version>${dependency.netty.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
            <dependency>
                <groupId>org.springframework.security</groupId>
                <artifactId>spring-security-bom</artifactId>
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <dependencies>
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.167-SNAPSHOT</version>
+        <version>23.1.0.173</version>
    </parent>

    <dependencies>
@@ -741,7 +741,6 @@
        <dependency>
            <groupId>commons-net</groupId>
            <artifactId>commons-net</artifactId>
-            <version>3.8.0</version>
            <scope>test</scope>
        </dependency>
        <dependency>
--- a/repository/src/test/java/org/alfresco/filesys/FTPServerTest.java
+++ b/repository/src/test/java/org/alfresco/filesys/FTPServerTest.java
--- a/repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java
+++ b/repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Repository
 * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software. 
 * If the software was purchased under a paid Alfresco license, the terms of 
@@ -114,7 +114,7 @@ public class LockServiceImplTest extends BaseSpringTest
    private PolicyComponent policyComponent;


-    private class LockServicePoliciesImpl implements LockServicePolicies.BeforeLock,
+    public class LockServicePoliciesImpl implements LockServicePolicies.BeforeLock,
            LockServicePolicies.BeforeUnlock
    {
        @Override
--- a/repository/src/test/java/org/alfresco/repo/rule/RuleServiceImplUnitTest.java
+++ b/repository/src/test/java/org/alfresco/repo/rule/RuleServiceImplUnitTest.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Repository
 * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2023 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * If the software was purchased under a paid Alfresco license, the terms of
@@ -48,11 +48,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.then;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.openMocks;

 import java.io.Serializable;
@@ -97,7 +93,7 @@ public class RuleServiceImplUnitTest
    @Mock
    private PermissionService permissionService;
    @Mock
-    private SimpleCache nodeRulesCache;
+    private SimpleCache<NodeRef, List<Rule>> nodeRulesCache;
    @Mock
    private NodeService runtimeNodeService;
    @Mock
--- a/repository/src/test/resources/test-messaging-context.xml
+++ b/repository/src/test/resources/test-messaging-context.xml
@@ -8,36 +8,37 @@
        <property name="location" value="test-messaging.properties" />
    </bean>

+    <bean id="transactionAwareEventProducer" class="org.mockito.Mockito" factory-method="mock">
+        <constructor-arg type="java.lang.Class" value="org.alfresco.repo.rawevents.TransactionAwareEventProducer" />
+    </bean>
+
+    <bean id="policyComponent" class="org.mockito.Mockito" factory-method="mock">
+        <constructor-arg type="java.lang.Class" value="org.alfresco.repo.policy.PolicyComponentImpl"/>
+    </bean>
+
+    <bean id="transformRequestProcessor" class="org.mockito.Mockito" factory-method="mock">
+        <constructor-arg type="java.lang.Class" value="org.alfresco.repo.rendition2.TransformRequestProcessor" />
+    </bean>
+
    <import resource="classpath:/alfresco/subsystems/Messaging/default/messaging-context.xml" />

-    <bean id="messagingExceptionProcessor" 
-        class="org.alfresco.messaging.camel.MockExceptionProcessor" />
-        
-    <bean id="mockConsumer" 
-        class="org.alfresco.messaging.camel.MockConsumer" />
+    <bean id="messagingExceptionProcessor"
+          class="org.alfresco.messaging.camel.MockExceptionProcessor" />
+
+    <bean id="mockConsumer"
+          class="org.alfresco.messaging.camel.MockConsumer" />
+
+    <bean id="mockExceptionThrowingConsumer"
+          class="org.alfresco.messaging.camel.MockExceptionThrowingConsumer" />

-    <bean id="mockExceptionThrowingConsumer" 
-        class="org.alfresco.messaging.camel.MockExceptionThrowingConsumer" />
-    
    <import resource="testRoutes.xml" />
    <bean id="testNewRouteLoader" class="org.alfresco.messaging.camel.SpringContextRouteLoader">
        <property name="camelContextId" value="alfrescoCamelContext" />
        <property name="routeContextId" value="customRoutes" />
    </bean>

-    <bean id="transactionAwareEventProducer" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.repo.rawevents.TransactionAwareEventProducer" />
-    </bean>
-
-    <bean id="policyComponent" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.repo.policy.PolicyComponentImpl"/>
-    </bean>
-
    <bean id="renditionEventProcessor" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.repo.rendition2.RenditionEventProcessor"/>
+        <constructor-arg type="java.lang.Class" value="org.alfresco.repo.rendition2.RenditionEventProcessor"/>
    </bean>

-    <bean id="transformRequestProcessor" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.repo.rendition2.TransformRequestProcessor" />
-    </bean>
 </beans>
--- a/repository/src/test/resources/test-nodeLocatorServiceImpl-context.xml
+++ b/repository/src/test/resources/test-nodeLocatorServiceImpl-context.xml
@@ -3,23 +3,23 @@
 <beans>

    <bean id="repositoryHelper" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.repo.model.Repository" />
+        <constructor-arg type="java.lang.Class" value="org.alfresco.repo.model.Repository" />
    </bean>

    <bean id="SiteService" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.repo.site.SiteServiceInternal" />
+        <constructor-arg type="java.lang.Class" value="org.alfresco.repo.site.SiteServiceInternal" />
    </bean>

    <bean id="NodeService" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.service.cmr.repository.NodeService" />
+        <constructor-arg type="java.lang.Class" value="org.alfresco.service.cmr.repository.NodeService" />
    </bean>

    <bean id="NamespaceService" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.service.namespace.NamespaceService" />
+        <constructor-arg type="java.lang.Class" value="org.alfresco.service.namespace.NamespaceService" />
    </bean>

    <bean id="SearchService" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="org.alfresco.service.cmr.search.SearchService" />
+        <constructor-arg type="java.lang.Class" value="org.alfresco.service.cmr.search.SearchService" />
    </bean>

 </beans>
Author	SHA1	Message	Date
alfresco-build	f96014e570	[maven-release-plugin][skip ci] prepare release 23.1.0.173	2023-07-27 19:25:32 +00:00
Maciej Pichura	154614b674	ACS-5624 Search and Favorites API enhancements - E2E test (#2091 ) * ACS-5624: Seacrh and Favorites API enhancements. * ACS-5624: Reverting unwanted test change. * ACS-5624: Adding isFavorite to SearchNodeModel. * ACS-5624: Moving E2E test from InsightEngine/SearchServices project. * ACS-5624: Moving E2E test from InsightEngine/SearchServices project. * ACS-5624: Splitting test into 2 methods. * ACS-5624: Fixing test method name Co-authored-by: Tom Page <tpage-alfresco@users.noreply.github.com> * ACS-5624: Fixing some static code scan issues. --------- Co-authored-by: Tom Page <tpage-alfresco@users.noreply.github.com>	2023-07-27 18:01:41 +02:00
alfresco-build	c842e6ba49	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-27 13:46:15 +00:00
alfresco-build	a1d6538223	[maven-release-plugin][skip ci] prepare release 23.1.0.172	2023-07-27 13:46:12 +00:00
Oskar Rajzner	7008875dbc	ACS-5449 Add commons-net to dependenciesManagement in pom.xml (#2093 )	2023-07-27 14:25:57 +02:00
Tom Page	0b6b405c5f	ACS-5698 Allow specifying version when performing force release. (#2089 )	2023-07-26 15:51:12 +01:00
alfresco-build	f96b638c38	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-26 13:37:18 +00:00
alfresco-build	8bab9b3331	[maven-release-plugin][skip ci] prepare release 23.1.0.171	2023-07-26 13:37:15 +00:00
Oskar Rajzner	8a75a48f99	ACS-5449 Bump commons-net from 3.8.0 to 3.9.0 (#2080 )	2023-07-26 14:48:25 +02:00
alfresco-build	6f27523f5f	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-26 11:01:56 +00:00
alfresco-build	3cb17dc1a5	[maven-release-plugin][skip ci] prepare release 23.1.0.170	2023-07-26 11:01:52 +00:00
Oskar Rajzner	4faeaff6b6	ACS-5449 Bump mockito-core from 4.9.0 to 5.4.0 (#2071 )	2023-07-26 11:37:59 +02:00
Tom Page	fcf3e005e4	Merge pull request #2085 from Alfresco/feature/MNT-23763_ImagePreviewWebscript MNT-23763 Fix image preview webscript for use with ES.	2023-07-26 10:14:39 +01:00
Tom Page	5253e77444	MNT-23763 Fix boolean logic for two more webscripts to match latest search behaviour.	2023-07-25 15:24:00 +01:00
alfresco-build	e2464ffd4f	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-25 14:09:58 +00:00
alfresco-build	57da82028f	[maven-release-plugin][skip ci] prepare release 23.1.0.169	2023-07-25 14:09:54 +00:00
Tom Page	90dd44e63b	MNT-23763 Update image preview dashlet query to work with Solr and ES. Also mark previews and thumbnails as isIndexed:false in the sample site.	2023-07-25 15:05:42 +01:00
Piotr Żurek	61cf8a7273	PRODSEC-7238 Upgrade Camel/Netty (#2084 )	2023-07-25 14:45:54 +02:00
alfresco-build	7684a74dcc	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-24 14:12:47 +00:00
alfresco-build	4a49c29b3c	[maven-release-plugin][skip ci] prepare release 23.1.0.168	2023-07-24 14:12:44 +00:00
Kacper Magdziarz	693f8cd5c9	[ACS-5578] Remove cmistck servlet (#2083 )	2023-07-24 15:24:01 +02:00
alfresco-build	083bd3ce35	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-23 00:08:00 +00:00
alfresco-build	aef7febbf5	[maven-release-plugin][skip ci] prepare release 23.1.0.167	2023-07-23 00:07:57 +00:00
Alfresco CI User	db1644dbb2	[force] Force release for 2023-07-23.	2023-07-23 00:03:20 +00:00