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

[ACS-3320] REST API Explorer 7.2.1 final release
[maven-release-plugin][skip ci] prepare for next development iteration
2025-09-10 14:11:58 +00:00 · 2022-07-21 00:05:06 +00:00 · 2022-07-20 15:56:56 -06:00 · 2022-07-14 19:50:50 +00:00 · 2022-07-14 19:50:48 +00:00 · 2022-07-14 21:07:07 +02:00
33 changed files with 1021 additions and 963 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -157,10 +157,10 @@ jobs:
        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver

-    - name: "Repository - MySQL 5.7.23 tests"
+    - name: "Repository - MySQL 5.7.28 tests"
      if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
      before_script:
-        - docker run -d -p 3307:3306 -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco  mysql:5.7.23 --transaction-isolation='READ-COMMITTED' --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+        - docker run -d -p 3307:3306 -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco  mysql:5.7.28 --transaction-isolation='READ-COMMITTED' --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
        - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco

--- 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>14.146-SNAPSHOT</version>
+      <version>15.9</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>14.146-SNAPSHOT</version>
+      <version>15.9</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>14.146-SNAPSHOT</version>
+      <version>15.9</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>14.146-SNAPSHOT</version>
+      <version>15.9</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>14.146-SNAPSHOT</version>
+      <version>15.9</version>
   </parent>

   <properties>
--- a/amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties
+++ b/amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties
@@ -4,8 +4,8 @@

 # Version label
 version.major=7
-version.minor=0
-version.revision=0
+version.minor=2
+version.revision=1
 version.label=

 # Edition label
--- 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>14.146-SNAPSHOT</version>
+        <version>15.9</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>14.146-SNAPSHOT</version>
+        <version>15.9</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>14.146-SNAPSHOT</version>
+        <version>15.9</version>
    </parent>

    <properties>
--- a/amps/share-services/src/main/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java
+++ b/amps/share-services/src/main/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java
@@ -176,7 +176,6 @@ public class NodeBrowserScript extends NodeBrowserPost implements Serializable
 			{
 				status.setCode(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 				status.setMessage(e.getMessage());
-				status.setException(e);
 				status.setRedirect(true);
 			}
    		return tmplMap;
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo</artifactId>
-      <version>14.146-SNAPSHOT</version>
+      <version>15.9</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>14.146-SNAPSHOT</version>
+        <version>15.9</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>14.146-SNAPSHOT</version>
+        <version>15.9</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>14.146-SNAPSHOT</version>
+        <version>15.9</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>14.146-SNAPSHOT</version>
+        <version>15.9</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>14.146-SNAPSHOT</version>
+        <version>15.9</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>14.146-SNAPSHOT</version>
+        <version>15.9</version>
    </parent>

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

    <developers>
--- 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>14.146-SNAPSHOT</version>
+        <version>15.9</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>14.146-SNAPSHOT</version>
+        <version>15.9</version>
    </parent>

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

    <developers>
--- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessSanityTests.java
+++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/workflow/processes/GetProcessSanityTests.java
@@ -16,7 +16,7 @@ import org.testng.annotations.Test;
 */
 public class GetProcessSanityTests extends RestTest
 {
-    private UserModel userWhoStartsProcess, assignee;
+    private UserModel userWhoStartsProcess, assignee, user;
    private RestProcessModel addedProcess, process;

    @BeforeClass(alwaysRun = true)
@@ -24,6 +24,7 @@ public class GetProcessSanityTests extends RestTest
    {
        userWhoStartsProcess = dataUser.createRandomTestUser();
        assignee = dataUser.createRandomTestUser();
+        user = dataUser.createRandomTestUser();
        addedProcess = restClient.authenticateUser(userWhoStartsProcess).withWorkflowAPI().addProcess("activitiAdhoc", assignee, false, CMISUtil.Priority.High);
    }

@@ -59,4 +60,13 @@ public class GetProcessSanityTests extends RestTest
        process.assertThat().field("id").is(addedProcess.getId())
                .and().field("startUserId").is(addedProcess.getStartUserId());
    }
+
+    @TestRail(section = { TestGroup.REST_API, TestGroup.PROCESSES }, executionType = ExecutionType.SANITY,
+            description = "Verify User that is not involved in a process cannot get that process using REST API and status code is FORBIDDEN (403)")
+    @Test(groups = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.PROCESSES, TestGroup.SANITY })
+    public void shouldNotGetProcessesByNotInvolvedUser() throws Exception
+    {
+        process = restClient.authenticateUser(user).withWorkflowAPI().usingProcess(addedProcess).getProcess();
+        restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN);
+    }
 }
--- 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>14.146-SNAPSHOT</version>
+        <version>15.9</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>14.146-SNAPSHOT</version>
+        <version>15.9</version>
    </parent>

    <properties>
--- 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>14.146-SNAPSHOT</version> 
+    <version>15.9</version>
    <packaging>pom</packaging>
    <name>Alfresco Community Repo Parent</name>

@@ -25,7 +25,7 @@
    <properties>
        <acs.version.major>7</acs.version.major>
        <acs.version.minor>2</acs.version.minor>
-        <acs.version.revision>0</acs.version.revision>
+        <acs.version.revision>1</acs.version.revision>
        <acs.version.label />
        <amp.min.version>${acs.version.major}.0.0</amp.min.version>

@@ -55,19 +55,19 @@
        <dependency.alfresco-greenmail.version>6.2</dependency.alfresco-greenmail.version>
        <dependency.acs-event-model.version>0.0.13</dependency.acs-event-model.version>

-        <dependency.spring.version>5.3.15</dependency.spring.version>
+        <dependency.spring.version>5.3.18</dependency.spring.version>
        <dependency.antlr.version>3.5.2</dependency.antlr.version>
-        <dependency.jackson.version>2.13.1</dependency.jackson.version>
-        <dependency.jackson-databind.version>2.13.1</dependency.jackson-databind.version>
+        <dependency.jackson.version>2.13.3</dependency.jackson.version>
+        <dependency.jackson-databind.version>2.13.3</dependency.jackson-databind.version>
        <dependency.cxf.version>3.5.0</dependency.cxf.version>
        <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
-        <dependency.webscripts.version>8.28</dependency.webscripts.version>
+        <dependency.webscripts.version>8.31</dependency.webscripts.version>
        <dependency.bouncycastle.version>1.70</dependency.bouncycastle.version>
        <dependency.mockito-core.version>3.11.2</dependency.mockito-core.version>
        <dependency.org-json.version>20211205</dependency.org-json.version>
        <dependency.commons-dbcp.version>2.9.0</dependency.commons-dbcp.version>
        <dependency.commons-io.version>2.11.0</dependency.commons-io.version>
-        <dependency.gson.version>2.8.5</dependency.gson.version>
+        <dependency.gson.version>2.8.9</dependency.gson.version>
        <dependency.httpclient.version>4.5.13</dependency.httpclient.version>
        <dependency.httpcore.version>4.4.15</dependency.httpcore.version>
        <dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
@@ -107,7 +107,7 @@

        <alfresco.googledrive.version>3.2.1.3</alfresco.googledrive.version>
        <alfresco.aos-module.version>1.4.1</alfresco.aos-module.version> 
-        <alfresco.api-explorer.version>7.2.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
+        <alfresco.api-explorer.version>7.2.1</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->

        <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
        <license-maven-plugin.version>2.0.1.alfresco-2</license-maven-plugin.version>
@@ -146,7 +146,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>15.9</tag>
    </scm>

    <distributionManagement>
--- 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>14.146-SNAPSHOT</version>
+        <version>15.9</version>
    </parent>

    <dependencies>
--- a/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/ProcessesImpl.java
+++ b/remote-api/src/main/java/org/alfresco/rest/workflow/api/impl/ProcessesImpl.java
@@ -512,6 +512,8 @@ public class ProcessesImpl extends WorkflowRestImpl implements Processes
            throw new InvalidArgumentException("processId is required to get the process info");
        }

+        validateIfUserAllowedToWorkWithProcess(processId);
+
        HistoricProcessInstance processInstance = activitiProcessEngine
                .getHistoryService()
                .createHistoricProcessInstanceQuery()
--- a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.get.js
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/person/people.get.js
@@ -3,6 +3,7 @@ function main()

 // Get the args
 var filter = args["filter"];
+if (filter!==null && !filter.includes(":")) {filter += " [hint:useCQ]";}
 var maxResults = args["maxResults"];
 var skipCountStr = args["skipCount"];
 var skipCount = skipCountStr != null ? parseInt(skipCountStr) : -1;
--- a/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.js
+++ b/remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.js
@@ -3,7 +3,7 @@ function main()
   // Get the args
   var siteShortName = url.templateArgs.shortname,
      site = siteService.getSite(siteShortName),
-      filter = (args.filter != null) ? args.filter : (args.shortNameFilter != null) ? args.shortNameFilter : "",
+      filter = ((args.filter != null) ? args.filter : (args.shortNameFilter != null) ? args.shortNameFilter : "" )+ " [hint:useCQ]",
      maxResults = (args.maxResults == null) ? 10 : parseInt(args.maxResults, 10),
      authorityType = args.authorityType,
      zone = args.zone,
--- a/remote-api/src/test/java/org/alfresco/repo/web/scripts/person/PersonServiceTest.java
+++ b/remote-api/src/test/java/org/alfresco/repo/web/scripts/person/PersonServiceTest.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Remote API
 * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * 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 
@@ -52,7 +52,6 @@ import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.GUID;
 import org.alfresco.util.PropertyMap;
-import org.alfresco.util.testing.category.LuceneTests;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -86,7 +85,6 @@ import static org.mockito.Mockito.when;
 * 
 * @author Glen Johnson
 */
-@Category(LuceneTests.class)
 public class PersonServiceTest extends BaseWebScriptTest
 {    
    private MutableAuthenticationService authenticationService;
@@ -340,7 +338,7 @@ public class PersonServiceTest extends BaseWebScriptTest

        // Ensure that the REST call with no filter will always be routed to a DB canned query rather than a FTS
        // (see ALF-18876 for details)
-        String filter = "*%20[hint:useCQ]";
+        String filter = "*";

        Response response = sendRequest(new GetRequest(URL_PEOPLE + "?filter=" + filter), 200);
        JSONObject res = new JSONObject(response.getContentAsString());
@@ -386,7 +384,6 @@ public class PersonServiceTest extends BaseWebScriptTest
                        "&startIndex=" + 0 +
                        "&pageSize=" + 6
                ), Status.STATUS_OK);
-        assertSearchQuery(filter, true);
        JSONObject res = new JSONObject(response.getContentAsString());
        JSONArray peopleAsc = res.getJSONArray("people");
        assertEquals("The number of returned results is not correct.", 6, peopleAsc.length());
@@ -398,7 +395,6 @@ public class PersonServiceTest extends BaseWebScriptTest
                        "&startIndex=" + 0 +
                        "&pageSize=" + 2
                ), Status.STATUS_OK);
-        assertSearchQuery(filter, true);
        res = new JSONObject(response.getContentAsString());
        peopleAsc = res.getJSONArray("people");
        assertEquals("The number of returned results is not correct.", 2, peopleAsc.length());
@@ -416,7 +412,6 @@ public class PersonServiceTest extends BaseWebScriptTest
                        "&startIndex=" + 2 +
                        "&pageSize=" + 2
                ), Status.STATUS_OK);
-        assertSearchQuery(filter, true);
        res = new JSONObject(response.getContentAsString());
        peopleAsc = res.getJSONArray("people");
        assertEquals("The number of returned results is not correct.", 2, peopleAsc.length());
@@ -434,7 +429,6 @@ public class PersonServiceTest extends BaseWebScriptTest
                        "&startIndex=" + 4 +
                        "&pageSize=" + 2
                ), Status.STATUS_OK);
-        assertSearchQuery(filter, true);
        res = new JSONObject(response.getContentAsString());
        peopleAsc = res.getJSONArray("people");
        assertEquals("The number of returned results is not correct.", 2, peopleAsc.length());
@@ -452,7 +446,6 @@ public class PersonServiceTest extends BaseWebScriptTest
                        "&startIndex=" + 3 +
                        "&pageSize=" + 5
                ), Status.STATUS_OK);
-        assertSearchQuery(filter, true);
        res = new JSONObject(response.getContentAsString());
        peopleAsc = res.getJSONArray("people");
        assertEquals("The number of returned results is not correct.", 3, peopleAsc.length());
@@ -476,6 +469,7 @@ public class PersonServiceTest extends BaseWebScriptTest
    public void testGetPeopleSorting() throws Exception
    {
        String filter = GUID.generate();
+        String filterByJob = "jobtitle:job";
        String usernameA = filter + "-aaa-";
        String usernameB = filter + "-BBB-";
        String usernameC = filter + "-ccc-";
@@ -496,12 +490,17 @@ public class PersonServiceTest extends BaseWebScriptTest
        addUserUsageContent(usernameD, 50);
        userUsageTrackingComponent.execute();

+        //check sorting for CQ
        checkSorting(filter, SORT_BY_USERNAME, usernameA, usernameB, usernameC, usernameD);
        checkSorting(filter, SORT_BY_FULLNAME, usernameA, usernameB, usernameC, usernameD);
-        checkSorting(filter, SORT_BY_JOBTITLE, usernameA, usernameB, usernameC, usernameD);
-        checkSorting(filter, SORT_BY_EMAIL, usernameA, usernameB, usernameC, usernameD);
-        checkSorting(filter, SORT_BY_QUOTA, usernameA, usernameB, usernameC, usernameD);
-        checkSorting(filter, SORT_BY_USAGE, usernameA, usernameB, usernameC, usernameD);
+
+        //since CQ search only sorts by fullname and username test the other sorts by filtering for a job which bypasses CQ (MNT 22905)
+        checkSorting(filterByJob, SORT_BY_USERNAME, usernameA, usernameB, usernameC, usernameD);
+        checkSorting(filterByJob, SORT_BY_FULLNAME, usernameA, usernameB, usernameC, usernameD);
+        checkSorting(filterByJob, SORT_BY_JOBTITLE, usernameA, usernameB, usernameC, usernameD);
+        checkSorting(filterByJob, SORT_BY_EMAIL, usernameA, usernameB, usernameC, usernameD);
+        checkSorting(filterByJob, SORT_BY_QUOTA, usernameA, usernameB, usernameC, usernameD);
+        checkSorting(filterByJob, SORT_BY_USAGE, usernameA, usernameB, usernameC, usernameD);
    }

    private void checkSorting(String filter, String sortBy, String... usernames) throws Exception
@@ -519,7 +518,6 @@ public class PersonServiceTest extends BaseWebScriptTest
                        "&filter=" + filter +
                        "&dir=" + ASC_DIR
                ), Status.STATUS_OK);
-        assertSearchQuery(filter, true);
        JSONObject res = new JSONObject(response.getContentAsString());
        JSONArray peopleAsc = res.getJSONArray("people");
        assertEquals(usernames.length, peopleAsc.length());
@@ -530,7 +528,6 @@ public class PersonServiceTest extends BaseWebScriptTest
                        "&filter=" + filter +
                        "&dir=" + DESC_DIR
                ), Status.STATUS_OK);
-        assertSearchQuery(filter, true);
        res = new JSONObject(response.getContentAsString());
        JSONArray peopleDesc = res.getJSONArray("people");
        assertEquals(usernames.length, peopleDesc.length());
@@ -541,7 +538,11 @@ public class PersonServiceTest extends BaseWebScriptTest
            assertEquals(peopleAsc.getJSONObject(i).getString("userName"),
                    peopleDesc.getJSONObject(peopleAsc.length() - i - 1).getString("userName"));
        }
+        assertCorrectSort(sortBy, peopleAsc);
+    }

+    private void assertCorrectSort(String sortBy, JSONArray peopleAsc)
+    {
        // Check Asc sorting for each field
        for (int i = 0; i < peopleAsc.length() - 1; i++)
        {
@@ -766,6 +767,51 @@ public class PersonServiceTest extends BaseWebScriptTest
                        "myJobTitle", "firstName.lastName@email.com", "myBio", "images/avatar.jpg", 0,
                        Status.STATUS_BAD_REQUEST);        
    }
+
+    public void testUserNameCaseSensitivityCQ() throws Exception
+    {
+        String upperCaseUserName = "PersonServiceTest.MixedCaseUser";
+        String lowerCaseUserName = upperCaseUserName.toLowerCase();
+        // Create a new person
+
+        String currentUser = this.authenticationComponent.getCurrentUserName();
+        try
+        {
+            /**
+             *  simulate cloud with lower case user names
+             */
+            createPerson(lowerCaseUserName, "myTitle", "myFirstName", "myLastName", "myOrganisation",
+                    "myJobTitle", "firstName.lastName@email.com", "myBio", "images/avatar.jpg", 0,
+                    Status.STATUS_OK);
+
+            String adminUser = this.authenticationComponent.getSystemUserName();
+            this.authenticationComponent.setCurrentUser(adminUser);
+            personService.setCreateMissingPeople(false);
+
+            //try with canned query
+            String filter = "PerSOnSerVIceTest.MixEDCasEUseR";
+            assertPersonIsFound(filter);
+
+            filter = "MyFiRsTnAmE";
+            assertPersonIsFound(filter);
+
+            filter = "MyLaStNaMe";
+            assertPersonIsFound(filter);
+        }
+        finally
+        {
+            this.authenticationComponent.setCurrentUser(currentUser);
+        }
+    }
+
+    private void assertPersonIsFound(String filter) throws Exception
+    {
+        Response response = sendRequest(new GetRequest(URL_PEOPLE + "?filter=" + filter), 200);
+        JSONObject res = new JSONObject(response.getContentAsString());
+        int peopleFound = res.getJSONArray("people").length();
+        assertTrue("No people found", peopleFound > 0);
+    }
+
    /**
     * 
     * @throws Exception
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>14.146-SNAPSHOT</version>
+        <version>15.9</version>
    </parent>

    <dependencies>
@@ -236,7 +236,7 @@
        <dependency>
            <groupId>org.freemarker</groupId>
            <artifactId>freemarker</artifactId>
-            <version>2.3.20-alfresco-patched-20200421</version>
+            <version>2.3.20-alfresco-patched-20220413</version>
        </dependency>
        <dependency>
            <groupId>org.apache.xmlbeans</groupId>
--- a/repository/src/main/resources/alfresco/repository.properties
+++ b/repository/src/main/resources/alfresco/repository.properties
@@ -3,7 +3,7 @@
 repository.name=Main Repository

 # Schema number
-version.schema=16000
+version.schema=16100

 # Directory configuration
Author	SHA1	Message	Date
Travis CI User	d28d4873be	[maven-release-plugin][skip ci] prepare release 15.9	2022-07-21 00:05:06 +00:00
Jared Ottley	44d7c2328c	[ACS-3320] REST API Explorer 7.2.1 final release	2022-07-20 15:56:56 -06:00
Travis CI User	073338afa7	[maven-release-plugin][skip ci] prepare for next development iteration	2022-07-14 19:50:50 +00:00
Travis CI User	3e53467ac8	[maven-release-plugin][skip ci] prepare release 15.8	2022-07-14 19:50:48 +00:00
pzurek	0d5ffdac2e	Merge branch 'release/7.2.N' of github.com:Alfresco/alfresco-community-repo into release/7.2.N	2022-07-14 21:07:07 +02:00
pzurek	ac03eb7642	Revert "Revert "PRODSEC-6115: Bump Surf webscript Version to 8.31 and removing set exception (#1207 )"" This reverts commit `3304a62a35`.	2022-07-14 21:06:36 +02:00
Travis CI User	2ff5b7dd0a	[maven-release-plugin][skip ci] prepare for next development iteration	2022-07-14 17:04:48 +00:00
Travis CI User	b0d7e6dfba	[maven-release-plugin][skip ci] prepare release 15.7	2022-07-14 17:04:46 +00:00
pzurek	3304a62a35	Revert "PRODSEC-6115: Bump Surf webscript Version to 8.31 and removing set exception (#1207 )" This reverts commit `f48db84334`.	2022-07-14 18:20:46 +02:00
Travis CI User	763591c1a3	[maven-release-plugin][skip ci] prepare for next development iteration	2022-07-14 11:24:55 +00:00
Travis CI User	6de5a507fe	[maven-release-plugin][skip ci] prepare release 15.6	2022-07-14 11:24:53 +00:00
Damian Ujma	3990bc9db4	ACS-3271 Update MySQL 5.7.23 tests to 5.7.28 version (#1209 ) * PRODSEC-6261 Add 'shouldNotGetProcessesByNotInvolvedUser' test * PRODSEC-6261 Add user validation to 'getProcess' method * PRODSEC-6261 Add TestRail annotation minor fix * Update MySQL 5.7.23 tests to MySQL 7.7.28	2022-07-14 12:43:46 +02:00
Damian Ujma	f2207fe43e	ACS-3150 Upgrade jackson and gson libraries - Backporting (#1211 ) * PRODSEC-6261 Add 'shouldNotGetProcessesByNotInvolvedUser' test * PRODSEC-6261 Add user validation to 'getProcess' method * PRODSEC-6261 Add TestRail annotation minor fix * ACS-3150 Upgrade jackson and gson libraries (#1151) (cherry picked from commit `f1a3aa696e`) Co-authored-by: Piotr Żurek <Piotr.Zurek@hyland.com>	2022-07-13 15:23:30 +02:00
rrajoria	f48db84334	PRODSEC-6115: Bump Surf webscript Version to 8.31 and removing set exception (#1207 ) * PRODSEC-6115: Bump Surf webscript Version to 8.31 * Update NodeBrowserScript.java	2022-07-12 17:20:22 +05:30
Damian Ujma	98d73b7200	PRODSEC-6261 Fix workflow api bola - Backporting (#1206 ) * PRODSEC-6261 Add 'shouldNotGetProcessesByNotInvolvedUser' test * PRODSEC-6261 Add user validation to 'getProcess' method * PRODSEC-6261 Add TestRail annotation minor fix	2022-07-12 13:12:15 +02:00
Travis CI User	acd4b1efcb	[maven-release-plugin][skip ci] prepare for next development iteration	2022-05-18 09:14:26 +00:00
Travis CI User	4433dd009a	[maven-release-plugin][skip ci] prepare release 15.5	2022-05-18 09:14:23 +00:00
mikolajbrzezinski	d1a9794ec8	MTN-22905 Fix case sensitivity issues on people search MTN-22905 Fix case sensitivity issues on people search backport * useCQ = true * useCQ back to original * useCQ = true * Copyright Update * useCQ restored, Javascrpit changed * Javascript changes to filter * PR comments requested change * Revert "PR comments requested change" This reverts commit `0673b6c3ff`. * Revert "useCQ restored, Javascrpit changed" This reverts commit `00b79b5aca`. * Revert "Copyright Update" This reverts commit `76d1f1c005`. * Revert "useCQ = true" This reverts commit `215ad952f5`. * Revert "useCQ back to original" This reverts commit `deb5e82218`. * Revert "useCQ = true" This reverts commit `115910ffc1`. * test change * Initial changes * Further changes * Space deleted * jobtitle search * Restore check sorting and mock * Avoid null [hint:useCQ] * Wrong sign * Fix * Clean up * Initial changes * Rename Method (cherry picked from commit `1ccb8a2164`)	2022-05-18 10:27:53 +02:00
alandavis	bf848ff882	Revert "ACS-2864 Use maven props in AGS test version.properties so we don't have to update the value" And correct the value to 2.7.1 This reverts commit `69ebccfc20`.	2022-05-09 17:13:19 +01:00
alandavis	69ebccfc20	ACS-2864 Use maven props in AGS test version.properties so we don't have to update the value (cherry picked from commit `4a4bb2de02`) (cherry picked from commit `b36e21ad04`)	2022-05-09 16:24:02 +01:00
Travis CI User	600b50fce1	[maven-release-plugin][skip ci] prepare for next development iteration	2022-05-03 10:25:04 +00:00
Travis CI User	37e8586658	[maven-release-plugin][skip ci] prepare release 15.4	2022-05-03 10:25:01 +00:00
evasques	4b12ed5a51	MNT-22968 - Bump Freemarker (#1094 )	2022-05-03 08:41:14 +01:00
Travis CI User	e379b7704d	[maven-release-plugin][skip ci] prepare for next development iteration	2022-04-07 16:28:45 +00:00
Travis CI User	297be122a6	[maven-release-plugin][skip ci] prepare release 15.3	2022-04-07 16:28:42 +00:00
Vítor Moreira	ca28024ad8	Fix/mnt 22946 spring rce databind jdk9 72 n (#1055 ) * Bump dependency.webscripts.version from 8.28 to 8.29 (#1052) (cherry picked from commit `22a0343c41`) * MNT-22946: bump spring version to 5.3.18 (#1054) (cherry picked from commit `53777cd5b9`) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-04-07 16:40:27 +01:00
Travis CI User	cfd3255aa7	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-21 18:14:39 +00:00
Travis CI User	4e436160cc	[maven-release-plugin][skip ci] prepare release 15.2	2022-03-21 18:14:36 +00:00
alandavis	bf0ca4ca83	Set acs.version.revision versions 7.2.1	2022-03-21 17:09:20 +00:00
Travis CI User	e23a97960f	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-21 11:23:53 +00:00
Travis CI User	2d2371a792	[maven-release-plugin][skip ci] prepare release 15.1	2022-03-21 11:23:50 +00:00
alandavis	0ea69dd4ef	Create release/7.2.N branch	2022-03-21 10:11:14 +00:00