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

SearchParameters - added trackTotalHits (int) attribute
SearchRequest - Added trackTotalHitsLimit (int) to the Limits attribute and mapped it to the SearchParameters
Changed the SearchRequest model in TAS to include a new RestRequestLimitsModel that has the new trackTotalHitsLimit attribute
SearchMapperTests to test the changes in the SearchParameters

(cherry picked from commit a1faf97fc5)

.github/workflows/ci.yml

@@ -65,21 +65,7 @@ jobs:
           srcclr-api-token: ${{ secrets.SRCCLR_API_TOKEN }}
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
-
-  pmd_scan:
-    name: "PMD Scan"
-    runs-on: ubuntu-latest
-    needs: [prepare]
-    if: >
-      github.event_name == 'pull_request' &&
-      !contains(github.event.head_commit.message, '[skip pmd]') &&
-      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
-    steps:
-      - uses: Alfresco/alfresco-build-tools/.github/actions/pmd@v2.5.0
-        with:
-          fail-on-new-issues: "false"
-
+        
   all_unit_tests_suite:
     name: "Core, Data-Model, Repository - AllUnitTestsSuite - Build and test"
     runs-on: ubuntu-latest
@@ -561,27 +547,3 @@ jobs:
           aws s3 cp --acl private ./amps/ags/rm-automation/rm-automation-community-rest-api/target/reports/rm-automation-community-rest-api.log s3://ags-travis-artifacts/community/${{ github.run_number }}/AGS-Community-Rest-API-Tests/rm-automation-community-rest-api.log
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
-
-  ags_start_api_explorer:
-    name: "Test Tomcat deployment of api explorer"
-    runs-on: ubuntu-latest
-    needs: [ prepare ]
-    if: >
-      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) &&
-      !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]')
-    steps:
-      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
-      - name: "Build"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: |
-          bash ./scripts/ci/init.sh
-          bash ./scripts/ci/build.sh
-      - name: "Test Tomcat deployment"
-        run: |
-          mvn verify -Pags,start-api-explorer -DskipTests &
-          ${{ env.TAS_SCRIPTS }}/wait-for-alfresco-start.sh "http://localhost:8085/api-explorer"

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.1.0.155</version>
+      <version>21.7</version>
    </parent>
 
    <modules>

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.155</version>
+      <version>21.7</version>
    </parent>
 
    <modules>

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.155</version>
+      <version>21.7</version>
    </parent>
 
    <build>
@@ -82,7 +82,7 @@
       <dependency>
          <groupId>com.github.docker-java</groupId>
          <artifactId>docker-java</artifactId>
-         <version>3.3.0</version>
+         <version>3.2.13</version>
       </dependency>
    </dependencies>
 </project>

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java

@@ -512,12 +512,7 @@ public abstract class BaseAPI
         try
         {
             HttpResponse httpResponse = doRequestJson(HttpPost.class, requestUrl, adminUser, adminPassword, requestParams);
-            if (httpResponse.getStatusLine().getStatusCode() != expectedStatusCode)
-            {
-                // It's only possible to stream the response body once, so ensure we only do this if the test has failed.
-                JSONObject responseJson = responseBodyToJson(httpResponse);
-                assertEquals("POST request to " + requestUrl + " was not successful. Response: " + responseJson, expectedStatusCode, httpResponse.getStatusLine().getStatusCode());
-            }
+            assertEquals("POST request to " + requestUrl + " was not successful.", expectedStatusCode, httpResponse.getStatusLine().getStatusCode());
             return httpResponse;
         }
         catch (InstantiationException | IllegalAccessException error)
@@ -526,32 +521,6 @@ public abstract class BaseAPI
         }
     }
 
-    /**
-     * Try to convert the response body to a JSON object.
-     *
-     * @param response The response.
-     * @return The JSON object or null if it was not possible to convert the response.
-     */
-    private JSONObject responseBodyToJson(HttpResponse response)
-    {
-        try
-        {
-            try
-            {
-                return new JSONObject(EntityUtils.toString(response.getEntity()));
-            }
-            catch (JSONException error)
-            {
-                LOGGER.error("Converting message body to JSON failed. Body: {}", response.getEntity().getContent(), error);
-            }
-        }
-        catch (ParseException | IOException error)
-        {
-            LOGGER.error("Parsing message body failed.", error);
-        }
-        return null;
-    }
-
     /**
      * Helper method for handling generic HTTP requests
      * @param requestType request type (a subclass of {@link HttpRequestBase})
@@ -589,7 +558,18 @@ public abstract class BaseAPI
             HttpResponse response = client.execute(adminUser, adminPassword, request);
             LOGGER.info("Response: {}", response.getStatusLine());
 
-            responseBody = responseBodyToJson(response);
+            try
+            {
+                responseBody = new JSONObject(EntityUtils.toString(response.getEntity()));
+            }
+            catch (JSONException error)
+            {
+                LOGGER.error("Converting message body to JSON failed. Body: {}", responseBody, error);
+            }
+            catch (ParseException | IOException error)
+            {
+                LOGGER.error("Parsing message body failed.", error);
+            }
 
             switch (response.getStatusLine().getStatusCode())
             {

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.155</version>
+      <version>21.7</version>
    </parent>
 
    <modules>

amps/ags/rm-community/rm-community-repo/.env

@@ -1,3 +1,3 @@
 SOLR6_TAG=2.0.7-A5
 POSTGRES_TAG=14.4
-ACTIVEMQ_TAG=5.17.4-jre17-rockylinux8
+ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8

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.155</version>
+      <version>21.7</version>
    </parent>
 
    <properties>
@@ -436,7 +436,7 @@
                            </run>
                         </image>
                         <image>
-                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre17-rockylinux8</name>
+                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre11-rockylinux8</name>
                            <run>
                               <ports>
                                  <port>${activemq.port1}:${activemq.port1}</port>
@@ -507,7 +507,7 @@
                            </run>
                         </image>
                         <image>
-                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre17-rockylinux8</name>
+                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre11-rockylinux8</name>
                            <run>
                               <ports>
                                  <port>${activemq.port1}:${activemq.port1}</port>

amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties

@@ -3,9 +3,9 @@
 #
 
 # Version label
-version.major=23
-version.minor=1
-version.revision=0
+version.major=7
+version.minor=4
+version.revision=1
 version.label=
 
 # Edition label

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.155</version>
+        <version>21.7</version>
     </parent>
 
     <build>
@@ -36,40 +36,24 @@
          <id>start-api-explorer</id>
          <build>
             <plugins>
-                <plugin>
-                    <groupId>org.codehaus.cargo</groupId>
-                    <artifactId>cargo-maven3-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>run-war</id>
-                            <phase>verify</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                    <configuration>
-                        <container>
-                            <containerId>tomcat9x</containerId>
-                            <type>embedded</type>
-                            <log>target/cargo.log</log>
-                        </container>
-                        <configuration>
-                            <properties>
-                                <cargo.servlet.port>8085</cargo.servlet.port>
-                            </properties>
-                        </configuration>
-                        <deployables>
-                            <deployable>
-                                <type>war</type>
-                                <properties>
-                                    <context>/api-explorer</context>
-                                </properties>
-                                <pingURL>http://localhost:8085/api-explorer</pingURL>
-                            </deployable>
-                        </deployables>
-                    </configuration>
-                </plugin>
+               <plugin>
+                  <groupId>org.apache.tomcat.maven</groupId>
+                  <artifactId>tomcat7-maven-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>run-war</id>
+                        <goals>
+                           <goal>run-war</goal>
+                        </goals>
+                        <phase>verify</phase>
+                     </execution>
+                  </executions>
+                  <configuration>
+                     <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
+                     <path>/api-explorer</path>
+                     <port>8085</port>
+                  </configuration>
+               </plugin>
             </plugins>
          </build>
       </profile>

amps/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.155</version>
+        <version>21.7</version>
     </parent>
 
     <modules>

amps/share-services/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>23.1.0.155</version>
+        <version>21.7</version>
     </parent>
 
     <properties>

amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js

@@ -23,10 +23,6 @@ function runAction(p_params)
       if (p_params.destNode.hasAspect("cm:lockable") && !p_params.destNode.hasAspect("trx:transferred"))
       {
          p_params.destNode.unlock();
-         if(p_params.destNode.hasAspect("gd2:editingInGoogle"))
-         {
-             p_params.destNode.removeAspect("gd2:editingInGoogle");
-         }
       }
 
       var resultId = originalDoc.name,

core/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>23.1.0.155</version>
+      <version>21.7</version>
    </parent>
 
    <dependencies>

data-model/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.155</version>
+        <version>21.7</version>
     </parent>
 
     <properties>
@@ -119,7 +119,7 @@
         <dependency>
             <groupId>org.jibx</groupId>
             <artifactId>jibx-run</artifactId>
-            <version>1.4.2</version>
+            <version>1.3.3</version>
         </dependency>
         <dependency> 
             <groupId>com.fasterxml.jackson.core</groupId> 
@@ -134,7 +134,7 @@
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
             <artifactId>woodstox-core</artifactId>
-            <version>6.5.1</version>
+            <version>6.4.0</version>
         </dependency>
 
         <!-- the cxf libs were updated, see dependencyManagement section -->

data-model/src/main/java/org/alfresco/service/cmr/search/SearchParameters.java

@@ -201,6 +201,11 @@ public class SearchParameters implements BasicSearchParameters
 
     private String timezone;
     
+    /**
+     * Configure the limit to track the total hits on search results
+     */
+    private int trackTotalHits;
+
     /**
      * Default constructor
      */
@@ -251,6 +256,7 @@ public class SearchParameters implements BasicSearchParameters
         sp.stats = this.stats;
         sp.ranges = this.ranges;
         sp.timezone = this.timezone;
+        sp.trackTotalHits = this.trackTotalHits;
         return sp;
     }
     
@@ -1641,6 +1647,21 @@ public class SearchParameters implements BasicSearchParameters
     {
         this.includeMetadata = includeMetadata;
     }
-    
+
+    public int getTrackTotalHits()
+    {
+        return trackTotalHits;
+    }
+
+    /**
+     * Set a maximum value for the report of total hits. The reported number of hits will never exceed this limit even
+     * if more are found. If unset, the engine’s default tracking limit is applied. To remove any limit, set to -1.
+     *
+     * @param trackTotalHits int
+     */
+    public void setTrackTotalHits(int trackTotalHits)
+    {
+        this.trackTotalHits = trackTotalHits;
+    }
 
 }

mmt/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.155</version>
+        <version>21.7</version>
     </parent>
 
     <dependencies>

packaging/distribution/pom.xml

@@ -9,6 +9,6 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.155</version>
+        <version>21.7</version>
     </parent>
 </project>

packaging/docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.155</version>
+        <version>21.7</version>
     </parent>
 
     <properties>

packaging/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.155</version>
+        <version>21.7</version>
     </parent>
 
     <modules>

packaging/tests/environment/.env

@@ -1,3 +1,3 @@
 SOLR6_TAG=2.0.7-A5
 POSTGRES_TAG=14.4
-ACTIVEMQ_TAG=5.17.4-jre17-rockylinux8
+ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8

packaging/tests/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.155</version>
+        <version>21.7</version>
     </parent>
 
     <modules>

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.155</version>
+        <version>21.7</version>
     </parent>
 
     <organization>
@@ -16,12 +16,12 @@
     </organization>
 
     <properties>
-        <maven.build.sourceVersion>17</maven.build.sourceVersion>
+        <maven.build.sourceVersion>11</maven.build.sourceVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <chemistry-opencmis-commons-api>1.1.0</chemistry-opencmis-commons-api>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <maven-release.version>2.5.3</maven-release.version>
-        <java.version>17</java.version>
+        <java.version>11</java.version>
         <suiteXmlFile>${project.basedir}/src/test/resources/cmis-suite.xml</suiteXmlFile>
         <cmis.binding />
         <cmis.basePath />
@@ -58,6 +58,12 @@
     </profiles>
 
     <dependencies>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jackson2-provider</artifactId>
+            <version>4.7.1.Final</version>
+        </dependency>
+
         <!-- alfresco tester settings -->
         <dependency>
             <groupId>org.alfresco.tas</groupId>

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.155</version>
+        <version>21.7</version>
     </parent>
 
     <developers>

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.155</version>
+        <version>21.7</version>
     </parent>
 
     <developers>

packaging/tests/tas-restapi/pom.xml

@@ -8,19 +8,20 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.155</version>
+        <version>21.7</version>
     </parent>
 
     <properties>
         <suiteXmlFile>${project.basedir}/src/test/resources/restapi-suite.xml</suiteXmlFile>
-        <maven.build.sourceVersion>17</maven.build.sourceVersion>
+        <maven.build.sourceVersion>11</maven.build.sourceVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <rest.api.explorer.branch>master</rest.api.explorer.branch>
         <httpclient-osgi-version>4.5.6</httpclient-osgi-version>
         <org.glassfish.version>1.1.4</org.glassfish.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
-        <scribejava-apis.version>8.3.3</scribejava-apis.version>
-        <java.version>17</java.version>
+        <scribejava-apis.version>8.3.1</scribejava-apis.version>
+        <license-maven-plugin.version>2.0.1.alfresco-2</license-maven-plugin.version>
+        <java.version>11</java.version>
     </properties>
 
     <profiles>
@@ -84,13 +85,6 @@
             <version>${commons-lang3.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${dependency.awaitility.version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <!-- REST ASSURED -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -171,14 +165,14 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy</artifactId>
-            <version>3.0.17</version>
+            <version>3.0.16</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-json-->
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-json</artifactId>
-            <version>3.0.17</version>
+            <version>3.0.16</version>
         </dependency>
 
        <dependency>

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestDefaultsModel.java

@@ -1,190 +0,0 @@
-package org.alfresco.rest.search;
-
-import java.util.List;
-import java.util.Objects;
-
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.utility.model.TestModel;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * Generated by 'krystian' on '2023-06-12 18:46' from 'Alfresco Content Services REST API' swagger file 
- * Generated from 'Alfresco Content Services REST API' swagger file
- * Base Path {@linkplain /alfresco/api/-default-/public/search/versions/1}
- */
-public class RestRequestDefaultsModel extends TestModel implements IRestModel<RestRequestDefaultsModel>
-{
-    @JsonProperty(value = "entry")
-    RestRequestDefaultsModel model;
-
-    @Override
-    public RestRequestDefaultsModel onModel()
-    {
-        return model;
-    }
-
-    /**
-    A list of query fields/properties used to expand TEXT: queries.
-The default is cm:content.
-You could include all content properties using d:content or list all individual content properties or types.
-As more terms are included the query size, complexity, memory impact and query time will increase.
-
-    */	        
-
-    private List<String> textAttributes;	    
-    /**
-    The default way to combine query parts when AND or OR is not explicitly stated - includes ! - +
-one two three
-(one two three)
-
-    */	        
-
-    private String defaultFTSOperator;	    
-    /**
-    The default way to combine query parts in field query groups when AND or OR is not explicitly stated - includes ! - +
-FIELD:(one two three)
-
-    */	        
-
-    private String defaultFTSFieldOperator;	    
-    /**
-    The default name space to use if one is not provided
-    */	        
-
-    private String namespace;	    
-
-    private String defaultFieldName;	    
-
-    public List<String> getTextAttributes()
-    {
-        return this.textAttributes;
-    }
-
-    public void setTextAttributes(List<String> textAttributes)
-    {
-        this.textAttributes = textAttributes;
-    }				
-
-    public String getDefaultFTSOperator()
-    {
-        return this.defaultFTSOperator;
-    }
-
-    public void setDefaultFTSOperator(String defaultFTSOperator)
-    {
-        this.defaultFTSOperator = defaultFTSOperator;
-    }				
-
-    public String getDefaultFTSFieldOperator()
-    {
-        return this.defaultFTSFieldOperator;
-    }
-
-    public void setDefaultFTSFieldOperator(String defaultFTSFieldOperator)
-    {
-        this.defaultFTSFieldOperator = defaultFTSFieldOperator;
-    }				
-
-    public String getNamespace()
-    {
-        return this.namespace;
-    }
-
-    public void setNamespace(String namespace)
-    {
-        this.namespace = namespace;
-    }				
-
-    public String getDefaultFieldName()
-    {
-        return this.defaultFieldName;
-    }
-
-    public void setDefaultFieldName(String defaultFieldName)
-    {
-        this.defaultFieldName = defaultFieldName;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "RestRequestDefaultsModel{" + "textAttributes=" + textAttributes + ", defaultFTSOperator='" + defaultFTSOperator + '\'' + ", defaultFTSFieldOperator='"
-            + defaultFTSFieldOperator + '\'' + ", namespace='" + namespace + '\'' + ", defaultFieldName='" + defaultFieldName + '\'' + '}';
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-        RestRequestDefaultsModel that = (RestRequestDefaultsModel) o;
-        return Objects.equals(textAttributes, that.textAttributes) && Objects.equals(defaultFTSOperator, that.defaultFTSOperator) && Objects.equals(
-            defaultFTSFieldOperator, that.defaultFTSFieldOperator) && Objects.equals(namespace, that.namespace) && Objects.equals(defaultFieldName, that.defaultFieldName);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(textAttributes, defaultFTSOperator, defaultFTSFieldOperator, namespace, defaultFieldName);
-    }
-
-    public static Builder builder()
-    {
-        return new Builder();
-    }
-
-    public static class Builder
-    {
-        private List<String> textAttributes;
-        private String defaultFTSOperator;
-        private String defaultFTSFieldOperator;
-        private String namespace;
-        private String defaultFieldName;
-
-        public Builder textAttributes(List<String> textAttributes)
-        {
-            this.textAttributes = textAttributes;
-            return this;
-        }
-
-        public Builder defaultFTSOperator(String defaultFTSOperator)
-        {
-            this.defaultFTSOperator = defaultFTSOperator;
-            return this;
-        }
-
-        public Builder defaultFTSFieldOperator(String defaultFTSFieldOperator)
-        {
-            this.defaultFTSFieldOperator = defaultFTSFieldOperator;
-            return this;
-        }
-
-        public Builder namespace(String namespace)
-        {
-            this.namespace = namespace;
-            return this;
-        }
-
-        public Builder defaultFieldName(String defaultFieldName)
-        {
-            this.defaultFieldName = defaultFieldName;
-            return this;
-        }
-
-        public RestRequestDefaultsModel create()
-        {
-            RestRequestDefaultsModel defaults = new RestRequestDefaultsModel();
-            defaults.setTextAttributes(this.textAttributes);
-            defaults.setDefaultFTSOperator(this.defaultFTSOperator);
-            defaults.setDefaultFTSFieldOperator(this.defaultFTSFieldOperator);
-            defaults.setNamespace(this.namespace);
-            defaults.setDefaultFieldName(this.defaultFieldName);
-
-            return defaults;
-        }
-    }
-}
- 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestLimitsModel.java

@@ -0,0 +1,82 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * 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 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.search;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class RestRequestLimitsModel extends TestModel implements IRestModel<RestRequestLimitsModel>
+{
+    @JsonProperty
+    RestRequestLimitsModel model;
+
+    private Integer permissionEvaluationTime;
+    private Integer permissionEvaluationCount;
+    private Integer trackTotalHitsLimit;
+
+    @Override
+    public RestRequestLimitsModel onModel()
+    {
+        return model;
+    }
+    
+    public RestRequestLimitsModel(Integer permissionEvaluationTime, Integer permissionEvaluationCount,
+            Integer trackTotalHitsLimit)
+    {
+        super();
+        this.permissionEvaluationTime = permissionEvaluationTime;
+        this.permissionEvaluationCount = permissionEvaluationCount;
+        this.trackTotalHitsLimit = trackTotalHitsLimit;
+    }
+
+    public Integer getPermissionEvaluationTime()
+    {
+        return permissionEvaluationTime;
+    }
+    public void setPermissionEvaluationTime(Integer permissionEvaluationTime)
+    {
+        this.permissionEvaluationTime = permissionEvaluationTime;
+    }
+    public Integer getPermissionEvaluationCount()
+    {
+        return permissionEvaluationCount;
+    }
+    public void setPermissionEvaluationCount(Integer permissionEvaluationCount)
+    {
+        this.permissionEvaluationCount = permissionEvaluationCount;
+    }
+    public Integer getTrackTotalHitsLimit()
+    {
+        return trackTotalHitsLimit;
+    }
+    public void setTrackTotalHitsLimit(Integer trackTotalHitsLimit)
+    {
+        this.trackTotalHitsLimit = trackTotalHitsLimit;
+    }
+}
+ 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestTemplatesModel.java

@@ -1,105 +0,0 @@
-package org.alfresco.rest.search;
-
-import java.util.Objects;
-
-import org.alfresco.rest.core.IRestModel;
-import org.alfresco.utility.model.TestModel;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * Generated by 'krystian' on '2023-06-12 18:46' from 'Alfresco Content Services REST API' swagger file 
- * Generated from 'Alfresco Content Services REST API' swagger file
- * Base Path {@linkplain /alfresco/api/-default-/public/search/versions/1}
- */
-public class RestRequestTemplatesModel extends TestModel implements IRestModel<RestRequestTemplatesModel>
-{
-    @JsonProperty(value = "entry")
-    RestRequestTemplatesModel model;
-
-    @Override
-    public RestRequestTemplatesModel onModel()
-    {
-        return model;
-    }
-
-    private String name;
-
-    private String template;
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    public String getTemplate()
-    {
-        return template;
-    }
-
-    public void setTemplate(String template)
-    {
-        this.template = template;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "RestRequestTemplatesModel{" + "name='" + name + '\'' + ", template='" + template + '\'' + '}';
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-        RestRequestTemplatesModel that = (RestRequestTemplatesModel) o;
-        return Objects.equals(name, that.name) && Objects.equals(template, that.template);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(name, template);
-    }
-
-    public static Builder builder()
-    {
-        return new Builder();
-    }
-
-    public static class Builder
-    {
-        private String name;
-        private String template;
-
-        public Builder name(String name)
-        {
-            this.name = name;
-            return this;
-        }
-
-        public Builder template(String template)
-        {
-            this.template = template;
-            return this;
-        }
-
-        public RestRequestTemplatesModel create()
-        {
-            RestRequestTemplatesModel template = new RestRequestTemplatesModel();
-            template.setName(this.name);
-            template.setTemplate(this.template);
-
-            return template;
-        }
-    }
-}
- 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/SearchRequest.java

@@ -43,15 +43,14 @@
  */
 package org.alfresco.rest.search;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import org.alfresco.rest.model.RestRequestRangesModel;
 import org.alfresco.rest.model.RestRequestSpellcheckModel;
 import org.alfresco.utility.model.TestModel;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Search Query object.
  * @author msuzuki
@@ -77,8 +76,7 @@ public class SearchRequest extends TestModel
     String facetFormat;
     List<String> include;
     List<SortClause> sort;
-    RestRequestDefaultsModel defaults;
-    List<RestRequestTemplatesModel> templates;
+    RestRequestLimitsModel limits;
 
     public SearchRequest()
     {
@@ -258,26 +256,6 @@ public class SearchRequest extends TestModel
         this.fields = fields;
     }
 
-    public RestRequestDefaultsModel getDefaults()
-    {
-        return defaults;
-    }
-
-    public void setDefaults(RestRequestDefaultsModel defaults)
-    {
-        this.defaults = defaults;
-    }
-
-    public List<RestRequestTemplatesModel> getTemplates()
-    {
-        return templates;
-    }
-
-    public void setTemplates(List<RestRequestTemplatesModel> templates)
-    {
-        this.templates = templates;
-    }
-
     public List<SortClause> getSort()
     {
         if (sort == null)
@@ -302,4 +280,15 @@ public class SearchRequest extends TestModel
 
         return this;
     }
+
+    public RestRequestLimitsModel getLimits()
+    {
+        return limits;
+    }
+
+    public void setLimits(RestRequestLimitsModel limits)
+    {
+        this.limits = limits;
+    }
+
 }

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/RenditionIntegrationTests.java

@@ -1,7 +1,5 @@
 package org.alfresco.rest.renditions;
 
-import java.time.Duration;
-import com.google.common.base.Predicates;
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.core.RestResponse;
 import org.alfresco.rest.model.RestNodeModel;
@@ -10,8 +8,6 @@ import org.alfresco.utility.model.FileModel;
 import org.alfresco.utility.model.FolderModel;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.UserModel;
-import org.awaitility.Awaitility;
-import org.awaitility.Durations;
 import org.springframework.http.HttpStatus;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
@@ -72,23 +68,15 @@ public abstract class RenditionIntegrationTests extends RestTest
      */
     protected RestNodeModel uploadFile(String sourceFile) throws Exception
     {
-        FolderModel folder = Awaitility
-            .await()
-            .atMost(Duration.ofSeconds(30))
-            .pollInterval(Durations.ONE_SECOND)
-            .ignoreExceptions()
-            .until(() -> {
-                FolderModel randomFolderModel = FolderModel.getRandomFolderModel();
-                return dataContent.usingUser(user).usingSite(site).createFolder(randomFolderModel);
-            }, Predicates.notNull());
+        FolderModel folder = FolderModel.getRandomFolderModel();
+        folder = dataContent.usingUser(user).usingSite(site).createFolder(folder);
         restClient.authenticateUser(user).configureRequestSpec()
-            .addMultiPart("filedata", Utility.getResourceTestDataFile(sourceFile));
+                .addMultiPart("filedata", Utility.getResourceTestDataFile(sourceFile));
         RestNodeModel fileNode = restClient.authenticateUser(user).withCoreAPI().usingNode(folder).createNode();
 
         Assert.assertEquals(Integer.valueOf(restClient.getStatusCode()).intValue(), HttpStatus.CREATED.value(),
-            "Failed to created a node for rendition tests using file " + sourceFile);
+                "Failed to created a node for rendition tests using file " + sourceFile);
 
         return fileNode;
     }
-
 }

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.155</version>
+        <version>21.7</version>
     </parent>
 
     <developers>

packaging/war/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.155</version>
+        <version>21.7</version>
     </parent>
 
     <properties>
@@ -30,6 +30,10 @@
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-trashcan-cleaner</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.alfresco.services</groupId>
+            <artifactId>alfresco-messaging-repo</artifactId>
+        </dependency>
         <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
@@ -136,7 +140,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>

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.155</version>
+    <version>21.7</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -23,9 +23,9 @@
     </modules>
 
     <properties>
-        <acs.version.major>23</acs.version.major>
-        <acs.version.minor>1</acs.version.minor>
-        <acs.version.revision>0</acs.version.revision>
+        <acs.version.major>7</acs.version.major>
+        <acs.version.minor>4</acs.version.minor>
+        <acs.version.revision>1</acs.version.revision>
         <acs.version.label />
         <amp.min.version>${acs.version.major}.0.0</amp.min.version>
 
@@ -38,45 +38,46 @@
         <builder.name>entitled-builder</builder.name>
         <local.registry>127.0.0.1:5000</local.registry>
 
-        <java.version>17</java.version>
+        <java.version>11</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven.build.sourceVersion>${java.version}</maven.build.sourceVersion>
 
         <dir.root>${project.build.directory}/alf_data</dir.root>
 
-        <dependency.alfresco-hb-data-sender.version>1.1.1</dependency.alfresco-hb-data-sender.version>
-        <dependency.alfresco-trashcan-cleaner.version>2.4.2</dependency.alfresco-trashcan-cleaner.version>
-        <dependency.alfresco-jlan.version>7.5</dependency.alfresco-jlan.version>
+        <dependency.alfresco-hb-data-sender.version>1.0.12</dependency.alfresco-hb-data-sender.version>
+        <dependency.alfresco-trashcan-cleaner.version>2.4.1</dependency.alfresco-trashcan-cleaner.version>
+        <dependency.alfresco-jlan.version>7.4</dependency.alfresco-jlan.version>
         <dependency.alfresco-server-root.version>6.0.1</dependency.alfresco-server-root.version>
+        <dependency.alfresco-messaging-repo.version>1.2.20</dependency.alfresco-messaging-repo.version>
         <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
         <dependency.activiti.version>5.23.0</dependency.activiti.version>
-        <dependency.alfresco-transform-service.version>3.0.0</dependency.alfresco-transform-service.version>
-        <dependency.alfresco-transform-core.version>4.0.0</dependency.alfresco-transform-core.version>
-        <dependency.alfresco-greenmail.version>6.9</dependency.alfresco-greenmail.version>
-        <dependency.acs-event-model.version>0.0.22</dependency.acs-event-model.version>
+        <dependency.alfresco-transform-service.version>2.1.0</dependency.alfresco-transform-service.version>
+        <dependency.alfresco-transform-core.version>3.1.0</dependency.alfresco-transform-core.version>
+        <dependency.alfresco-greenmail.version>6.5</dependency.alfresco-greenmail.version>
+        <dependency.acs-event-model.version>0.0.18</dependency.acs-event-model.version>
 
         <dependency.spring.version>5.3.27</dependency.spring.version>
         <dependency.antlr.version>3.5.3</dependency.antlr.version>
-        <dependency.jackson.version>2.15.1</dependency.jackson.version>
+        <dependency.jackson.version>2.15.0-rc1</dependency.jackson.version>
         <dependency.cxf.version>3.5.5</dependency.cxf.version>
         <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
         <dependency.webscripts.version>8.44</dependency.webscripts.version>
         <dependency.bouncycastle.version>1.70</dependency.bouncycastle.version>
         <dependency.mockito-core.version>4.9.0</dependency.mockito-core.version>
         <dependency.assertj.version>3.24.2</dependency.assertj.version>
-        <dependency.org-json.version>20230618</dependency.org-json.version>
+        <dependency.org-json.version>20230227</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.9</dependency.gson.version>
         <dependency.httpclient.version>4.5.13</dependency.httpclient.version>
-        <dependency.httpcore.version>4.4.16</dependency.httpcore.version>
+        <dependency.httpcore.version>4.4.15</dependency.httpcore.version>
         <dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
         <dependency.xercesImpl.version>2.12.2</dependency.xercesImpl.version>
-        <dependency.slf4j.version>2.0.7</dependency.slf4j.version>
-        <dependency.log4j.version>2.20.0</dependency.log4j.version>
-        <dependency.gytheio.version>0.20.0-A1</dependency.gytheio.version>
-        <dependency.groovy.version>3.0.17</dependency.groovy.version>
+        <dependency.slf4j.version>2.0.3</dependency.slf4j.version>
+        <dependency.log4j.version>2.19.0</dependency.log4j.version>
+        <dependency.gytheio.version>0.18</dependency.gytheio.version>
+        <dependency.groovy.version>3.0.16</dependency.groovy.version>
         <dependency.tika.version>2.4.1</dependency.tika.version>
         <dependency.spring-security.version>5.8.3</dependency.spring-security.version>
         <dependency.truezip.version>7.7.10</dependency.truezip.version>
@@ -88,11 +89,11 @@
         <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.activemq.version>5.17.4</dependency.activemq.version>
-        <dependency.apache-compress.version>1.23.0</dependency.apache-compress.version>
+        <dependency.apache-compress.version>1.22</dependency.apache-compress.version>
         <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
         <dependency.awaitility.version>4.2.0</dependency.awaitility.version>
         <dependency.swagger-ui.version>3.38.0</dependency.swagger-ui.version>
-        <dependency.swagger-parser.version>1.0.66</dependency.swagger-parser.version>
+        <dependency.swagger-parser.version>1.0.63</dependency.swagger-parser.version>
         <dependency.maven-filtering.version>3.1.1</dependency.maven-filtering.version>
         <dependency.maven-artifact.version>3.8.6</dependency.maven-artifact.version>
         <dependency.jdom2.version>2.0.6.1</dependency.jdom2.version>
@@ -107,25 +108,25 @@
         <dependency.jakarta-mail-api.version>1.6.5</dependency.jakarta-mail-api.version>
         <dependency.jakarta-json-api.version>1.1.6</dependency.jakarta-json-api.version>
         <dependency.jakarta-json-path.version>2.8.0</dependency.jakarta-json-path.version>
-        <dependency.json-smart.version>2.4.11</dependency.json-smart.version>
+        <dependency.json-smart.version>2.4.10</dependency.json-smart.version>
         <dependency.jakarta-rpc-api.version>1.1.4</dependency.jakarta-rpc-api.version>
 
-        <alfresco.googledrive.version>3.4.1</alfresco.googledrive.version>
-        <alfresco.aos-module.version>1.6.1</alfresco.aos-module.version>
-        <alfresco.api-explorer.version>23.1.0-A1</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
+        <alfresco.googledrive.version>3.4.0</alfresco.googledrive.version>
+        <alfresco.aos-module.version>1.6.0</alfresco.aos-module.version>
+        <alfresco.api-explorer.version>7.3.0</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</license-maven-plugin.version>
+        <license-maven-plugin.version>2.0.1.alfresco-2</license-maven-plugin.version>
 
-        <dependency.postgresql.version>42.6.0</dependency.postgresql.version>
+        <dependency.postgresql.version>42.5.2</dependency.postgresql.version>
         <dependency.mysql.version>8.0.30</dependency.mysql.version>
         <dependency.mysql-image.version>8</dependency.mysql-image.version>
         <dependency.mariadb.version>2.7.4</dependency.mariadb.version>
-        <dependency.tas-utility.version>4.0.4</dependency.tas-utility.version>
-        <dependency.rest-assured.version>5.3.1</dependency.rest-assured.version>
-        <dependency.tas-email.version>1.21</dependency.tas-email.version>
-        <dependency.tas-webdav.version>1.16</dependency.tas-webdav.version>
-        <dependency.tas-ftp.version>1.17</dependency.tas-ftp.version>
+        <dependency.tas-utility.version>4.0.0</dependency.tas-utility.version>
+        <dependency.rest-assured.version>5.2.0</dependency.rest-assured.version>
+        <dependency.tas-email.version>1.11</dependency.tas-email.version>
+        <dependency.tas-webdav.version>1.7</dependency.tas-webdav.version>
+        <dependency.tas-ftp.version>1.7</dependency.tas-ftp.version>
         <dependency.tas-dataprep.version>2.6</dependency.tas-dataprep.version>
 
         <!-- AGS properties shared between community and enterprise -->
@@ -149,7 +150,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>23.1.0.155</tag>
+        <tag>21.7</tag>
     </scm>
 
     <distributionManagement>
@@ -296,6 +297,17 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.alfresco.services</groupId>
+                <artifactId>alfresco-messaging-repo</artifactId>
+                <version>${dependency.alfresco-messaging-repo.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.activemq</groupId>
+                        <artifactId>activemq-broker</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-server-root</artifactId>
@@ -645,7 +657,7 @@
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>
-                <version>1.16.1</version>
+                <version>1.15.3</version>
             </dependency>
             <!-- upgrade dependency from TIKA -->
             <dependency>
@@ -729,7 +741,7 @@
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>
-                <version>2.12.5</version>
+                <version>2.12.1</version>
             </dependency>
 
             <!-- provided dependencies -->
@@ -886,7 +898,7 @@
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.18.26</version>
+                <version>1.18.24</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -924,7 +936,7 @@
                 <plugin>
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.43.0</version>
+                    <version>0.42.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -945,21 +957,21 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.4.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.3.1</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.6.0</version>
+                    <version>3.4.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.alfresco.maven.plugin</groupId>
@@ -1003,11 +1015,6 @@
                         <skipDeploy>true</skipDeploy>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.codehaus.cargo</groupId>
-                    <artifactId>cargo-maven3-plugin</artifactId>
-                    <version>1.10.7</version>
-                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>

remote-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.155</version>
+        <version>21.7</version>
     </parent>
 
     <dependencies>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.apache.santuario</groupId>
             <artifactId>xmlsec</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.0</version>
         </dependency>
         <!-- newer version, see REPO-3133 -->
         <dependency>
@@ -130,7 +130,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>10.0.14</version>
+            <version>10.0.11</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -154,7 +154,7 @@
         <dependency>
             <groupId>org.alfresco.cmis.client</groupId>
             <artifactId>alfresco-opencmis-extension</artifactId>
-            <version>2.3</version>
+            <version>2.1</version>
             <scope>test</scope>
             <exclusions>
               <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->

remote-api/src/main/java/org/alfresco/rest/api/Categories.java

@@ -32,8 +32,10 @@ import java.util.List;
 
 import org.alfresco.rest.api.model.Category;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.StoreRef;
 
+@Experimental
 public interface Categories
 {
     Category getCategoryById(StoreRef storeRef, String id, Parameters parameters);

remote-api/src/main/java/org/alfresco/rest/api/Tags.java

@@ -32,6 +32,7 @@ import java.util.List;
 import org.alfresco.rest.api.model.Tag;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.StoreRef;
 
 public interface Tags
@@ -43,8 +44,10 @@ public interface Tags
     Tag changeTag(StoreRef storeRef, String tagId, Tag tag, Parameters parameters);
     CollectionWithPagingInfo<Tag> getTags(String nodeId, Parameters params);
 
+    @Experimental
     List<Tag> createTags(StoreRef storeRef, List<Tag> tags, Parameters parameters);
 
+    @Experimental
     default List<Tag> createTags(List<Tag> tags, Parameters parameters)
     {
         return createTags(STORE_REF_WORKSPACE_SPACESSTORE, tags, parameters);

remote-api/src/main/java/org/alfresco/rest/api/impl/CategoriesImpl.java

@@ -49,6 +49,7 @@ import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
 import org.alfresco.rest.framework.core.exceptions.InvalidNodeTypeException;
 import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
@@ -64,6 +65,7 @@ import org.alfresco.util.TypeConstraint;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
+@Experimental
 public class CategoriesImpl implements Categories
 {
     static final String INCLUDE_COUNT_PARAM = "count";

remote-api/src/main/java/org/alfresco/rest/api/impl/TagsImpl.java

@@ -36,6 +36,8 @@ import static org.alfresco.service.cmr.tagging.TaggingService.TAG_ROOT_NODE_REF;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -61,9 +63,12 @@ import org.alfresco.rest.framework.core.exceptions.UnsupportedResourceOperationE
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Paging;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.resource.parameters.SortColumn;
 import org.alfresco.rest.framework.resource.parameters.where.Query;
 import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
 import org.alfresco.rest.framework.resource.parameters.where.QueryImpl;
+import org.alfresco.service.Experimental;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
@@ -268,6 +273,7 @@ public class TagsImpl implements Tags
         return CollectionWithPagingInfo.asPaged(params.getPaging(), tags, results.hasMoreItems(), (totalItems == null ? null : totalItems.intValue()));
     }
 
+    @Experimental
     @Override
     public List<Tag> createTags(final StoreRef storeRef, final List<Tag> tags, final Parameters parameters)
     {

remote-api/src/main/java/org/alfresco/rest/api/search/impl/SearchMapper.java

@@ -823,6 +823,11 @@ public class SearchMapper
                 sp.setLimitBy(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS);
                 sp.setMaxPermissionCheckTimeMillis(limits.getPermissionEvaluationTime());
             }
+
+            if(limits.getTrackTotalHitsLimit() != null)
+            {
+                sp.setTrackTotalHits(limits.getTrackTotalHitsLimit());
+            }
         }
     }
 

remote-api/src/main/java/org/alfresco/rest/api/search/model/Limits.java

@@ -37,13 +37,16 @@ public class Limits
 
     private final Integer permissionEvaluationTime;
     private final Integer permissionEvaluationCount;
+    private final Integer trackTotalHitsLimit;
 
     @JsonCreator
     public Limits(@JsonProperty("permissionEvaluationTime") Integer permissionEvaluationTime,
-                  @JsonProperty("permissionEvaluationCount") Integer permissionEvaluationCount)
+                  @JsonProperty("permissionEvaluationCount") Integer permissionEvaluationCount,
+                  @JsonProperty("trackTotalHitsLimit") Integer trackTotalHitsLimit)
     {
         this.permissionEvaluationTime = permissionEvaluationTime;
         this.permissionEvaluationCount = permissionEvaluationCount;
+        this.trackTotalHitsLimit = trackTotalHitsLimit;
     }
 
     public Integer getPermissionEvaluationTime()
@@ -55,4 +58,9 @@ public class Limits
     {
         return permissionEvaluationCount;
     }
+
+    public Integer getTrackTotalHitsLimit()
+    {
+        return trackTotalHitsLimit;
+    }
 }

remote-api/src/main/java/org/alfresco/rest/api/tags/TagsEntityResource.java

@@ -36,6 +36,7 @@ import org.alfresco.rest.framework.resource.EntityResource;
 import org.alfresco.rest.framework.resource.actions.interfaces.EntityResourceAction;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.util.ParameterCheck;
 import org.springframework.beans.factory.InitializingBean;
@@ -84,6 +85,7 @@ public class TagsEntityResource implements EntityResourceAction.Read<Tag>,
 	/**
 	 * POST /tags
 	 */
+	@Experimental
 	@WebApiDescription(
 		title = "Create an orphan tag",
 		description = "Creates a tag, which is not associated with any node",

remote-api/src/test/java/org/alfresco/rest/api/CategoriesUnitTests.java

@@ -30,9 +30,11 @@ import org.alfresco.rest.api.categories.CategoriesEntityResourceTest;
 import org.alfresco.rest.api.categories.NodesCategoryLinksRelationTest;
 import org.alfresco.rest.api.categories.SubcategoriesRelationTest;
 import org.alfresco.rest.api.impl.CategoriesImplTest;
+import org.alfresco.service.Experimental;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
+@Experimental
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
     CategoriesImplTest.class,

remote-api/src/test/java/org/alfresco/rest/api/TagsUnitTests.java

@@ -27,9 +27,11 @@ package org.alfresco.rest.api;
 
 import org.alfresco.rest.api.impl.TagsImplTest;
 import org.alfresco.rest.api.tags.TagsEntityResourceTest;
+import org.alfresco.service.Experimental;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
+@Experimental
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
     TagsImplTest.class,

remote-api/src/test/java/org/alfresco/rest/api/search/SearchMapperTests.java

@@ -745,33 +745,56 @@ public class SearchMapperTests
     }
 
     @Test
-    public void fromLimits() throws Exception
+    public void fromLimits_setNull() throws Exception
     {
         SearchParameters searchParameters = new SearchParameters();
         searchMapper.setDefaults(searchParameters);
-
-        //Doesn't error
         searchMapper.fromLimits(searchParameters, null);
-        assertEquals(500, searchParameters.getLimit());
-        assertEquals(LimitBy.UNLIMITED, searchParameters.getLimitBy());
+        assertEquals("LimitBy default value should be unlimited", LimitBy.UNLIMITED, searchParameters.getLimitBy());
+        assertEquals("Limit default value should be 500", 500, searchParameters.getLimit());
+    }
 
-        searchMapper.fromLimits(searchParameters, new Limits(null, null));
-        assertEquals(LimitBy.UNLIMITED, searchParameters.getLimitBy());
-        assertEquals(500, searchParameters.getLimit());
-
-        searchMapper.fromLimits(searchParameters, new Limits(null, 34));
-        assertEquals(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, searchParameters.getLimitBy());
-        assertEquals(34, searchParameters.getMaxPermissionChecks());
-        assertEquals(-1, searchParameters.getLimit());
-        assertEquals(-1, searchParameters.getMaxPermissionCheckTimeMillis());
-
-        searchParameters = new SearchParameters();
+    @Test
+    public void fromLimits_setAllLimitsAsNull() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
         searchMapper.setDefaults(searchParameters);
-        searchMapper.fromLimits(searchParameters, new Limits(1000, null));
+        searchMapper.fromLimits(searchParameters, new Limits(null, null, null));
+        assertEquals("LimitBy default value should be unlimited", LimitBy.UNLIMITED, searchParameters.getLimitBy());
+        assertEquals("Limit default value should be 500", 500, searchParameters.getLimit());
+    }
+
+    @Test
+    public void fromLimits_setPermissionEvaluationCount() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        searchMapper.setDefaults(searchParameters);
+        searchMapper.fromLimits(searchParameters, new Limits(null, 34, null));
         assertEquals(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, searchParameters.getLimitBy());
-        assertEquals(1000, searchParameters.getMaxPermissionCheckTimeMillis());
-        assertEquals(-1, searchParameters.getLimit());
-        assertEquals(-1, searchParameters.getMaxPermissionChecks());
+        assertEquals("MaxPermissionChecks should be set", 34, searchParameters.getMaxPermissionChecks());
+        assertEquals("Limit should be -1", -1, searchParameters.getLimit());
+        assertEquals("MaxPermissionCheckTimeMillis should be -1", -1, searchParameters.getMaxPermissionCheckTimeMillis());
+    }
+
+    @Test
+    public void fromLimits_setPermissionEvaluationTime() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        searchMapper.setDefaults(searchParameters);
+        searchMapper.fromLimits(searchParameters, new Limits(1000, null, null));
+        assertEquals(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, searchParameters.getLimitBy());
+        assertEquals("MaxPermissionCheckTimeMillis should be set", 1000, searchParameters.getMaxPermissionCheckTimeMillis());
+        assertEquals("Limit should be -1", -1, searchParameters.getLimit());
+        assertEquals("MaxPermissionChecks should be -1", -1, searchParameters.getMaxPermissionChecks());
+    }
+
+    @Test
+    public void fromLimits_setTrackTotalHitsLimit() throws Exception
+    {
+        SearchParameters searchParameters = new SearchParameters();
+        searchMapper.setDefaults(searchParameters);
+        searchMapper.fromLimits(searchParameters, new Limits(null, null, 10));
+        assertEquals("TrackTotalHits should be set", 10, searchParameters.getTrackTotalHits());
     }
 
     @Test

repository/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.0.155</version>
+        <version>21.7</version>
     </parent>
 
     <dependencies>
@@ -126,7 +126,7 @@
         <dependency>
             <groupId>com.ibm.icu</groupId>
             <artifactId>icu4j</artifactId>
-            <version>73.2</version>
+            <version>72.1</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
@@ -375,9 +375,20 @@
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
             <artifactId>woodstox-core</artifactId>
-            <version>6.5.1</version>
+            <version>6.4.0</version>
         </dependency>
 
+        <!-- GData -->
+        <dependency>
+            <groupId>com.google.gdata</groupId>
+            <artifactId>gdata-core-1.0</artifactId>
+            <version>1.47.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.gdata</groupId>
+            <artifactId>gdata-media-1.0</artifactId>
+            <version>1.47.1</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-crypto</artifactId>
@@ -736,7 +747,7 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>1.9.19</version>
+            <version>1.9.9.1</version>
         </dependency>
         <dependency>
             <groupId>commons-net</groupId>

repository/src/main/java/org/alfresco/repo/action/executer/ImporterActionExecuter.java

@@ -244,7 +244,7 @@ public class ImporterActionExecuter extends ActionExecuterAbstractBase
                        String encoding = (String) ruleAction.getParameterValue(PARAM_ENCODING);
                        if (encoding == null)
                        {
-                           encoding = "Cp437";
+                           encoding = "UTF-8";
                        }
                        else
                        {

repository/src/main/java/org/alfresco/repo/config/source/RepoUrlConfigSource.java

@@ -0,0 +1,158 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.config.source;
+
+import java.io.InputStream;
+import java.util.List;
+
+import org.springframework.extensions.config.ConfigException;
+import org.springframework.extensions.config.source.UrlConfigSource;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
+import org.alfresco.service.cmr.repository.InvalidStoreRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.namespace.NamespaceService;
+
+/**
+ * ConfigSource that looks for a prefix to determine where to look for the config.</br>
+ * Valid prefixes are:
+ * <ul>
+ *   <li><b><storeProtocol>://<storeIdentifier></b> the location provided is a path to a repository file</li>
+ * </ul>
+ * as well as those defined in the core (UrlConfigSource)
+ *
+ * Example store URLs
+ *   <code>workspace://SpacesStore/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.webclient_extension.childname}/cm:web-client-config-custom.xml</code>
+ *   <code>workspace://SpacesStore/app:company_home/app:dictionary/app:webclient_extension/cm:web-client-config-custom.xml</code> 
+ */
+public class RepoUrlConfigSource extends UrlConfigSource
+{   
+    private TenantService tenantService;
+    private SearchService searchService;
+    private ContentService contentService;
+    private NamespaceService namespaceService;
+    private NodeService nodeService;
+    
+
+    public void setTenantService(TenantService tenantService) 
+    {
+        this.tenantService = tenantService;
+    }
+    
+    public void setSearchService(SearchService searchService) 
+    {
+        this.searchService = searchService;
+    }
+    
+    public void setContentService(ContentService contentService) 
+    {
+        this.contentService = contentService;
+    }
+    
+    public void setNamespaceService(NamespaceService namespaceService)
+    {
+        this.namespaceService = namespaceService;
+    }
+    
+    public void setNodeService(NodeService nodeService) 
+    {
+        this.nodeService = nodeService;
+    }
+    
+    
+    public RepoUrlConfigSource(String sourceLocation)
+    {
+        super(sourceLocation);
+    }
+
+    public RepoUrlConfigSource(List<String> sourceLocations)
+    {
+        super(sourceLocations);
+    }
+    
+
+    public InputStream getInputStream(String sourceUrl)
+    {
+        // determine the config source       
+        try
+        {
+            return super.getInputStream(sourceUrl);
+        } 
+        catch (ConfigException ce)
+        {     
+            int idx = sourceUrl.indexOf(StoreRef.URI_FILLER); 
+            if (idx != -1)
+            {
+                // assume this is a repository location
+                int idx2 = sourceUrl.indexOf("/", idx+3);
+                                
+                String store = sourceUrl.substring(0, idx2);
+                String path = sourceUrl.substring(idx2);
+                
+                StoreRef storeRef = tenantService.getName(new StoreRef(store));    
+                NodeRef rootNode = null;
+                
+                try 
+                {
+                    rootNode = nodeService.getRootNode(storeRef);
+                } 
+                catch (InvalidStoreRefException e)
+                {
+                    throw ce;
+                }
+                
+                List<NodeRef> nodeRefs = searchService.selectNodes(rootNode, path, null, namespaceService, false);
+                
+                if (nodeRefs.size() == 0)
+                {
+                    // if none found, then simply skip
+                    return null;
+                }
+                else if (nodeRefs.size() > 1)
+                {
+                    // unexpected
+                    throw new ConfigException("Found duplicate config sources in the repository " + sourceUrl);
+                }
+
+                NodeRef nodeRef = nodeRefs.get(0);
+                
+                ContentReader cr = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT);
+                                   
+                return cr.getContentInputStream();                                                  
+            } 
+            else
+            {
+                // not a repository url
+                throw ce;
+            }
+        }
+    }
+}

repository/src/main/java/org/alfresco/repo/search/impl/AbstractCategoryServiceImpl.java

@@ -25,6 +25,7 @@
  */
 package org.alfresco.repo.search.impl;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -49,6 +50,7 @@ import org.alfresco.query.PagingResults;
 import org.alfresco.repo.search.IndexerAndSearcher;
 import org.alfresco.repo.search.IndexerException;
 import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
@@ -635,6 +637,7 @@ public abstract class AbstractCategoryServiceImpl implements CategoryService
     }
 
     @Override
+    @Experimental
     public Optional<NodeRef> getRootCategoryNodeRef(final StoreRef storeRef)
     {
         return getRootCategoryNodeRef(storeRef, ContentModel.ASPECT_GEN_CLASSIFIABLE);

repository/src/main/java/org/alfresco/repo/tagging/TaggingServiceImpl.java

@@ -65,6 +65,7 @@ import org.alfresco.repo.audit.AuditComponent;
 import org.alfresco.repo.coci.CheckOutCheckInServicePolicies.OnCheckOut;
 import org.alfresco.repo.copy.CopyServicePolicies.BeforeCopyPolicy;
 import org.alfresco.repo.copy.CopyServicePolicies.OnCopyCompletePolicy;
+import org.alfresco.repo.domain.query.QueryException;
 import org.alfresco.repo.event2.EventGenerator;
 import org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy;
 import org.alfresco.repo.node.NodeServicePolicies.OnCreateNodePolicy;
@@ -77,6 +78,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
 import org.alfresco.repo.transaction.TransactionListener;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.action.ActionService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -1698,6 +1700,7 @@ public class TaggingServiceImpl implements TaggingService,
         }
     }
 
+    @Experimental
     @Override
     public List<Pair<String, NodeRef>> createTags(final StoreRef storeRef, final List<String> tagNames)
     {

repository/src/main/java/org/alfresco/service/cmr/search/CategoryService.java

@@ -35,6 +35,7 @@ import org.alfresco.query.EmptyPagingResults;
 import org.alfresco.query.PagingRequest;
 import org.alfresco.query.PagingResults;
 import org.alfresco.service.Auditable;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
@@ -282,6 +283,7 @@ public interface CategoryService
      *
      * @return NodeRef for category root node
      */
+    @Experimental
     @Auditable(parameters = {"storeRef"})
     default Optional<NodeRef> getRootCategoryNodeRef(final StoreRef storeRef)
     {

repository/src/main/java/org/alfresco/service/cmr/tagging/TaggingService.java

@@ -35,6 +35,7 @@ import org.alfresco.query.EmptyPagingResults;
 import org.alfresco.query.PagingRequest;
 import org.alfresco.query.PagingResults;
 import org.alfresco.service.Auditable;
+import org.alfresco.service.Experimental;
 import org.alfresco.service.NotAuditable;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
@@ -367,6 +368,7 @@ public interface TaggingService
      * @return {@link List} of {@link Pair}s of tag names and node references.
      * @throws org.alfresco.service.cmr.repository.DuplicateChildNodeNameException if tag already exists.
      */
+    @Experimental
     @Auditable(parameters = {"tagNames"})
     default List<Pair<String, NodeRef>> createTags(StoreRef storeRef, List<String> tagNames)
     {

repository/src/main/java/org/alfresco/util/remote/server/AlfrescoRmiRegistryFactoryBean.java

@@ -25,66 +25,27 @@
  */
 package org.alfresco.util.remote.server;
 
-import org.alfresco.util.remote.server.socket.HostConfigurableSocketFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
+import org.springframework.remoting.rmi.RmiRegistryFactoryBean;
 
 import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
-import java.rmi.server.UnicastRemoteObject;
+import java.rmi.server.RMIClientSocketFactory;
+import java.rmi.server.RMIServerSocketFactory;
 
 /**
  * This class controls the RMI connectivity via <code>alfresco.jmx.connector.enabled</code> property
  *
  * @author alex.mukha
  */
-public class AlfrescoRmiRegistryFactoryBean implements FactoryBean<Registry>, DisposableBean
+public class AlfrescoRmiRegistryFactoryBean extends RmiRegistryFactoryBean
 {
-    private static final Logger LOG = LoggerFactory.getLogger(AlfrescoRmiRegistryFactoryBean.class);
+    private static final String ERR_MSG_NOT_ENABLED = "The RMI registry factory is disabled.";
 
-    private boolean created = false;
+    private boolean enabled = true;
 
-    private final boolean enabled;
-
-    private final int port;
-
-    private final Registry registry;
-
-    public AlfrescoRmiRegistryFactoryBean(boolean enabled, int port, HostConfigurableSocketFactory socketFactory) throws Exception {
+    public void setEnabled(boolean enabled)
+    {
         this.enabled = enabled;
-        this.port = port;
-        if(this.enabled)
-        {
-            this.registry = initRegistry(socketFactory);
-        }
-        else {
-            this.registry = null;
-        }
-    }
-
-    private Registry initRegistry(HostConfigurableSocketFactory socketFactory) throws RemoteException {
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("Looking for RMI registry at port '" + this.port + "', using custom socket factory");
-        }
-        Registry registry;
-        synchronized (LocateRegistry.class) {
-            try {
-                // Retrieve existing registry.
-                registry = LocateRegistry.getRegistry(null, this.port, socketFactory);
-                testRegistry(this.registry);
-            }
-            catch (RemoteException ex) {
-                LOG.trace("RMI registry access threw exception", ex);
-                LOG.debug("Could not detect RMI registry - creating new one");
-                // Assume no registry found -> create new one.
-                this.created = true;
-                registry = LocateRegistry.createRegistry(this.port, socketFactory, socketFactory);
-            }
-        }
-        return registry;
     }
 
     public boolean isEnabled()
@@ -93,34 +54,57 @@ public class AlfrescoRmiRegistryFactoryBean implements FactoryBean<Registry>, Di
     }
 
     @Override
-    public void destroy() throws Exception {
-        if (this.created) {
-            LOG.debug("Unexporting RMI registry");
-            UnicastRemoteObject.unexportObject(this.registry, true);
+    public void afterPropertiesSet() throws Exception
+    {
+        if (enabled)
+        {
+            super.afterPropertiesSet();
         }
     }
 
     @Override
-    public Registry getObject() throws Exception {
-        return this.registry;
+    protected Registry getRegistry(
+            String registryHost,
+            int registryPort,
+            RMIClientSocketFactory clientSocketFactory,
+            RMIServerSocketFactory serverSocketFactory) throws RemoteException
+    {
+        if(enabled)
+        {
+            return super.getRegistry(registryHost, registryPort, clientSocketFactory, serverSocketFactory);
+        }
+        else
+        {
+            throw new RemoteException(ERR_MSG_NOT_ENABLED);
+        }
     }
 
     @Override
-    public Class<?> getObjectType() {
-        return (this.registry != null ? this.registry.getClass() : Registry.class);
-    }
-
-    public boolean isCreated()
+    protected Registry getRegistry(
+            int registryPort,
+            RMIClientSocketFactory clientSocketFactory,
+            RMIServerSocketFactory serverSocketFactory) throws RemoteException
     {
-        return created;
+        if(enabled)
+        {
+            return super.getRegistry(registryPort, clientSocketFactory, serverSocketFactory);
+        }
+        else
+        {
+            throw new RemoteException(ERR_MSG_NOT_ENABLED);
+        }
     }
 
-    public int getPort() {
-        return port;
-    }
-
-    private void testRegistry(Registry registry) throws RemoteException
+    @Override
+    protected Registry getRegistry(int registryPort) throws RemoteException
     {
-        registry.list();
+        if(enabled)
+        {
+            return super.getRegistry(registryPort);
+        }
+        else
+        {
+            throw new RemoteException(ERR_MSG_NOT_ENABLED);
+        }
     }
 }

repository/src/main/resources/alfresco/core-services-context.xml

@@ -75,9 +75,6 @@
         <property name="propertiesPersister">
         	<bean class="org.alfresco.config.AlfrescoPropertiesPersister"/>
         </property>
-        <property name="order">
-            <value>9999999</value>
-        </property>
     </bean>
 
     <!-- Expand global properties and version information in bean definitions -->
@@ -104,18 +101,6 @@
         </property>
     </bean>
 
-    <bean id="default-properties-resolver" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="ignoreUnresolvablePlaceholders">
-            <value>true</value>
-        </property>
-        <property name="searchSystemEnvironment">
-            <value>false</value>
-        </property>
-        <property name="order">
-            <value>2147483647</value>
-        </property>
-    </bean>
-
 
     <!-- Load properties that must be shared between the        -->
     <!-- Alfresco server and its remote clients.                -->

repository/src/main/resources/alfresco/repository.properties

@@ -3,7 +3,7 @@
 repository.name=Main Repository
 
 # Schema number
-version.schema=19000
+version.schema=18100
 
 # Directory configuration
 

scripts/ci/docker-compose/docker-compose-db.yaml

@@ -34,7 +34,7 @@ services:
     ports:
       - "3307:3306"
   activemq:
-    image: alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8
+    image: alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
     ports:
       - "5672:5672" # AMQP
       - "61616:61616" # OpenWire

scripts/ci/docker-compose/docker-compose.yaml

@@ -20,7 +20,7 @@ services:
       - "5433:5432"
   activemq:
     profiles: ["default", "with-transform-core-aio", "activemq", "with-mtls-transform-core-aio"]
-    image: alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8
+    image: alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
     ports:
       - "5672:5672" # AMQP
       - "61616:61616" # OpenWire

scripts/ci/update_downstream.sh

@@ -35,10 +35,10 @@ git add pom.xml
 
 if [[ "${COMMIT_MESSAGE}" =~ \[force[^\]]*\] ]]; then
   FORCE_TOKEN=$(echo "${COMMIT_MESSAGE}" | sed "s|^.*\(\[force[^]]*\]\).*$|\1|g")
-  git commit --allow-empty -m "${FORCE_TOKEN} Update community-repo version to ${VERSION}"
+  git commit --allow-empty -m "${FORCE_TOKEN} Update upstream version to ${VERSION}"
   git push
 elif git status --untracked-files=no --porcelain | grep -q '^' ; then
-  git commit -m "Update community-repo version to ${VERSION}"
+  git commit -m "Update upstream version to ${VERSION}"
   git push
 else
   echo "Dependencies are already up to date."