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

This reverts commit b7ed25a741.

.github/dependabot.yml

@@ -38,27 +38,6 @@ updates:
   - dependency-name: org.activiti:activiti-spring
     versions:
     - ">= 7.1.a, < 7.2"
-  - dependency-name: org.apache.camel:camel-activemq
-    versions:
-    - "> 3.7.1"
-  - dependency-name: org.apache.camel:camel-amqp
-    versions:
-    - "> 3.7.1"
-  - dependency-name: org.apache.camel:camel-direct
-    versions:
-    - "> 3.7.1"
-  - dependency-name: org.apache.camel:camel-directvm
-    versions:
-    - "> 3.7.1"
-  - dependency-name: org.apache.camel:camel-jackson
-    versions:
-    - "> 3.7.1"
-  - dependency-name: org.apache.camel:camel-mock
-    versions:
-    - "> 3.7.1"
-  - dependency-name: org.apache.camel:camel-spring
-    versions:
-    - "> 3.7.1"
   - dependency-name: org.apache.chemistry.opencmis:chemistry-opencmis-client-impl
     versions:
     - "> 1.0.0"

.travis.yml

@@ -53,14 +53,14 @@ jobs:
       if: commit_message !~ /\[skip repo\]/
       script:
         - travis_retry mvn -B test -pl core,data-model
-        - travis_retry mvn -B test -pl repository -Dtest=AllUnitTestsSuite
+        - travis_retry mvn -B test -pl "repository,mmt" "-Dtest=AllUnitTestsSuite,AllMmtUnitTestSuite"
 
     - name: "Repository - AppContext01TestSuite"
       if: commit_message !~ /\[skip repo\]/
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.5
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A5
       script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext01TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContext02TestSuite"
@@ -75,7 +75,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.5
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A5
       script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext03TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContext04TestSuite"
@@ -83,7 +83,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.5
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A5
       script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext04TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContext05TestSuite"
@@ -102,7 +102,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.5
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A5
       script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext06TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContextExtraTestSuite"
@@ -110,7 +110,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.5
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A5
       script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContextExtraTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - MiscContextTestSuite"
@@ -118,7 +118,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.5
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A5
       script: travis_wait 20 mvn -B test -pl repository -Dtest=MiscContextTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - SearchTestSuite"
@@ -241,7 +241,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.5
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A5
       script: travis_wait 20 mvn -B test -pl remote-api -Dtest=AppContext02TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Remote-api - AppContext03TestSuite"
@@ -249,7 +249,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.5
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A5
       script: travis_wait 20 mvn -B test -pl remote-api -Dtest=AppContext03TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Remote-api - AppContext04TestSuite"
@@ -257,7 +257,7 @@ jobs:
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.3 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.5
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7-A5
       script: travis_wait 20 mvn -B test -pl remote-api -Dtest=AppContext04TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Remote-api - AppContextExtraTestSuite"

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>14.92-SNAPSHOT</version>
+      <version>14.121</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>14.92-SNAPSHOT</version>
+      <version>14.121</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>14.92-SNAPSHOT</version>
+      <version>14.121</version>
    </parent>
 
    <build>
@@ -44,8 +44,8 @@
    <dependencies>
       <dependency>
          <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-log4j12</artifactId>
-         <version>1.7.33</version>
+         <artifactId>slf4j-reload4j</artifactId>
+         <version>1.7.35</version>
          <scope>test</scope>
       </dependency>
       <dependency>

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

@@ -73,4 +73,5 @@ public class RecordFoldersAPI extends BaseAPI
         }
         return null;
     }
+
 }

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

@@ -114,11 +114,11 @@ public class RecordsAPI extends BaseAPI
     /**
      * Reject the record given as parameter
      *
-     * @param user the user declaring the document as record
-     * @param password the user's password
+     * @param user               the user declaring the document as record
+     * @param password           the user's password
      * @param expectedStatusCode The expected return status code.
-     * @param recordName the record name
-     * @param reason reject reason
+     * @param recordName         the record name
+     * @param reason             reject reason
      * @return The HTTP Response.
      * @throws AssertionError If the expectedStatusCode was not returned.
      */
@@ -129,8 +129,8 @@ public class RecordsAPI extends BaseAPI
         JSONObject requestParams = new JSONObject();
         requestParams.put("name", "reject");
         requestParams.put("nodeRef", recNodeRef);
-        requestParams.put("params",new JSONObject()
-                    .put("reason",reason));
+        requestParams.put("params", new JSONObject()
+                .put("reason", reason));
 
         return doPostJsonRequest(user, password, expectedStatusCode, requestParams, RM_ACTIONS_API);
     }
@@ -221,6 +221,7 @@ public class RecordsAPI extends BaseAPI
      * Uploads an electronic record
      * <p>
      * eg. of usage for creating record directly in Unfiled Records : uploadElectronicRecord(getAdminName(), getAdminPassword(), recordPropertiesStringMap, UNFILED_RECORDS_BREADCRUMB, DocumentType.HTML)
+     *
      * @param username   the username
      * @param password   the password
      * @param properties a map of record properties and their values
@@ -241,6 +242,7 @@ public class RecordsAPI extends BaseAPI
      * <li>eg. of usage in the case in which the record is inside a folder in Unfiled Records : deleteRecord(getAdminName(), getAdminPassword(), "f1 (2016-1472716888713)", UNFILED_RECORDS_BREADCRUMB, "unfiled records folder");
      * <li>eg. of usage in the case in which the record is created directly in Unfiled Records : deleteRecord(getAdminName(), getAdminPassword(), "f1 (2016-1472716888713)", UNFILED_RECORDS_BREADCRUMB, "");
      * </ul>
+     *
      * @param username     user's username
      * @param password     its password
      * @param recordName   the record name
@@ -267,7 +269,7 @@ public class RecordsAPI extends BaseAPI
      * @param recordName the String with which the record name starts
      * @return the record object in case it exists, null otherwise
      */
-    private CmisObject getRecord(String username, String password, String folderName, String recordName)
+    public CmisObject getRecord(String username, String password, String folderName, String recordName)
     {
         for (CmisObject record : contentService.getFolderObject(contentService.getCMISSession(username, password), RM_SITE_ID, folderName).getChildren())
         {
@@ -328,9 +330,9 @@ public class RecordsAPI extends BaseAPI
     /**
      * Hide in place record
      *
-     * @param user         the user
-     * @param password     the user's password
-     * @param nodeId     the in place record node id
+     * @param user     the user
+     * @param password the user's password
+     * @param nodeId   the in place record node id
      * @return The HTTP Response.
      */
     public HttpResponse hideRecord(String user, String password, String nodeId)
@@ -344,6 +346,7 @@ public class RecordsAPI extends BaseAPI
         return doPostJsonRequest(user, password, SC_OK, requestParams, ACTIONS_API);
     }
 
+
     /**
      * Retrieves the record's nodeRef
      *

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/CreateNonElectronicRecordsTests.java

@@ -0,0 +1,139 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * -
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * -
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.rm.community.records;
+
+import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
+import static org.alfresco.utility.data.RandomData.getRandomName;
+import static org.alfresco.utility.report.log.Step.STEP;
+import static org.springframework.http.HttpStatus.CREATED;
+import static org.testng.Assert.assertNotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.rest.core.v0.BaseAPI.RMProperty;
+import org.alfresco.rest.rm.community.base.BaseRMRestTest;
+import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
+import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
+import org.alfresco.rest.v0.RMRolesAndActionsAPI;
+import org.alfresco.rest.v0.RecordsAPI;
+import org.alfresco.test.AlfrescoTest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/**
+ * Contains CreateNonElectronicRecords test which checks creation and basic actions(view details, edit, move, copy, delete) on non-electronic records
+ * <p/>
+ * Precondition:
+ * <p/>
+ * RM site created, contains category 1 with folder 1 and folder 2 inside it
+ * <p/>
+ * RM user has RM admin role
+ *
+ * @author Shubham Jain
+ * @Since 7.2.0 M2
+ */
+public class CreateNonElectronicRecordsTests extends BaseRMRestTest
+{
+    private RecordCategory rootCategory;
+
+    private RecordCategoryChild recordFolder;
+
+    /**
+     * data prep services
+     */
+    @Autowired
+    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
+
+    @Autowired
+    private RecordsAPI recordsAPI;
+
+    private final String TEST_PREFIX = generateTestPrefix(CreateNonElectronicRecordsTests.class);
+    private final String RM_ADMIN = TEST_PREFIX + "rm_admin";
+    private final String recordName = "RM-2777 record";
+    private final String recordTitle = recordName + " title";
+    private final String recordDescription = recordName + " description";
+
+
+    @BeforeClass (alwaysRun = true)
+    public void preConditions()
+    {
+        STEP("Create RM Site");
+        createRMSiteIfNotExists();
+
+        STEP("Create RM Admin user");
+        rmRolesAndActionsAPI.createUserAndAssignToRole(getAdminUser().getUsername(), getAdminUser().getPassword(), RM_ADMIN,
+                getAdminUser().getPassword(),
+                "Administrator");
+
+        STEP("Create root level category");
+        rootCategory = createRootCategory(getRandomName("Category"));
+
+        STEP("Create the record folder inside the rootCategory");
+        recordFolder = createRecordFolder(rootCategory.getId(), getRandomName("Folder"));
+
+    }
+
+    /**
+     * Test v0 methods to create and get non-electronic records.
+     */
+    @Test
+    @AlfrescoTest (jira = "RM-2777")
+    public void createNonElectronicRecordTest()
+    {
+        STEP("Create a non-electronic record by completing some of the fields");
+        Map<Enum<?>, String> properties = new HashMap<Enum<?>, String>();
+        properties.put(RMProperty.TITLE, recordTitle);
+        properties.put(RMProperty.DESCRIPTION, recordDescription);
+        properties.put(RMProperty.NAME, recordName);
+        properties.put(RMProperty.PHYSICAL_SIZE, "");
+        properties.put(RMProperty.NUMBER_OF_COPIES, "");
+        properties.put(RMProperty.SHELF, "");
+        properties.put(RMProperty.STORAGE_LOCATION, "");
+        properties.put(RMProperty.BOX, "");
+        properties.put(RMProperty.FILE, "");
+
+        recordsAPI.createNonElectronicRecord(getAdminUser().getUsername(),
+                getAdminUser().getPassword(), properties, rootCategory.getName(), recordFolder.getName());
+
+        STEP("Check the non-electronic record has been created");
+        assertStatusCode(CREATED);
+        assertNotNull(recordsAPI.getRecord(getAdminUser().getUsername(), getAdminUser().getPassword(),
+                recordFolder.getName(), recordName));
+
+    }
+
+    @AfterClass (alwaysRun = true)
+    public void deletePreConditions()
+    {
+        STEP("Delete the created rootCategory along with corresponding record folders/records present in it");
+        getRestAPIFactory().getRecordCategoryAPI().deleteRecordCategory(rootCategory.getId());
+    }
+
+}

amps/ags/rm-community/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>14.92-SNAPSHOT</version>
+      <version>14.121</version>
    </parent>
 
    <modules>

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

@@ -1,4 +1,4 @@
-TRANSFORMERS_TAG=2.5.5
+TRANSFORMERS_TAG=2.5.7-A5
 SOLR6_TAG=2.0.2
 POSTGRES_TAG=13.3
 ACTIVEMQ_TAG=5.16.1

amps/ags/rm-community/rm-community-repo/Dockerfile

@@ -1,4 +1,17 @@
-### Apply AGS community repo AMP to ACS image
+# BUILD STAGE AGS
+FROM debian:11-slim AS AGSBUILDER
+
+RUN export DEBIAN_FRONTEND=noninteractive; \
+    apt-get update -qqy && apt-get -yqq install unzip && \
+    mkdir -p /build/gs-api-explorer
+
+### Copy the AGS war from the local context
+COPY target/gs-api-explorer-*.war /build
+
+RUN unzip -q /build/gs-api-explorer-*.war -d /build/gs-api-explorer && \
+    chmod -R g-w,o= /build
+
+# ACTUAL IMAGE
 FROM alfresco/alfresco-community-repo-base:${image.tag}
 
 # Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
@@ -13,18 +26,13 @@ RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
               /usr/local/tomcat/amps \
               /usr/local/tomcat/webapps/alfresco -directory -nobackup
 
-### Copy gs-api-explorer war into webapps folder
-COPY target/gs-api-explorer-*.war /usr/local/tomcat/webapps/
-
-### Unpack gs-api-explorer.war
-RUN mkdir /usr/local/tomcat/webapps/gs-api-explorer && cd /usr/local/tomcat/webapps/gs-api-explorer && \
-    jar -xvf /usr/local/tomcat/webapps/gs-api-explorer-*.war && rm -f /usr/local/tomcat/webapps/gs-api-explorer-*.war
+### Copy gs-api-explorer
+COPY --chown=root:Alfresco --from=AGSBUILDER /build/gs-api-explorer /usr/local/tomcat/webapps/gs-api-explorer
 
 # All files in the tomcat folder must be owned by root user and Alfresco group as mentioned in the parent Dockerfile
 RUN chgrp -R Alfresco /usr/local/tomcat && \
     find /usr/local/tomcat/webapps -type d -exec chmod 0750 {} \; && \
-    find /usr/local/tomcat/webapps -type f -exec chmod 0640 {} \; && \
-    chmod -R g+r /usr/local/tomcat/webapps
+    find /usr/local/tomcat/webapps -type f -exec chmod 0640 {} \;
 
 # Switching back to alfresco user after having added amps files to run the container as non-root
 USER alfresco

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.92-SNAPSHOT</version>
+      <version>14.121</version>
    </parent>
 
    <properties>

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/api/PublicAPITestUtil.java

@@ -29,6 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.api;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.reflections.scanners.Scanners.TypesAnnotated;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
@@ -77,7 +78,7 @@ public class PublicAPITestUtil
      */
     public static void testPublicAPIConsistency(String basePackageName, SetMultimap<Class<?>, Class<?>> knownBadReferences)
     {
-        Reflections reflections = new Reflections(basePackageName);
+        Reflections reflections = new Reflections(basePackageName, TypesAnnotated);
         Set<Class<?>> publicAPIClasses = reflections.getTypesAnnotatedWith(AlfrescoPublicApi.class, true);
 
         SetMultimap<Class<?>, Class<?>> referencedFrom = HashMultimap.create();

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.92-SNAPSHOT</version>
+        <version>14.121</version>
     </parent>
 
     <build>

amps/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.92-SNAPSHOT</version>
+        <version>14.121</version>
     </parent>
 
     <modules>

amps/share-services/pom.xml

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

core/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>14.92-SNAPSHOT</version>
+      <version>14.121</version>
    </parent>
 
    <dependencies>
@@ -54,9 +54,9 @@
          <classifier>asl</classifier>
       </dependency>
       <dependency>
-         <groupId>log4j</groupId>
-         <artifactId>log4j</artifactId>
-         <version>1.2.17</version>
+         <groupId>ch.qos.reload4j</groupId>
+         <artifactId>reload4j</artifactId>
+         <version>1.2.18.3</version>
       </dependency>
       <dependency>
          <groupId>org.json</groupId>
@@ -114,7 +114,7 @@
       <!-- Test only dependencies, as popped up while running mvn test -->
       <dependency>
          <groupId>org.slf4j</groupId>
-         <artifactId>slf4j-log4j12</artifactId>
+         <artifactId>slf4j-reload4j</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>

data-model/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.92-SNAPSHOT</version>
+        <version>14.121</version>
     </parent>
 
     <properties>

data-model/src/main/java/org/alfresco/repo/content/ContentRestoreParams.java

@@ -26,7 +26,6 @@
 
 package org.alfresco.repo.content;
 
-import org.alfresco.service.Experimental;
 
 /**
  * Enumeration with values for archive-restore parameter keys.
@@ -35,7 +34,6 @@ import org.alfresco.service.Experimental;
  *
  * @author mpichura
  */
-@Experimental
 public enum ContentRestoreParams
 {
     /**

data-model/src/main/java/org/alfresco/repo/content/ContentStore.java

@@ -26,7 +26,6 @@
 package org.alfresco.repo.content;
 
 import org.alfresco.api.AlfrescoPublicApi;
-import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ContentAccessor;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
@@ -340,7 +339,6 @@ public interface ContentStore
      * @param contentUrl the URL of the content for which the storage properties are to be retrieved.
      * @return Returns a key-value (String-String) collection of storage headers/properties with their respective values.
      */
-    @Experimental
     default Map<String, String> getStorageProperties(String contentUrl)
     {
         return Collections.emptyMap();
@@ -350,14 +348,12 @@ public interface ContentStore
      * Submit a request to send content to archive (offline) state.
      * If no connector is present or connector is not supporting sending to archive, then {@link UnsupportedOperationException} will be returned.
      * Specific connector will decide which storage class/tier will be set for content.
-     * This method is experimental and subject to changes.
      *
      * @param contentUrl the URL of the content which is to be archived.
      * @param archiveParams a map of String-Serializable parameters defining Storage Provider specific request parameters (can be empty).
      * @return true when request successful, false when unsuccessful.
      * @throws UnsupportedOperationException when store is unable to handle request.
      */
-    @Experimental
     default boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
     {
         throw new UnsupportedOperationException("Request to archive content is not supported by this content store.");
@@ -370,14 +366,12 @@ public interface ContentStore
      * Keys of this map should be restricted to {@code ContentRestoreParams} enumeration.
      * For AWS S3 map can indicating expiry days, Glacier restore tier.
      * For Azure Blob map can indicate rehydrate priority.
-     * This method is experimental and subject to changes.
      *
      * @param contentUrl    the URL of the content which is to be archived.
      * @param restoreParams a map of String-Serializable parameters defining Storage Provider specific request parameters (can be empty).
      * @return true when request successful, false when unsuccessful.
      * @throws UnsupportedOperationException when store is unable to handle request.
      */
-    @Experimental
     default boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
     {
         throw new UnsupportedOperationException("Request to restore content from archive is not supported by this content store.");

data-model/src/main/java/org/alfresco/repo/content/ObjectStorageProps.java

@@ -26,8 +26,6 @@
 
 package org.alfresco.repo.content;
 
-import org.alfresco.service.Experimental;
-
 /**
  * Enumeration with "header" values for Alfresco derived Storage Properties
  * Values of this enum should be used when adding Alfresco derived key-value pairs in Storage Properties map.
@@ -35,7 +33,6 @@ import org.alfresco.service.Experimental;
  *
  * @author mpichura
  */
-@Experimental
 public enum ObjectStorageProps {
     /**
      * Object's content is archived and not immediately accessible.

data-model/src/main/java/org/alfresco/service/cmr/repository/ArchivedIOException.java

@@ -26,7 +26,6 @@
 package org.alfresco.service.cmr.repository;
 
 import org.alfresco.api.AlfrescoPublicApi;
-import org.alfresco.service.Experimental;
 
 /**
  * Unable to access as content is in an Archived state.
@@ -34,7 +33,6 @@ import org.alfresco.service.Experimental;
  * 
  * @author David Edwards
  */
-@Experimental
 @AlfrescoPublicApi
 public class ArchivedIOException extends ContentIOException
 {

data-model/src/main/java/org/alfresco/service/cmr/repository/RestoreInProgressException.java

@@ -27,7 +27,6 @@ package org.alfresco.service.cmr.repository;
 
 import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.service.Experimental;
 
 /**
  * Content Restoration in progress
@@ -35,7 +34,6 @@ import org.alfresco.service.Experimental;
  * @author David Edwards
  */
 @AlfrescoPublicApi
-@Experimental
 public class RestoreInProgressException extends AlfrescoRuntimeException
 {
     private static final long serialVersionUID = 5483215922384016269L;

mmt/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.92-SNAPSHOT</version>
+        <version>14.121</version>
     </parent>
 
     <dependencies>
@@ -31,6 +31,11 @@
             <artifactId>maven-artifact</artifactId>
             <version>${dependency.maven-artifact.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

mmt/src/main/java/org/alfresco/repo/module/tool/InstalledFiles.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.module.tool;
 
 import java.io.BufferedReader;

mmt/src/main/java/org/alfresco/repo/module/tool/ModuleDetailsHelper.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.module.tool;
 
 import java.io.FileNotFoundException;
@@ -178,13 +178,13 @@ public class ModuleDetailsHelper
     }
     
     /**
-     * Saves the module details to the war in the correct location based on the module id
-     * 
-     * @param warLocation   the war location
-     * @param moduleDetails      the module id
-     */
-    public static void saveModuleDetails(String warLocation, ModuleDetails moduleDetails)
-    {
+     * Saves the module details to the war in the correct location based on the module id
+     * 
+     * @param warLocation   the war location
+     * @param moduleDetails      the module id
+     */
+    public static void saveModuleDetails(String warLocation, ModuleDetails moduleDetails)
+    {
         // Ensure that it is a valid set of properties
         String moduleId = moduleDetails.getId();
         try

mmt/src/main/java/org/alfresco/repo/module/tool/ModuleManagementTool.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.module.tool;
 
 import de.schlichtherle.truezip.file.*;

mmt/src/main/java/org/alfresco/repo/module/tool/WarHelper.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.module.tool;
 
 import org.alfresco.service.cmr.module.ModuleDetails;

mmt/src/main/java/org/alfresco/repo/module/tool/WarHelperImpl.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.module.tool;
 
 import de.schlichtherle.truezip.file.TArchiveDetector;

mmt/src/test/java/org/alfresco/AllMmtUnitTestSuite.java

@@ -0,0 +1,43 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco;
+
+import org.junit.experimental.categories.Categories;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * All MMT Tool project UNIT test classes (no application context) should be added to this test suite.
+ */
+@RunWith(Categories.class)
+@Suite.SuiteClasses({
+        org.alfresco.repo.module.tool.ModuleManagementToolTest.class,
+        org.alfresco.repo.module.tool.WarHelperImplTest.class,
+        org.alfresco.repo.module.tool.ModuleServiceImplTest.class
+})
+public class AllMmtUnitTestSuite
+{
+}

mmt/src/test/java/org/alfresco/repo/module/tool/ModuleManagementToolTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * 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 

mmt/src/test/java/org/alfresco/repo/module/tool/ModuleServiceImplTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * 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 

mmt/src/test/java/org/alfresco/repo/module/tool/WarHelperImplTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * 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 

packaging/distribution/pom.xml

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

packaging/docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>14.92-SNAPSHOT</version>
+        <version>14.121</version>
     </parent>
 
     <properties>

packaging/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.92-SNAPSHOT</version>
+        <version>14.121</version>
     </parent>
 
     <modules>

packaging/tests/environment/.env

@@ -1,4 +1,4 @@
-TRANSFORMERS_TAG=2.5.5
+TRANSFORMERS_TAG=2.5.7-A5
 SOLR6_TAG=2.0.2
 POSTGRES_TAG=13.3
 ACTIVEMQ_TAG=5.16.1

packaging/tests/pom.xml

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

packaging/tests/tas-cmis/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.92-SNAPSHOT</version>
+        <version>14.121</version>
     </parent>
 
     <developers>

packaging/tests/tas-email/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.92-SNAPSHOT</version>
+        <version>14.121</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>14.92-SNAPSHOT</version>
+        <version>14.121</version>
     </parent>
 
     <developers>

packaging/tests/tas-restapi/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.92-SNAPSHOT</version>
+        <version>14.121</version>
     </parent>
 
     <developers>

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/sites/GetSitesTests.java

@@ -347,13 +347,30 @@ public class GetSitesTests extends RestTest
     public void checkPaginationWithSkipCountAndMaxItems() throws Exception
     {
         sites = restClient.authenticateUser(regularUser).withParams("skipCount=10&maxItems=110").withCoreAPI().getSites();
+
+        int expectedCount;
+        if (sites.getPagination().isHasMoreItems())
+        {
+            expectedCount = sites.getPagination().getMaxItems();
+        }
+        else
+        {
+            if (sites.getPagination().getTotalItems() < sites.getPagination().getSkipCount())
+            {
+                expectedCount = 0;
+            }
+            else
+            {
+                expectedCount = sites.getPagination().getTotalItems() - sites.getPagination().getSkipCount();
+            }
+        }
+
         sites.getPagination().assertThat()
                 .field("totalItems").isNotEmpty().and()
                 .field("maxItems").is("110").and()
                 .field("hasMoreItems").is((sites.getPagination().getTotalItems() - sites.getPagination().getSkipCount() > sites.getPagination().getMaxItems())?"true":"false").and()
                 .field("skipCount").is("10").and()
-                .field("count").is((sites.getPagination().isHasMoreItems()) ? sites.getPagination().getMaxItems()
-                : sites.getPagination().getTotalItems() - sites.getPagination().getSkipCount());
+                .field("count").is(expectedCount);
     }
 
     @Test(groups = { TestGroup.REST_API, TestGroup.SITES, TestGroup.REGRESSION})

packaging/tests/tas-webdav/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>14.92-SNAPSHOT</version>
+        <version>14.121</version>
     </parent>
 
     <developers>

packaging/war/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>14.92-SNAPSHOT</version>
+        <version>14.121</version>
     </parent>
 
     <properties>

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.92-SNAPSHOT</version>
+    <version>14.121</version> 
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -51,13 +51,13 @@
         <dependency.alfresco-log-sanitizer.version>0.2</dependency.alfresco-log-sanitizer.version>
         <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
         <dependency.activiti.version>5.23.0</dependency.activiti.version>
-        <dependency.alfresco-transform-model.version>1.4.7</dependency.alfresco-transform-model.version>
+        <dependency.alfresco-transform-model.version>1.4.13</dependency.alfresco-transform-model.version>
         <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.antlr.version>3.5.2</dependency.antlr.version>
-        <dependency.jackson.version>2.13.0</dependency.jackson.version>
+        <dependency.jackson.version>2.13.1</dependency.jackson.version>
         <dependency.jackson-databind.version>2.13.1</dependency.jackson-databind.version>
         <dependency.cxf.version>3.5.0</dependency.cxf.version>
         <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
@@ -71,9 +71,9 @@
         <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>
-        <dependency.xercesImpl.version>2.12.1</dependency.xercesImpl.version>
-        <dependency.slf4j.version>1.7.33</dependency.slf4j.version>
-        <dependency.gytheio.version>0.12</dependency.gytheio.version>
+        <dependency.xercesImpl.version>2.12.2</dependency.xercesImpl.version>
+        <dependency.slf4j.version>1.7.35</dependency.slf4j.version>
+        <dependency.gytheio.version>0.16</dependency.gytheio.version>
         <dependency.groovy.version>3.0.9</dependency.groovy.version>
         <dependency.tika.version>2.2.1</dependency.tika.version> 
         <dependency.spring-security.version>5.6.1</dependency.spring-security.version>
@@ -82,7 +82,7 @@
         <dependency.ooxml-schemas.version>1.4</dependency.ooxml-schemas.version>
         <dependency.keycloak.version>15.0.2</dependency.keycloak.version>
         <dependency.jboss.logging.version>3.4.3.Final</dependency.jboss.logging.version>
-        <dependency.camel.version>3.7.7</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies (can cause dependency conflicts)-->
+        <dependency.camel.version>3.15.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies (can cause dependency conflicts)-->
         <dependency.activemq.version>5.16.1</dependency.activemq.version>
         <dependency.apache-compress.version>1.21</dependency.apache-compress.version>
         <dependency.apache.taglibs.version>1.2.5</dependency.apache.taglibs.version>
@@ -102,23 +102,23 @@
         <dependency.jakarta-jws-api.version>2.1.0</dependency.jakarta-jws-api.version>
         <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.5.0</dependency.jakarta-json-path.version>
+        <dependency.jakarta-json-path.version>2.7.0</dependency.jakarta-json-path.version>
         <dependency.jakarta-rpc-api.version>1.1.4</dependency.jakarta-rpc-api.version>
 
         <alfresco.googledrive.version>3.2.1.3</alfresco.googledrive.version>
         <alfresco.aos-module.version>1.4.0.1</alfresco.aos-module.version>
-        <alfresco.api-explorer.version>7.2.0-M2</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
+        <alfresco.api-explorer.version>7.2.0-A3</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-1</license-maven-plugin.version>
 
-        <dependency.postgresql.version>42.3.1</dependency.postgresql.version>
+        <dependency.postgresql.version>42.3.2</dependency.postgresql.version>
         <dependency.mysql.version>8.0.27</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>3.0.47</dependency.tas-utility.version>
         <dependency.rest-assured.version>3.3.0</dependency.rest-assured.version>
-        <dependency.tas-restapi.version>1.68</dependency.tas-restapi.version>
+        <dependency.tas-restapi.version>1.71</dependency.tas-restapi.version>
         <dependency.tas-cmis.version>1.31</dependency.tas-cmis.version>
         <dependency.tas-email.version>1.8</dependency.tas-email.version>
         <dependency.tas-webdav.version>1.6</dependency.tas-webdav.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>14.121</tag>
     </scm>
 
     <distributionManagement>
@@ -563,6 +563,12 @@
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-log-sanitizer</artifactId>
                 <version>${dependency.alfresco-log-sanitizer.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.alfresco.aos-module</groupId>
@@ -606,7 +612,7 @@
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
+                <artifactId>slf4j-reload4j</artifactId>
                 <version>${dependency.slf4j.version}</version>
             </dependency>
             <dependency>
@@ -631,7 +637,7 @@
             <dependency>
                 <groupId>com.github.junrar</groupId>
                 <artifactId>junrar</artifactId>
-                <version>7.4.0</version>
+                <version>7.4.1</version>
             </dependency>
             <dependency>
                 <groupId>com.github.fge</groupId>
@@ -760,7 +766,12 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.camel</groupId>
-                <artifactId>camel-spring</artifactId>
+                <artifactId>camel-core</artifactId>
+                <version>${dependency.camel.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.camel</groupId>
+                <artifactId>camel-spring-xml</artifactId>
                 <version>${dependency.camel.version}</version>
                 <exclusions>
                     <exclusion>
@@ -789,11 +800,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-codec-http</artifactId>
-                <version>4.1.72.Final</version>
-            </dependency>
             <dependency>
                 <!--  If you are going to bump dependency.camel.version, please check if the netty-codec-http has higher version that the one above.-->
                 <groupId>org.apache.camel</groupId>
@@ -850,7 +856,7 @@
             <dependency>
                 <groupId>org.reflections</groupId>
                 <artifactId>reflections</artifactId>
-                <version>0.9.12</version>
+                <version>0.10.2</version>
             </dependency>
             <!-- swagger parser -->
             <dependency>
@@ -939,7 +945,7 @@
                                 <failOnMissing>true</failOnMissing>
                                 <excludedScopes>provided,test</excludedScopes>
                                 <excludedGroups>^(org\.alfresco|com\.alfresco|org\.activiti|org\.gytheio).*</excludedGroups>
-                                <failIfWarning>false</failIfWarning>
+                                <failIfWarning>true</failIfWarning>
                                 <includedLicenses>
                                     https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/includedLicenses.txt
                                 </includedLicenses>

remote-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.92-SNAPSHOT</version>
+        <version>14.121</version>
     </parent>
 
     <dependencies>

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

@@ -30,49 +30,37 @@ import org.alfresco.rest.api.model.ArchiveContentRequest;
 import org.alfresco.rest.api.model.ContentStorageInfo;
 import org.alfresco.rest.api.model.RestoreArchivedContentRequest;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
-import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**
  * Storage information for content API.
- * Note: Currently marked as experimental and subject to change.
  *
  * @author mpichura
  */
-@Experimental
 public interface ContentStorageInformation
 {
     /**
-     * Note: Currently marked as experimental and subject to change.
-     *
      * @param nodeRef         Node reference
      * @param contentPropName Qualified name of content property (e.g. 'cm_content')
      * @param parameters      {@link Parameters} object to get the parameters passed into the request
      * @return {@link ContentStorageInfo} object consisting of qualified name of content property and a map of storage properties
      */
-    @Experimental
     ContentStorageInfo getStorageInfo(NodeRef nodeRef, String contentPropName, Parameters parameters);
 
     /**
-     * Note: Currently marked as experimental and subject to change.
-     *
      * @param nodeRef               Node reference
      * @param contentPropName       Qualified name of content property (e.g. 'cm_content')
      * @param archiveContentRequest {@link ArchiveContentRequest} object holding parameters for archive content request
      * @return true when request successful, false when unsuccessful
      */
-    @Experimental
     boolean requestArchiveContent(NodeRef nodeRef, String contentPropName, ArchiveContentRequest archiveContentRequest);
 
     /**
-     * Note: Currently marked as experimental and subject to change.
-     *
      * @param nodeRef                       Node reference
      * @param contentPropName               Qualified name of content property (e.g. 'cm_content')
      * @param restoreArchivedContentRequest {@link RestoreArchivedContentRequest} object holding parameters for restore from archive request
      * @return true when request successful, false when unsuccessful
      */
-    @Experimental
     boolean requestRestoreContentFromArchive(NodeRef nodeRef, String contentPropName,
                                              RestoreArchivedContentRequest restoreArchivedContentRequest);
 }

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

@@ -33,7 +33,6 @@ import org.alfresco.rest.api.model.ContentStorageInfo;
 import org.alfresco.rest.api.model.RestoreArchivedContentRequest;
 import org.alfresco.rest.framework.core.exceptions.RestoreInProgressException;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
-import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
@@ -45,11 +44,9 @@ import java.util.Map;
 
 /**
  * Default implementation for {@link ContentStorageInformation}
- * Note: Currently marked as experimental and subject to change.
  *
  * @author mpichura
  */
-@Experimental
 public class ContentStorageInformationImpl implements ContentStorageInformation
 {
 
@@ -68,7 +65,6 @@ public class ContentStorageInformationImpl implements ContentStorageInformation
      * {@inheritDoc}
      */
     @Override
-    @Experimental
     public ContentStorageInfo getStorageInfo(NodeRef nodeRef, String contentPropName, Parameters parameters)
     {
         final QName propQName = getQName(contentPropName);

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

@@ -38,7 +38,6 @@ import org.alfresco.rest.api.Nodes;
 import org.alfresco.rest.api.model.Download;
 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
 import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
-import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.download.DownloadService;
 import org.alfresco.service.cmr.download.DownloadStatus;
 import org.alfresco.service.cmr.module.ModuleService;
@@ -214,8 +213,7 @@ public class DownloadsImpl implements Downloads
      * @param checkLimit The maximum number of nodes to check, set to -1 for no limit
      * @see #checkArchiveStatus(NodeRef[], int, Set)
      */
-    @Experimental
-    protected void checkArchiveStatus(NodeRef[] nodeRefs, int checkLimit) 
+    protected void checkArchiveStatus(NodeRef[] nodeRefs, int checkLimit)
     {
         if (canCheckArchived()) 
         {
@@ -234,7 +232,6 @@ public class DownloadsImpl implements Downloads
      * @param checkLimit The maximum number of nodes to check, set to -1 for no limit
      * @param cache Tracks nodes that we have already checked, if null an empty cache will be created
      */
-    @Experimental
     private void checkArchiveStatus(NodeRef[] nodeRefs, int checkLimit, Set<NodeRef> cache)
     {
         // Create the cache for recursive calls.
@@ -291,8 +288,7 @@ public class DownloadsImpl implements Downloads
         }
     }
 
-    @Experimental
-    protected boolean canCheckArchived() 
+    protected boolean canCheckArchived()
     {
         return Arrays.stream(CLOUD_CONNECTOR_MODULES).anyMatch(m-> moduleService.getModule(m) != null);
     }

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

@@ -26,19 +26,15 @@
 
 package org.alfresco.rest.api.model;
 
-import org.alfresco.service.Experimental;
-
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
  * Request for content archive.
- * Marked as experimental and subject to change.
  *
  * @author mpichura
  */
-@Experimental
 public class ArchiveContentRequest
 {
     /**

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

@@ -26,15 +26,11 @@
 
 package org.alfresco.rest.api.model;
 
-import org.alfresco.service.Experimental;
-
 /**
  * Request for restore content from archive.
- * Marked as experimental and subject to change.
  *
  * @author mpichura
  */
-@Experimental
 public class RestoreArchivedContentRequest
 {
     /**

remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeStorageInfoRelation.java

@@ -39,7 +39,6 @@ import org.alfresco.rest.framework.resource.RelationshipResource;
 import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.rest.framework.webscripts.WithResponse;
-import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.util.PropertyCheck;
@@ -49,11 +48,9 @@ import javax.servlet.http.HttpServletResponse;
 
 /**
  * Node storage information.
- * Note: Currently marked as experimental and subject to change.
  *
  * @author mpichura
  */
-@Experimental
 @RelationshipResource(name = "storage-info", entityResource = NodesEntityResource.class, title = "Node's content storage information")
 public class NodeStorageInfoRelation implements RelationshipResourceAction.ReadById<ContentStorageInfo>, InitializingBean
 {
@@ -82,7 +79,6 @@ public class NodeStorageInfoRelation implements RelationshipResourceAction.ReadB
         return storageInformation.getStorageInfo(nodeRef, contentPropName, parameters);
     }
 
-    @Experimental
     @Operation("archive")
     @WebApiParam(name = "archiveContentRequest", title = "Request for archive content",
             description = "Optional parameters for archive content", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
@@ -103,7 +99,6 @@ public class NodeStorageInfoRelation implements RelationshipResourceAction.ReadB
         }
     }
 
-    @Experimental
     @Operation("archive-restore")
     @WebApiParam(name = "restoreArchivedContentRequest", title = "Request for restore content from archive",
             description = "Optional parameters for restore content from archive", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)

remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionRenditionsRelation.java

@@ -26,18 +26,28 @@
 
 package org.alfresco.rest.api.nodes;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
+import org.alfresco.repo.content.directurl.DirectAccessUrlDisabledException;
+import org.alfresco.rest.api.DirectAccessUrlHelper;
 import org.alfresco.rest.api.Renditions;
+import org.alfresco.rest.api.model.DirectAccessUrlRequest;
 import org.alfresco.rest.api.model.Rendition;
 import org.alfresco.rest.framework.BinaryProperties;
+import org.alfresco.rest.framework.Operation;
 import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.WebApiParam;
+import org.alfresco.rest.framework.core.ResourceParameter;
+import org.alfresco.rest.framework.core.exceptions.DisabledServiceException;
 import org.alfresco.rest.framework.resource.RelationshipResource;
 import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
 import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceBinaryAction;
 import org.alfresco.rest.framework.resource.content.BinaryResource;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
+import org.alfresco.rest.framework.webscripts.WithResponse;
+import org.alfresco.service.cmr.repository.DirectAccessUrl;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.util.PropertyCheck;
@@ -53,6 +63,7 @@ import org.springframework.extensions.webscripts.Status;
  * - GET    /nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}
  * - DELETE /nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}
  * - GET    /nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}/content
+ * - POST   /nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}/request-direct-access-url
  *
  * @author janv
  */
@@ -65,12 +76,18 @@ public class NodeVersionRenditionsRelation implements RelationshipResourceAction
         InitializingBean
 {
     private Renditions renditions;
+    private DirectAccessUrlHelper directAccessUrlHelper;
 
     public void setRenditions(Renditions renditions)
     {
         this.renditions = renditions;
     }
 
+    public void setDirectAccessUrlHelper(DirectAccessUrlHelper directAccessUrlHelper)
+    {
+        this.directAccessUrlHelper = directAccessUrlHelper;
+    }
+
     @Override
     public void afterPropertiesSet() throws Exception
     {
@@ -117,6 +134,36 @@ public class NodeVersionRenditionsRelation implements RelationshipResourceAction
         return renditions.getContent(nodeRef, versionId, renditionId, parameters);
     }
 
+    @Operation ("request-direct-access-url")
+    @WebApiParam (name = "directAccessUrlRequest",
+                  title = "Request direct access url",
+                  description = "Options for direct access url request",
+                  kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
+    @WebApiDescription(title = "Request content url",
+                       description="Generates a direct access URL.",
+                       successStatus = HttpServletResponse.SC_OK)
+    public DirectAccessUrl requestContentDirectUrl(String nodeId,
+                                                   String versionId,
+                                                   DirectAccessUrlRequest directAccessUrlRequest,
+                                                   Parameters parameters, WithResponse withResponse)
+    {
+        boolean attachment = directAccessUrlHelper.getAttachment(directAccessUrlRequest);
+        Long validFor = directAccessUrlHelper.getDefaultExpiryTimeInSec();
+        NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
+        String renditionId = parameters.getRelationship2Id();
+
+        DirectAccessUrl directAccessUrl;
+        try
+        {
+            directAccessUrl = renditions.requestContentDirectUrl(nodeRef, versionId, renditionId, attachment, validFor);
+        }
+        catch (DirectAccessUrlDisabledException ex)
+        {
+            throw new DisabledServiceException(ex.getMessage());
+        }
+        return directAccessUrl;
+    }
+
     @WebApiDescription(title = "Delete rendition")
     @Override
     public void delete(String nodeId, String versionId, Parameters parameters)

remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeVersionsStorageInfoRelation.java

@@ -40,7 +40,6 @@ import org.alfresco.rest.framework.resource.RelationshipResource;
 import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.rest.framework.webscripts.WithResponse;
-import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.version.Version;
 import org.alfresco.util.PropertyCheck;
@@ -52,12 +51,9 @@ import javax.servlet.http.HttpServletResponse;
  * Node Versions storage information.
  *
  *  - GET  /nodes/{nodeId}/versions/{versionId}/storage-info/{contentPropQNameId}
- * 
- * Note: Currently marked as experimental and subject to change.
  *
  * @author janv
  */
-@Experimental
 @RelationshipResource(name = "storage-info", entityResource = NodeVersionsRelation.class, title = "Node Version's content storage information")
 public class NodeVersionsStorageInfoRelation implements RelationshipResourceAction.ReadById<ContentStorageInfo>, InitializingBean
 {
@@ -91,7 +87,6 @@ public class NodeVersionsStorageInfoRelation implements RelationshipResourceActi
         return storageInformation.getStorageInfo(versionNodeRef, contentPropQNameId, parameters);
     }
 
-    @Experimental
     @Operation("archive")
     @WebApiParam(name = "archiveContentRequest", title = "Request for archive version content",
             description = "Optional parameters for archive version content", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)
@@ -116,7 +111,6 @@ public class NodeVersionsStorageInfoRelation implements RelationshipResourceActi
         }
     }
 
-    @Experimental
     @Operation("archive-restore")
     @WebApiParam(name = "restoreArchivedContentRequest", title = "Request for restore version content from archive",
             description = "Optional parameters for restore version content from archive", kind = ResourceParameter.KIND.HTTP_BODY_OBJECT)

remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/ArchivedContentException.java

@@ -25,15 +25,12 @@
  */
 package org.alfresco.rest.framework.core.exceptions;
 
-import org.alfresco.service.Experimental;
-
 /**
  * Thrown when the content is archived and not readily accessible.
  * Status is <i>Precondition Failed</i> client error = 412.
  *
  * @author David Edwards
  */
-@Experimental
 public class ArchivedContentException  extends  ApiException
 {
 

remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/RestoreInProgressException.java

@@ -25,9 +25,6 @@
  */
 package org.alfresco.rest.framework.core.exceptions;
 
-import org.alfresco.service.Experimental;
-
-@Experimental
 public class RestoreInProgressException extends  ApiException
 {
     public static String DEFAULT_MESSAGE_ID = "framework.exception.RestoreInProgress";

remote-api/src/main/resources/alfresco/public-rest-context.xml

@@ -1452,6 +1452,7 @@
 
     <bean class="org.alfresco.rest.api.nodes.NodeVersionRenditionsRelation">
         <property name="renditions" ref="Renditions" />
+        <property name="directAccessUrlHelper" ref="directAccessUrlHelper" />
     </bean>
 
     <bean class="org.alfresco.rest.api.quicksharelinks.QuickShareLinkRenditionsRelation">

remote-api/src/test/java/org/alfresco/AppContext02TestSuite.java

@@ -53,6 +53,7 @@ import org.junit.runners.Suite;
     org.alfresco.rest.api.tests.NodeApiTest.class,
     org.alfresco.rest.api.tests.NodeAssociationsApiTest.class,
     org.alfresco.rest.api.tests.NodeVersionsApiTest.class,
+    org.alfresco.rest.api.tests.NodeVersionRenditionsApiTest.class,
     org.alfresco.rest.api.tests.QueriesNodesApiTest.class,
     org.alfresco.rest.api.tests.QueriesPeopleApiTest.class,
     org.alfresco.rest.api.tests.QueriesSitesApiTest.class,

remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java

@@ -25,6 +25,8 @@
  */
 package org.alfresco.rest.api.tests;
 
+import org.alfresco.repo.content.directurl.SystemWideDirectUrlConfig;
+import org.alfresco.rest.api.impl.directurl.RestApiDirectUrlConfig;
 import org.alfresco.rest.api.tests.client.PublicApiHttpClient;
 import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsString;
 import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull;
@@ -219,6 +221,11 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
         return URL_NODES + "/" + nodeId + "/" + REQUEST_DIRECT_ACCESS_URL;
     }
 
+    protected String getRequestVersionRenditionContentDirectUrl(String nodeId, String versionId, String renditionId)
+    {
+        return getNodeVersionRenditionIdUrl(nodeId, versionId, renditionId) + "/" + REQUEST_DIRECT_ACCESS_URL;
+    }
+
     protected String getRequestArchivedContentDirectUrl(String nodeId)
     {
         return URL_DELETED_NODES + "/" + nodeId + "/" + REQUEST_DIRECT_ACCESS_URL;
@@ -229,6 +236,17 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
         return URL_DELETED_NODES + "/" + nodeId + "/" + URL_RENDITIONS + "/" + renditionID + "/" + REQUEST_DIRECT_ACCESS_URL;
     }
 
+    protected String getRequestRenditionDirectAccessUrl(String nodeId, String renditionID)
+    {
+        return URL_NODES + "/" + nodeId + "/" + URL_RENDITIONS + "/" + renditionID + "/" + REQUEST_DIRECT_ACCESS_URL;
+    }
+
+    protected String getRequestVersionDirectAccessUrl(String nodeId, String versionId)
+    {
+        return URL_NODES + "/" + nodeId + "/" + URL_VERSIONS + "/" + versionId + "/" + REQUEST_DIRECT_ACCESS_URL;
+    }
+
+
     /**
      * The api scope. either public or private
      *
@@ -724,6 +742,18 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
         return createNode(parentId, folderName, TYPE_CM_FOLDER, props, Folder.class);
     }
 
+    protected String createUniqueFolder(String parentId) throws Exception
+    {
+        return createFolder(parentId, "folder-" + System.currentTimeMillis()).getId();
+    }
+
+    protected String createUniqueContent(String folderId) throws Exception
+    {
+        Document documentResp = createTextFile(folderId, "file-" + System.currentTimeMillis(),
+        "some text-" + System.currentTimeMillis(), "UTF-8", null);
+        return documentResp.getId();
+    }
+
     protected Node createNode(String parentId, String nodeName, String nodeType, Map<String, Object> props) throws Exception
     {
         return createNode(parentId, nodeName, nodeType, props, Node.class);
@@ -1075,5 +1105,20 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
         return URL_NODES + "/" + nodeId;
     }
 
+    protected void enableRestDirectAccessUrls()
+    {
+        SystemWideDirectUrlConfig systemDauConfig = (SystemWideDirectUrlConfig) applicationContext.getBean("systemWideDirectUrlConfig");
+        systemDauConfig.setEnabled(true);
+        RestApiDirectUrlConfig restDauConfig = (RestApiDirectUrlConfig) applicationContext.getBean("restApiDirectUrlConfig");
+        restDauConfig.setEnabled(true);
+    }
+
+    protected void disableRestDirectAccessUrls()
+    {
+        SystemWideDirectUrlConfig systemDauConfig = (SystemWideDirectUrlConfig) applicationContext.getBean("systemWideDirectUrlConfig");
+        systemDauConfig.setEnabled(false);
+        RestApiDirectUrlConfig restDauConfig = (RestApiDirectUrlConfig) applicationContext.getBean("restApiDirectUrlConfig");
+        restDauConfig.setEnabled(false);
+    }
 }
 

remote-api/src/test/java/org/alfresco/rest/api/tests/NodeApiTest.java

@@ -6279,92 +6279,70 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
     }
 
     @Test
-    public void testRequestVersionsContentDirectUrl() throws Exception
+    public void testRequestContentDirectUrlClientErrorResponseForNodes() throws Exception
     {
+        enableRestDirectAccessUrls();
+
+        //Node does not exist
         setRequestContext(user1);
 
-        String myNodeId = getMyNodeId();
+        HttpResponse nodeDoesNotExistResponse = post(getRequestContentDirectUrl("non-existing-node-id"), null, 404);
 
-        Document d1 = new Document();
-        d1.setName("d1.txt");
-        d1.setNodeType(TYPE_CM_CONTENT);
+        //Node is not a file
+        String folderId = createFolder(tDocLibNodeId, "some-folder-name").getId();
+        HttpResponse nodeIsNotAFileReponse = post(getRequestContentDirectUrl(folderId), null, 400);
 
-        // create *empty* text file - as of now, versioning is not enabled by default
-        HttpResponse response = post(getNodeChildrenUrl(myNodeId), toJsonAsStringNonNull(d1), 201);
-        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
-
-        String docId = documentResp.getId();
-        assertFalse(documentResp.getAspectNames().contains("cm:versionable"));
-        assertNull(documentResp.getProperties()); // no properties (ie. no "cm:versionLabel")
-
-        int majorVersion = 1;
-        int minorVersion = 0;
-
-        String content = "The quick brown fox jumps over the lazy dog ";
-
-        Map<String, String> params = new HashMap<>();
-        params.put("comment", "my version ");
-
-        documentResp = updateTextFile(docId, content, params);
-        assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
-        assertNotNull(documentResp.getProperties());
-        assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
-
-        final String contentNodeId = documentResp.getId();
-
-        // Check the upload response
-        assertNotNull(documentResp.getProperties());
-        assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
-        ContentInfo contentInfo = documentResp.getContent();
-        assertNotNull(contentInfo);
-        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
-
-        HttpResponse dauResponse = post(getRequestContentDirectUrl(contentNodeId), null, null, null, null, 501);
+        disableRestDirectAccessUrls();
     }
 
     @Test
-    public void testRequestRenditionContentDirectUrl() throws Exception
+    public void testRequestContentDirectUrlClientErrorResponseForVersions() throws Exception
     {
+        enableRestDirectAccessUrls();
+        // Create a document
         setRequestContext(user1);
 
-        RepoService.TestNetwork networkN1;
-        RepoService.TestPerson userOneN1;
-        Site userOneN1Site;
+        String folderNodeId = createUniqueFolder(getMyNodeId());
+        String contentNodeId = createUniqueContent(folderNodeId);
 
-        networkN1 = repoService.createNetworkWithAlias("ping", true);
-        networkN1.create();
-        userOneN1 = networkN1.createUser();
+        // Verify versions
+        HttpResponse versionIdDoesNotExistReponse = post(getRequestVersionDirectAccessUrl(contentNodeId, "1.2"), null, null, null, null, 404);
+        HttpResponse versionIdInvalidReponse = post(getRequestVersionDirectAccessUrl(contentNodeId, "invalid-version"), null, null, null, null, 404);
 
-        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
+        disableRestDirectAccessUrls();
+    }
 
-        String siteTitle = "RandomSite" + System.currentTimeMillis();
-        userOneN1Site = createSite(siteTitle, SiteVisibility.PRIVATE);
+    @Test
+    public void testRequestContentDirectUrlClientErrorResponseForRenditions() throws Exception
+    {
+        enableRestDirectAccessUrls();
+        // Create a document
+        setRequestContext(user1);
 
-        // Create a folder within the site document's library
-        String folderName = "folder" + System.currentTimeMillis();
-        String parentId = getSiteContainerNodeId(userOneN1Site.getId(), "documentLibrary");
-        String folder_Id = createNode(parentId, folderName, TYPE_CM_FOLDER, null).getId();
+        String folderNodeId = createUniqueFolder(getMyNodeId());
+        String contentNodeId = createUniqueContent(folderNodeId);
 
-        // Create multipart request - pdf file
-        String renditionName = "doclib";
-        String fileName = "quick.pdf";
-        File file = getResourceFile(fileName);
-        MultiPartRequest reqBody = MultiPartBuilder.create()
-            .setFileData(new FileData(fileName, file))
-            .setRenditions(Collections.singletonList(renditionName))
-            .build();
+        // Verify renditions
+        HttpResponse renditionIdDoesNotExistReponse = post(getRequestRenditionDirectAccessUrl(contentNodeId, "pdf"), null, null, null, null, 404);
+        HttpResponse renditionIdInvalidReponse = post(getRequestRenditionDirectAccessUrl(contentNodeId, "invalid-rendition"), null, null, null, null, 404);
 
-        // Upload quick.pdf file into 'folder' - including request to create 'doclib' thumbnail
-        HttpResponse response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
-        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
-        String contentNodeId = document.getId();
+        disableRestDirectAccessUrls();
+    }
 
-        // wait and check that rendition is created ...
-        Rendition rendition = waitAndGetRendition(contentNodeId, null, renditionName);
-        assertNotNull(rendition);
-        assertEquals(Rendition.RenditionStatus.CREATED, rendition.getStatus());
+    @Test
+    public void testRequestContentDirectUrlClientErrorResponseForDeletion() throws Exception
+    {
+        enableRestDirectAccessUrls();
+        // Create a document
+        setRequestContext(user1);
 
-        HttpResponse dauResponse = post(getRequestContentDirectUrl(contentNodeId), null, null, null, null, 501);
+        String folderNodeId = createUniqueFolder(getMyNodeId());
+        String contentNodeId = createUniqueContent(folderNodeId);
+
+        // Verify deletion
+        HttpResponse nodeNotDeletedReponse = post(getRequestArchivedContentDirectUrl(contentNodeId), null, null, null, null, 404);
+
+        disableRestDirectAccessUrls();
     }
 
     @Test

remote-api/src/test/java/org/alfresco/rest/api/tests/NodeVersionRenditionsApiTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2020 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 
@@ -27,20 +27,32 @@ package org.alfresco.rest.api.tests;
 
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.web.scripts.RepositoryContainer;
 import org.alfresco.rest.AbstractSingleNetworkSiteTest;
+import org.alfresco.rest.api.DirectAccessUrlHelper;
+import org.alfresco.rest.api.impl.directurl.RestApiDirectUrlConfig;
+import org.alfresco.rest.api.model.Site;
+import org.alfresco.rest.api.nodes.NodesEntityResource;
 import org.alfresco.rest.api.tests.client.HttpResponse;
 import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
 import org.alfresco.rest.api.tests.client.data.ContentInfo;
 import org.alfresco.rest.api.tests.client.data.Document;
 import org.alfresco.rest.api.tests.client.data.Node;
 import org.alfresco.rest.api.tests.client.data.Rendition;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder.FileData;
+import org.alfresco.rest.api.tests.util.MultiPartBuilder.MultiPartRequest;
 import org.alfresco.rest.api.tests.util.RestApiUtil;
 import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsString;
 
 import static org.junit.Assert.*;
 
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.junit.After;
 import org.junit.Test;
+import org.mockito.Mockito;
 
+import java.io.File;
 import java.util.*;
 
 /**
@@ -273,6 +285,138 @@ public class NodeVersionRenditionsApiTest extends AbstractSingleNetworkSiteTest
         }
     }
 
+    @Test
+    public void testRequestVersionRenditionContentDirectUrl() throws Exception
+    {
+        setRequestContext(user1);
+
+        RepoService.TestNetwork networkN1;
+        RepoService.TestPerson userOneN1;
+        Site userOneN1Site;
+
+        networkN1 = repoService.createNetworkWithAlias("ping", true);
+        networkN1.create();
+        userOneN1 = networkN1.createUser();
+
+        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
+
+        String siteTitle = "RandomSite" + System.currentTimeMillis();
+        userOneN1Site = createSite(siteTitle, SiteVisibility.PRIVATE);
+
+        String PROP_LTM = "cm:lastThumbnailModification";
+
+        String RENDITION_NAME = "imgpreview";
+
+        String userId = userOneN1.getId();
+        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
+
+        // Create a folder within the site document's library
+        String folderName = "folder" + System.currentTimeMillis();
+        String parentId = getSiteContainerNodeId(userOneN1Site.getId(), "documentLibrary");
+        String folder_Id = createNode(parentId, folderName, TYPE_CM_FOLDER, null).getId();
+
+        // Create multipart request - pdf file
+        String fileName = "quick.pdf";
+        File file = getResourceFile(fileName);
+        MultiPartRequest reqBody = MultiPartBuilder.create()
+                                                   .setFileData(new FileData(fileName, file))
+                                                   .build();
+        Map<String, String> params = Collections.singletonMap("include", "properties");
+
+        // Upload quick.pdf file into 'folder' - do not include request to create 'doclib' thumbnail
+        HttpResponse response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), params, null, "alfresco", reqBody.getContentType(), 201);
+        Document document1 = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String contentNodeId = document1.getId();
+        assertNotNull(document1.getProperties());
+
+        // pause briefly
+        Thread.sleep(DELAY_IN_MS);
+
+        // Get rendition (not created yet) information for node
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), RENDITION_NAME, 200);
+        Rendition rendition = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Rendition.class);
+        assertNotNull(rendition);
+        assertEquals(Rendition.RenditionStatus.NOT_CREATED, rendition.getStatus());
+
+        params = new HashMap<>();
+        params.put("placeholder", "false");
+        getSingle(getNodeRenditionsUrl(contentNodeId), (RENDITION_NAME + "/content"), params, 404);
+
+        // Create and get 'imgpreview' rendition
+        rendition = createAndGetRendition(contentNodeId, RENDITION_NAME);
+        assertNotNull(rendition);
+
+        params = new HashMap<>();
+        params.put("placeholder", "false");
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), (RENDITION_NAME + "/content"), params, 200);
+
+        byte[] renditionBytes1 = response.getResponseAsBytes();
+        assertNotNull(renditionBytes1);
+
+        // check node details ...
+        params = Collections.singletonMap("include", "properties");
+        response = getSingle(NodesEntityResource.class, contentNodeId, params, 200);
+        Document document1b = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals(document1b.getModifiedByUser().getId(), document1.getModifiedByUser().getId());
+
+        // upload another version of "quick.pdf" and check again
+        fileName = "quick-2.pdf";
+        file = getResourceFile(fileName);
+        reqBody = MultiPartBuilder.create()
+                                  .setFileData(new FileData("quick.pdf", file))
+                                  .setOverwrite(true)
+                                  .build();
+
+        response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, null, "alfresco", reqBody.getContentType(), 201);
+        Document document2 = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        assertEquals(contentNodeId, document2.getId());
+
+        // wait to allow new version of the rendition to be created ...
+        Thread.sleep(DELAY_IN_MS * 4);
+
+        params = new HashMap<>();
+        params.put("placeholder", "false");
+        response = getSingle(getNodeRenditionsUrl(contentNodeId), (RENDITION_NAME + "/content"), params, 200);
+        assertNotNull(response.getResponseAsBytes());
+
+        // check rendition binary has changed
+        assertNotEquals(renditionBytes1, response.getResponseAsBytes());
+
+        params = Collections.singletonMap("include", "properties");
+        response = getSingle(NodesEntityResource.class, contentNodeId, params, 200);
+        Document document2b = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        String contentNodeId2b = document2b.getId();
+        HttpResponse dauResponse = post(getRequestVersionRenditionContentDirectUrl(contentNodeId2b, "1.0", RENDITION_NAME), null, null, null, null, 501);
+    }
+
+    @Test
+    public void testRequestVersionRenditionContentDirectUrlErrorResponses () throws Exception
+    {
+        setRequestContext(user1);
+
+        String folderNodeId = createUniqueFolder(getMyNodeId());
+        String contentNodeId = createUniqueContent(folderNodeId);
+        createVersionRendition(contentNodeId, "1.0", "doclib");
+
+        // REST direct access URLs must be enabled in order to test DAU error responses
+        enableRestDirectAccessUrls();
+
+        // Test error response for node does not exist
+        HttpResponse dauResponseForNoSuchNode = post(getRequestVersionRenditionContentDirectUrl("nosuchnode", "1.0", "doclib"), null, 404);
+
+        // Test error response for node is not a file
+        HttpResponse dauResponseForNodeIsNotAFile = post(getRequestVersionRenditionContentDirectUrl(folderNodeId, "1.0", "doclib"), null, 400);
+
+        // Test error response for version does not exist
+        HttpResponse dauResponseForNoSuchVersion = post(getRequestVersionRenditionContentDirectUrl(contentNodeId, "2.0", "doclib"), null, 404);
+
+        // Test error response for rendition does not exist
+        HttpResponse dauResponseForNoSuchRendition = post(getRequestVersionRenditionContentDirectUrl(contentNodeId, "1.0", "avatar"), null, 404);
+
+        disableRestDirectAccessUrls();
+    }
+
     private void checkCreateAndGetVersionRendition(String docId, String versionId, String renditionId) throws Exception
     {
         String getRenditionsUrl;
@@ -361,6 +505,12 @@ public class NodeVersionRenditionsApiTest extends AbstractSingleNetworkSiteTest
         assertTrue(contentInfo.getSizeInBytes() > 0);
     }
 
+    private void createVersionRendition(String contentNodeId, String versionId, String renditionId) throws Exception
+    {
+        getAll(getNodeVersionRenditionsUrl(contentNodeId, versionId), null, 200);
+        checkCreateAndGetVersionRendition(contentNodeId, versionId, renditionId);
+    }
+
     @Override
     public String getScope()
     {

remote-api/src/test/java/org/alfresco/rest/api/tests/NodeVersionsApiTest.java

@@ -25,6 +25,7 @@
  */
 package org.alfresco.rest.api.tests;
 
+import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.rest.AbstractSingleNetworkSiteTest;
 import org.alfresco.rest.api.Nodes;
 import org.alfresco.rest.api.model.VersionOptions;
@@ -33,6 +34,7 @@ import org.alfresco.rest.api.tests.client.HttpResponse;
 import org.alfresco.rest.api.tests.client.PublicApiClient;
 import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
 import org.alfresco.rest.api.tests.client.PublicApiHttpClient;
+import org.alfresco.rest.api.tests.client.data.ContentInfo;
 import org.alfresco.rest.api.tests.client.data.Document;
 import org.alfresco.rest.api.tests.client.data.Node;
 import org.alfresco.rest.api.tests.util.RestApiUtil;
@@ -1083,6 +1085,50 @@ public class NodeVersionsApiTest extends AbstractSingleNetworkSiteTest
         }
     }
 
+    @Test
+    public void testRequestVersionsContentDirectUrl() throws Exception
+    {
+        setRequestContext(user1);
+
+        String myNodeId = getMyNodeId();
+
+        Document d1 = new Document();
+        d1.setName("d1.txt");
+        d1.setNodeType(TYPE_CM_CONTENT);
+
+        // create *empty* text file - as of now, versioning is not enabled by default
+        HttpResponse response = post(getNodeChildrenUrl(myNodeId), toJsonAsStringNonNull(d1), 201);
+        Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+
+        String docId = documentResp.getId();
+        assertFalse(documentResp.getAspectNames().contains("cm:versionable"));
+        assertNull(documentResp.getProperties()); // no properties (ie. no "cm:versionLabel")
+
+        int majorVersion = 1;
+        int minorVersion = 0;
+
+        String content = "The quick brown fox jumps over the lazy dog ";
+
+        Map<String, String> params = new HashMap<>();
+        params.put("comment", "my version ");
+
+        documentResp = updateTextFile(docId, content, params);
+        assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+        assertNotNull(documentResp.getProperties());
+        assertEquals(majorVersion+"."+minorVersion, documentResp.getProperties().get("cm:versionLabel"));
+
+        final String contentNodeId = documentResp.getId();
+
+        // Check the upload response
+        assertNotNull(documentResp.getProperties());
+        assertTrue(documentResp.getAspectNames().contains("cm:versionable"));
+        ContentInfo contentInfo = documentResp.getContent();
+        assertNotNull(contentInfo);
+        assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, contentInfo.getMimeType());
+
+        HttpResponse dauResponse = post(getRequestVersionDirectAccessUrl(contentNodeId, majorVersion+"."+minorVersion), null, null, null, null, 501);
+    }
+
     /**
      * Test version creation when updating file binary content.
      *

remote-api/src/test/java/org/alfresco/rest/api/tests/RenditionsTest.java

@@ -515,6 +515,51 @@ public class RenditionsTest extends AbstractBaseApiTest
         }
     }
 
+    @Test
+    public void testRequestRenditionContentDirectUrl() throws Exception
+    {
+        setRequestContext(user1);
+
+        RepoService.TestNetwork networkN1;
+        RepoService.TestPerson userOneN1;
+        Site userOneN1Site;
+
+        networkN1 = repoService.createNetworkWithAlias("ping", true);
+        networkN1.create();
+        userOneN1 = networkN1.createUser();
+
+        setRequestContext(networkN1.getId(), userOneN1.getId(), null);
+
+        String siteTitle = "RandomSite" + System.currentTimeMillis();
+        userOneN1Site = createSite(siteTitle, SiteVisibility.PRIVATE);
+
+        // Create a folder within the site document's library
+        String folderName = "folder" + System.currentTimeMillis();
+        String parentId = getSiteContainerNodeId(userOneN1Site.getId(), "documentLibrary");
+        String folder_Id = createNode(parentId, folderName, TYPE_CM_FOLDER, null).getId();
+
+        // Create multipart request - pdf file
+        String renditionName = "doclib";
+        String fileName = "quick.pdf";
+        File file = getResourceFile(fileName);
+        MultiPartRequest reqBody = MultiPartBuilder.create()
+                .setFileData(new FileData(fileName, file))
+                .setRenditions(Collections.singletonList(renditionName))
+                .build();
+
+        // Upload quick.pdf file into 'folder' - including request to create 'doclib' thumbnail
+        HttpResponse response = post(getNodeChildrenUrl(folder_Id), reqBody.getBody(), null, reqBody.getContentType(), 201);
+        Document document = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
+        String contentNodeId = document.getId();
+
+        // wait and check that rendition is created ...
+        Rendition rendition = waitAndGetRendition(contentNodeId, null, renditionName);
+        assertNotNull(rendition);
+        assertEquals(Rendition.RenditionStatus.CREATED, rendition.getStatus());
+
+        HttpResponse dauResponse = post(getRequestRenditionDirectAccessUrl(contentNodeId, renditionName), null, null, null, null, 501);
+    }
+
     /**
      * Tests create rendition when on upload/create of a file
      *

repository/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>14.92-SNAPSHOT</version>
+        <version>14.121</version>
     </parent>
 
     <dependencies>
@@ -46,6 +46,10 @@
                     <groupId>com.sun.mail</groupId>
                     <artifactId>javax.mail</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -198,24 +202,6 @@
             <artifactId>maven-artifact</artifactId>
             <version>${dependency.maven-artifact.version}</version>
         </dependency>
-        <dependency>
-            <groupId>de.schlichtherle.truezip</groupId>
-            <artifactId>truezip-driver-zip</artifactId>
-            <version>${dependency.truezip.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>de.schlichtherle.truezip</groupId>
-            <artifactId>truezip-file</artifactId>
-            <version>${dependency.truezip.version}</version>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.code.findbugs</groupId>
-                    <artifactId>annotations</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>com.sun.pdfview</groupId>
             <artifactId>pdfrenderer</artifactId>
@@ -237,7 +223,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-reload4j</artifactId>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
@@ -432,7 +418,7 @@
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis-spring</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
         </dependency>
 
         <!-- Activiti -->
@@ -670,7 +656,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-spring</artifactId>
+            <artifactId>camel-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-spring-xml</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>

repository/src/main/java/org/alfresco/repo/content/AbstractRoutingContentStore.java

@@ -35,7 +35,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.cache.SimpleCache;
-import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
@@ -425,7 +424,6 @@ public abstract class AbstractRoutingContentStore implements ContentStore
      * {@inheritDoc}
      */
     @Override
-    @Experimental
     public Map<String, String> getStorageProperties(String contentUrl)
     {
         ContentStore contentStore = selectReadStore(contentUrl);
@@ -445,7 +443,6 @@ public abstract class AbstractRoutingContentStore implements ContentStore
      * {@inheritDoc}
      */
     @Override
-    @Experimental
     public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
     {
         final ContentStore contentStore = selectReadStore(contentUrl);
@@ -463,7 +460,6 @@ public abstract class AbstractRoutingContentStore implements ContentStore
      * {@inheritDoc}
      */
     @Override
-    @Experimental
     public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
     {
         final ContentStore contentStore = selectReadStore(contentUrl);

repository/src/main/java/org/alfresco/repo/content/ContentServiceImpl.java

@@ -46,7 +46,6 @@ import org.alfresco.repo.policy.ClassPolicyDelegate;
 import org.alfresco.repo.policy.JavaBehaviour;
 import org.alfresco.repo.policy.PolicyComponent;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
-import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.dictionary.InvalidTypeException;
@@ -668,7 +667,6 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
      * {@inheritDoc}
      */
     @Override
-    @Experimental
     public Map<String, String> getStorageProperties(NodeRef nodeRef, QName propertyQName)
     {
         final ContentData contentData = getContentDataOrThrowError(nodeRef, propertyQName);

repository/src/main/java/org/alfresco/repo/content/caching/CachingContentStore.java

@@ -37,7 +37,6 @@ import org.alfresco.repo.content.caching.quota.QuotaManagerStrategy;
 import org.alfresco.repo.content.caching.quota.UnlimitedQuotaStrategy;
 import org.alfresco.repo.content.filestore.FileContentStore;
 import org.alfresco.repo.content.filestore.SpoofedTextContentReader;
-import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentStreamListener;
@@ -387,7 +386,6 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
      * {@inheritDoc}
      */
     @Override
-    @Experimental
     public Map<String, String> getStorageProperties(final String contentUrl)
     {
         return backingStore.getStorageProperties(contentUrl);
@@ -397,7 +395,6 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
      * {@inheritDoc}
      */
     @Override
-    @Experimental
     public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
     {
         return backingStore.requestSendContentToArchive(contentUrl, archiveParams);
@@ -407,7 +404,6 @@ public class CachingContentStore implements ContentStore, ApplicationEventPublis
      * {@inheritDoc}
      */
     @Override
-    @Experimental
     public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
     {
         return backingStore.requestRestoreContentFromArchive(contentUrl, restoreParams);

repository/src/main/java/org/alfresco/repo/content/replication/AggregatingContentStore.java

@@ -40,7 +40,6 @@ import org.alfresco.repo.content.ContentContext;
 import org.alfresco.repo.content.ContentStore;
 import org.alfresco.repo.content.UnsupportedContentUrlException;
 import org.alfresco.repo.content.caching.CachingContentStore;
-import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
@@ -403,7 +402,6 @@ public class AggregatingContentStore extends AbstractContentStore
      * {@inheritDoc}
      */
     @Override
-    @Experimental
     public Map<String, String> getStorageProperties(String contentUrl)
     {
         checkPrimaryStore();
@@ -457,7 +455,6 @@ public class AggregatingContentStore extends AbstractContentStore
     /**
      * {@inheritDoc}
      */
-    @Experimental
     @Override
     public boolean requestSendContentToArchive(final String contentUrl, Map<String, Serializable> archiveParams)
     {
@@ -467,7 +464,6 @@ public class AggregatingContentStore extends AbstractContentStore
     /**
      * {@inheritDoc}
      */
-    @Experimental
     @Override
     public boolean requestRestoreContentFromArchive(final String contentUrl, final Map<String, Serializable> restoreParams)
     {

repository/src/main/java/org/alfresco/repo/content/transform/AbstractLocalTransform.java

@@ -86,6 +86,7 @@ public abstract class AbstractLocalTransform implements LocalTransform
                                           String renditionName, NodeRef sourceNodeRef)
             throws UnsupportedTransformationException, ContentIOException;
 
+    @Override
     public String getName()
     {
         return name;

repository/src/main/java/org/alfresco/repo/content/transform/DummyTransformServiceRegistry.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2019 Alfresco Software Limited
+ * Copyright (C) 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
@@ -25,6 +25,7 @@
  */
 package org.alfresco.repo.content.transform;
 
+import org.alfresco.transform.client.model.config.CoreFunction;
 import org.alfresco.transform.client.registry.TransformServiceRegistry;
 
 import java.util.Map;
@@ -49,4 +50,10 @@ public class DummyTransformServiceRegistry implements TransformServiceRegistry
     {
         return null;
     }
+
+    @Override
+    public boolean isSupported(CoreFunction function, String transformerName)
+    {
+        return true;
+    }
 }

repository/src/main/java/org/alfresco/repo/content/transform/LocalPipelineTransform.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2019 Alfresco Software Limited
+ * Copyright (C) 2019-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
@@ -39,6 +39,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL;
+
 /**
  * Transformer that passes a document through a pipeline of transformations to arrive at an target mimetype.
  *
@@ -118,6 +120,8 @@ public class LocalPipelineTransform extends AbstractLocalTransform
 
             transformer.intermediateTransformer.transform(currentReader, currentWriter, transformOptions, renditionName, sourceNodeRef);
 
+            removeDirectAccessUrlAfterFirstTransform(transformOptions);
+
             // Clear the sourceNodeRef after the first transformation to avoid later transformers thinking the
             // intermediate file is the original node.
             if (i == 0)
@@ -132,4 +136,9 @@ public class LocalPipelineTransform extends AbstractLocalTransform
             }
         }
     }
+
+    private void removeDirectAccessUrlAfterFirstTransform(Map<String, String> transformOptions)
+    {
+        transformOptions.remove(DIRECT_ACCESS_URL);
+    }
 }

repository/src/main/java/org/alfresco/repo/content/transform/LocalTransform.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2019 Alfresco Software Limited
+ * Copyright (C) 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
@@ -54,4 +54,9 @@ public interface LocalTransform
     void transform(ContentReader reader, ContentWriter writer, Map<String, String> transformOptions,
                    String renditionName, NodeRef sourceNodeRef)
             throws UnsupportedTransformationException, ContentIOException;
+
+    /**
+     * @return the name of the transform.
+     */
+    String getName();
 }

repository/src/main/java/org/alfresco/repo/content/transform/LocalTransformServiceRegistry.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2019 - 2021 Alfresco Software Limited
+ * Copyright (C) 2019 - 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
@@ -36,6 +36,7 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.transform.client.model.config.CoreFunction;
 import org.alfresco.transform.client.model.config.TransformOptionGroup;
 import org.alfresco.transform.client.registry.CombinedConfig;
 import org.alfresco.transform.client.model.config.TransformOption;
@@ -473,4 +474,17 @@ public class LocalTransformServiceRegistry extends TransformServiceRegistryImpl
         }
         return localTransform;
     }
+
+    /**
+     * Returns {@code true} if the {@code function} is supported by the transform. Not all transforms are
+     * able to support all functionality, as newer features may have been introduced into the core t-engine code since
+     * it was released.
+     * @param function to be checked.
+     * @param transform the local transform.
+     * @return {@code true} is supported, {@code false} otherwise.
+     */
+    public boolean isSupported(CoreFunction function, LocalTransform transform)
+    {
+        return isSupported(function, transform.getName());
+    }
 }

repository/src/main/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java

@@ -352,13 +352,20 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
         }
 
         /**
-         * Looks the node up based on the NodeRef of the given node
+         * Looks the entity up based on the ContentURL of the given node
          */
         @Override
         public Pair<Long, ContentUrlEntity> findByValue(ContentUrlEntity entity)
         {
             String contentUrl = entity.getContentUrl();
             ContentUrlEntity ret = getContentUrlEntity(contentUrl);
+            // Validate if this entity has exactly the value we are looking for or if it is a CRC collision
+            if (ret != null && !entity.getContentUrl().equals(ret.getContentUrl()))
+            {
+                throw new IllegalArgumentException("Collision detected for this contentURL. '" + entity.getContentUrl()
+                        + "' collides with existing contentURL '" + ret.getContentUrl() + "'. (ContentUrlShort;ContentUrlCrc) pair collision: ('"
+                        + entity.getContentUrlShort() + "';'" + entity.getContentUrlCrc() + "')");
+            }
             return (ret != null ? new Pair<Long, ContentUrlEntity>(ret.getId(), ret) : null);
         }
 

repository/src/main/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java

@@ -1,106 +1,106 @@
-/*
+/*
  * #%L
  * Alfresco Repository
  * %%
- * 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 
  * 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%
- */
+ * 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.node.db;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.model.ContentModel;
-import org.alfresco.repo.domain.node.ChildAssocEntity;
-import org.alfresco.repo.domain.node.Node;
-import org.alfresco.repo.domain.node.NodeDAO;
-import org.alfresco.repo.domain.node.NodeDAO.ChildAssocRefQueryCallback;
-import org.alfresco.repo.domain.node.NodeExistsException;
-import org.alfresco.repo.domain.qname.QNameDAO;
-import org.alfresco.repo.node.AbstractNodeServiceImpl;
-import org.alfresco.repo.node.StoreArchiveMap;
-import org.alfresco.repo.node.archive.NodeArchiveService;
-import org.alfresco.repo.node.db.NodeHierarchyWalker.VisitedNode;
-import org.alfresco.repo.node.db.traitextender.NodeServiceExtension;
-import org.alfresco.repo.node.db.traitextender.NodeServiceTrait;
-import org.alfresco.repo.policy.BehaviourFilter;
-import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
-import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
-import org.alfresco.repo.transaction.RetryingTransactionHelper;
-import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
-import org.alfresco.repo.transaction.TransactionalResourceHelper;
-import org.alfresco.service.cmr.dictionary.AspectDefinition;
-import org.alfresco.service.cmr.dictionary.AssociationDefinition;
-import org.alfresco.service.cmr.dictionary.ChildAssociationDefinition;
-import org.alfresco.service.cmr.dictionary.ClassDefinition;
-import org.alfresco.service.cmr.dictionary.InvalidAspectException;
-import org.alfresco.service.cmr.dictionary.InvalidTypeException;
-import org.alfresco.service.cmr.dictionary.PropertyDefinition;
-import org.alfresco.service.cmr.dictionary.TypeDefinition;
-import org.alfresco.service.cmr.repository.AssociationExistsException;
-import org.alfresco.service.cmr.repository.AssociationRef;
-import org.alfresco.service.cmr.repository.ChildAssociationRef;
-import org.alfresco.service.cmr.repository.InvalidChildAssociationRefException;
-import org.alfresco.service.cmr.repository.InvalidNodeRefException;
-import org.alfresco.service.cmr.repository.InvalidStoreRefException;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeRef.Status;
-import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.repository.Path;
-import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
-import org.alfresco.service.cmr.security.AccessPermission;
-import org.alfresco.service.cmr.security.AccessStatus;
-import org.alfresco.service.cmr.security.OwnableService;
-import org.alfresco.service.cmr.security.PermissionService;
-import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.service.namespace.QName;
-import org.alfresco.service.namespace.QNamePattern;
-import org.alfresco.service.namespace.RegexQNamePattern;
-import org.alfresco.traitextender.AJProxyTrait;
-import org.alfresco.traitextender.Extend;
-import org.alfresco.traitextender.ExtendedTrait;
-import org.alfresco.traitextender.Extensible;
-import org.alfresco.traitextender.Trait;
-import org.alfresco.util.EqualsHelper;
-import org.alfresco.util.GUID;
-import org.alfresco.util.Pair;
-import org.alfresco.util.ParameterCheck;
-import org.alfresco.util.PropertyMap;
-import org.alfresco.util.transaction.TransactionListenerAdapter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.domain.node.ChildAssocEntity;
+import org.alfresco.repo.domain.node.Node;
+import org.alfresco.repo.domain.node.NodeDAO;
+import org.alfresco.repo.domain.node.NodeDAO.ChildAssocRefQueryCallback;
+import org.alfresco.repo.domain.node.NodeExistsException;
+import org.alfresco.repo.domain.qname.QNameDAO;
+import org.alfresco.repo.node.AbstractNodeServiceImpl;
+import org.alfresco.repo.node.StoreArchiveMap;
+import org.alfresco.repo.node.archive.NodeArchiveService;
+import org.alfresco.repo.node.db.NodeHierarchyWalker.VisitedNode;
+import org.alfresco.repo.node.db.traitextender.NodeServiceExtension;
+import org.alfresco.repo.node.db.traitextender.NodeServiceTrait;
+import org.alfresco.repo.policy.BehaviourFilter;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
+import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.repo.transaction.TransactionalResourceHelper;
+import org.alfresco.service.cmr.dictionary.AspectDefinition;
+import org.alfresco.service.cmr.dictionary.AssociationDefinition;
+import org.alfresco.service.cmr.dictionary.ChildAssociationDefinition;
+import org.alfresco.service.cmr.dictionary.ClassDefinition;
+import org.alfresco.service.cmr.dictionary.InvalidAspectException;
+import org.alfresco.service.cmr.dictionary.InvalidTypeException;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
+import org.alfresco.service.cmr.dictionary.TypeDefinition;
+import org.alfresco.service.cmr.repository.AssociationExistsException;
+import org.alfresco.service.cmr.repository.AssociationRef;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.InvalidChildAssociationRefException;
+import org.alfresco.service.cmr.repository.InvalidNodeRefException;
+import org.alfresco.service.cmr.repository.InvalidStoreRefException;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeRef.Status;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.cmr.security.AccessPermission;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.OwnableService;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.QNamePattern;
+import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.traitextender.AJProxyTrait;
+import org.alfresco.traitextender.Extend;
+import org.alfresco.traitextender.ExtendedTrait;
+import org.alfresco.traitextender.Extensible;
+import org.alfresco.traitextender.Trait;
+import org.alfresco.util.EqualsHelper;
+import org.alfresco.util.GUID;
+import org.alfresco.util.Pair;
+import org.alfresco.util.ParameterCheck;
+import org.alfresco.util.PropertyMap;
+import org.alfresco.util.transaction.TransactionListenerAdapter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
@@ -844,26 +844,25 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
         // get the node
         final Pair<Long, NodeRef> nodePair = getNodePairNotNull(nodeRef);
         final Long nodeId = nodePair.getFirst();
-        
-        boolean hadAspect = nodeDAO.hasNodeAspect(nodeId, aspectTypeQName);
-        
+
+        if (!nodeDAO.hasNodeAspect(nodeId, aspectTypeQName))
+        {
+            return;
+        }
         // Invoke policy behaviours
         invokeBeforeUpdateNode(nodeRef);
-        if (hadAspect)
-        {
-            invokeBeforeRemoveAspect(nodeRef, aspectTypeQName);
-            nodeDAO.removeNodeAspects(nodeId, Collections.singleton(aspectTypeQName));
-        }
-        
+        invokeBeforeRemoveAspect(nodeRef, aspectTypeQName);
+        nodeDAO.removeNodeAspects(nodeId, Collections.singleton(aspectTypeQName));
+
         AspectDefinition aspectDef = dictionaryService.getAspect(aspectTypeQName);
         boolean updated = false;
         if (aspectDef != null)
         {
             // Remove default properties
-            Map<QName,PropertyDefinition> propertyDefs = aspectDef.getProperties();
+            Map<QName, PropertyDefinition> propertyDefs = aspectDef.getProperties();
             Set<QName> propertyToRemoveQNames = propertyDefs.keySet();
             nodeDAO.removeNodeProperties(nodeId, propertyToRemoveQNames);
-            
+
             // Remove child associations
             // We have to iterate over the associations and remove all those between the parent and child
             final List<Pair<Long, ChildAssociationRef>> assocsToDelete = new ArrayList<Pair<Long, ChildAssociationRef>>(5);
@@ -875,29 +874,24 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
                     return true;
                 }
 
-                @Override
-                public boolean orderResults()
+                @Override public boolean orderResults()
                 {
                     return false;
                 }
 
-                public boolean handle(
-                        Pair<Long, ChildAssociationRef> childAssocPair,
-                        Pair<Long, NodeRef> parentNodePair,
-                        Pair<Long, NodeRef> childNodePair
-                        )
+                public boolean handle(Pair<Long, ChildAssociationRef> childAssocPair, Pair<Long, NodeRef> parentNodePair,
+                            Pair<Long, NodeRef> childNodePair)
                 {
                     if (isPendingDelete(parentNodePair.getSecond()) || isPendingDelete(childNodePair.getSecond()))
                     {
                         if (logger.isTraceEnabled())
                         {
-                            logger.trace(
-                                    "Aspect-triggered association removal: " +
-                                    "Ignoring child associations where one of the nodes is pending delete: " + childAssocPair);
+                            logger.trace("Aspect-triggered association removal: "
+                                        + "Ignoring child associations where one of the nodes is pending delete: " + childAssocPair);
                         }
                         return true;
                     }
-                    
+
                     // Double check that it's not a primary association.  If so, we can't delete it and
                     //    have to delete the child node directly and with full archival.
                     if (childAssocPair.getSecond().isPrimary())
@@ -914,7 +908,7 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
 
                 public void done()
                 {
-                }                               
+                }
             };
             // Get all the QNames to remove
             Set<QName> assocTypeQNamesToRemove = new HashSet<QName>(aspectDef.getChildAssociations().keySet());
@@ -930,14 +924,14 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
                 nodeDAO.deleteChildAssoc(assocId);
                 invokeOnDeleteChildAssociation(assocRef);
             }
-            
+
             // Cascade-delete any nodes that were attached to primary associations
             for (Pair<Long, NodeRef> childNodePair : nodesToDelete)
             {
                 NodeRef childNodeRef = childNodePair.getSecond();
                 this.deleteNode(childNodeRef);
             }
-            
+
             // Gather peer associations to delete
             Map<QName, AssociationDefinition> nodeAssocDefs = aspectDef.getAssociations();
             List<Long> nodeAssocIdsToRemove = new ArrayList<Long>(13);
@@ -949,8 +943,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
                     if (logger.isTraceEnabled())
                     {
                         logger.trace(
-                                "Aspect-triggered association removal: " +
-                                "Ignoring peer associations where one of the nodes is pending delete: " + nodeRef);
+                                    "Aspect-triggered association removal: " + "Ignoring peer associations where one of the nodes is pending delete: "
+                                                + nodeRef);
                     }
                     continue;
                 }
@@ -967,9 +961,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
                     {
                         if (logger.isTraceEnabled())
                         {
-                            logger.trace(
-                                    "Aspect-triggered association removal: " +
-                                    "Ignoring peer associations where one of the nodes is pending delete: " + assocPair);
+                            logger.trace("Aspect-triggered association removal: "
+                                        + "Ignoring peer associations where one of the nodes is pending delete: " + assocPair);
                         }
                         continue;
                     }
@@ -990,16 +983,15 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
             }
             updated = updated || assocsDeleted > 0;
         }
-        
+
         // Invoke policy behaviours
         if (updated)
         {
             invokeOnUpdateNode(nodeRef);
         }
-        if (hadAspect)
-        {
-            invokeOnRemoveAspect(nodeRef, aspectTypeQName);
-        }
+
+        invokeOnRemoveAspect(nodeRef, aspectTypeQName);
+
     }
 
     /**

repository/src/main/java/org/alfresco/repo/rendition2/LocalSynchronousTransformClient.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2021 Alfresco Software Limited
+ * Copyright (C) 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
@@ -29,15 +29,22 @@ import org.alfresco.repo.content.transform.LocalTransform;
 import org.alfresco.repo.content.transform.LocalTransformServiceRegistry;
 import org.alfresco.repo.content.transform.UnsupportedTransformationException;
 import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.DirectAccessUrl;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.transform.client.model.config.CoreFunction;
 import org.alfresco.util.PropertyCheck;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 
+import java.util.HashMap;
 import java.util.Map;
 
+import static org.alfresco.model.ContentModel.PROP_CONTENT;
+import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL;
+
 /**
  * Request synchronous transforms.
  *
@@ -51,16 +58,30 @@ public class LocalSynchronousTransformClient implements SynchronousTransformClie
     private static Log logger = LogFactory.getLog(LocalTransformClient.class);
 
     private LocalTransformServiceRegistry localTransformServiceRegistry;
+    private ContentService contentService;
+    private boolean directAccessUrlEnabled;
 
     public void setLocalTransformServiceRegistry(LocalTransformServiceRegistry localTransformServiceRegistry)
     {
         this.localTransformServiceRegistry = localTransformServiceRegistry;
     }
 
+    public void setContentService(ContentService contentService)
+    {
+        this.contentService = contentService;
+    }
+
+    public void setDirectAccessUrlEnabled(boolean directAccessUrlEnabled)
+    {
+        this.directAccessUrlEnabled = directAccessUrlEnabled;
+    }
+
     @Override
     public void afterPropertiesSet() throws Exception
     {
         PropertyCheck.mandatory(this, "localTransformServiceRegistry", localTransformServiceRegistry);
+        PropertyCheck.mandatory(this, "contentService", contentService);
+        PropertyCheck.mandatory(this, "transformDirectAccessUrlEnabled", directAccessUrlEnabled);
     }
 
     @Override
@@ -123,6 +144,7 @@ public class LocalSynchronousTransformClient implements SynchronousTransformClie
                 logger.debug(TRANSFORM + "requested " + renditionName);
             }
 
+            actualOptions = addDirectAccessUrlToOptionsIfPossible(actualOptions, sourceNodeRef, transform);
             transform.transform(reader, writer, actualOptions, renditionName, sourceNodeRef);
 
             if (logger.isDebugEnabled())
@@ -140,6 +162,20 @@ public class LocalSynchronousTransformClient implements SynchronousTransformClie
         }
     }
 
+    private Map<String, String> addDirectAccessUrlToOptionsIfPossible(Map<String, String> actualOptions,
+                                                                      NodeRef sourceNodeRef, LocalTransform transform)
+    {
+        if (directAccessUrlEnabled &&
+            localTransformServiceRegistry.isSupported(CoreFunction.DIRECT_ACCESS_URL, transform) &&
+            contentService.isContentDirectUrlEnabled(sourceNodeRef, PROP_CONTENT))
+        {
+            DirectAccessUrl directAccessUrl = contentService.requestContentDirectUrl(sourceNodeRef, PROP_CONTENT, true);
+            actualOptions = new HashMap<>(actualOptions);
+            actualOptions.put(DIRECT_ACCESS_URL, directAccessUrl.getContentUrl());
+        }
+        return actualOptions;
+    }
+
     @Override
     public String getName()
     {

repository/src/main/java/org/alfresco/repo/rendition2/LocalTransformClient.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2019 Alfresco Software Limited
+ * Copyright (C) 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
@@ -32,18 +32,24 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.DirectAccessUrl;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.transform.client.model.config.CoreFunction;
 import org.alfresco.util.PropertyCheck;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 
 import java.io.InputStream;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import static org.alfresco.model.ContentModel.PROP_CONTENT;
+import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL;
+
 /**
  * Requests rendition transforms take place using transforms available on the local machine (based on
  * {@link LocalTransform}. The transform and consumption of the
@@ -61,6 +67,7 @@ public class LocalTransformClient implements TransformClient, InitializingBean
     private TransactionService transactionService;
     private ContentService contentService;
     private RenditionService2Impl renditionService2;
+    private boolean directAccessUrlEnabled;
 
     private ExecutorService executorService;
     private ThreadLocal<LocalTransform> transform = new ThreadLocal<>();
@@ -85,6 +92,11 @@ public class LocalTransformClient implements TransformClient, InitializingBean
         this.renditionService2 = renditionService2;
     }
 
+    public void setDirectAccessUrlEnabled(boolean directAccessUrlEnabled)
+    {
+        this.directAccessUrlEnabled = directAccessUrlEnabled;
+    }
+
     public void setExecutorService(ExecutorService executorService)
     {
         this.executorService = executorService;
@@ -97,6 +109,7 @@ public class LocalTransformClient implements TransformClient, InitializingBean
         PropertyCheck.mandatory(this, "transactionService", transactionService);
         PropertyCheck.mandatory(this, "contentService", contentService);
         PropertyCheck.mandatory(this, "renditionService2", renditionService2);
+        PropertyCheck.mandatory(this, "directAccessUrlEnabled", directAccessUrlEnabled);
         if (executorService == null)
         {
             executorService = Executors.newCachedThreadPool();
@@ -130,8 +143,9 @@ public class LocalTransformClient implements TransformClient, InitializingBean
     {
         String renditionName = renditionDefinition.getRenditionName();
         String targetMimetype = renditionDefinition.getTargetMimetype();
-        Map<String, String> actualOptions = renditionDefinition.getTransformOptions();
+        Map<String, String> renditionOptions = renditionDefinition.getTransformOptions();
         LocalTransform localTransform = transform.get();
+        Map<String, String> actualOptions = addDirectAccessUrlToOptionsIfPossible(renditionOptions, sourceNodeRef, localTransform);
 
         executorService.submit(() ->
         {
@@ -187,4 +201,18 @@ public class LocalTransformClient implements TransformClient, InitializingBean
                 }), user);
         });
     }
+
+    private Map<String, String> addDirectAccessUrlToOptionsIfPossible(Map<String, String> actualOptions,
+                                                                      NodeRef sourceNodeRef, LocalTransform transform)
+    {
+        if (directAccessUrlEnabled &&
+            localTransformServiceRegistry.isSupported(CoreFunction.DIRECT_ACCESS_URL, transform) &&
+            contentService.isContentDirectUrlEnabled(sourceNodeRef, PROP_CONTENT))
+        {
+            DirectAccessUrl directAccessUrl = contentService.requestContentDirectUrl(sourceNodeRef, PROP_CONTENT, true);
+            actualOptions = new HashMap<>(actualOptions);
+            actualOptions.put(DIRECT_ACCESS_URL, directAccessUrl.getContentUrl());
+        }
+        return actualOptions;
+    }
 }

repository/src/main/java/org/alfresco/repo/rendition2/SwitchingTransformServiceRegistry.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2020 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
@@ -25,6 +25,7 @@
  */
 package org.alfresco.repo.rendition2;
 
+import org.alfresco.transform.client.model.config.CoreFunction;
 import org.alfresco.transform.client.registry.TransformServiceRegistry;
 
 import java.util.Map;
@@ -78,4 +79,10 @@ public class SwitchingTransformServiceRegistry implements TransformServiceRegist
         }
         return name;
     }
+
+    @Override
+    public boolean isSupported(CoreFunction function, String transformerName)
+    {
+        return primary.isSupported(function, transformerName) && secondary.isSupported(function, transformerName);
+    }
 }

repository/src/main/java/org/alfresco/repo/tenant/AbstractTenantRoutingContentStore.java

@@ -43,7 +43,6 @@ import org.alfresco.repo.domain.tenant.TenantEntity;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
-import org.alfresco.service.Experimental;
 import org.alfresco.service.transaction.TransactionService;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
@@ -276,7 +275,6 @@ public abstract class AbstractTenantRoutingContentStore extends AbstractRoutingC
     /**
      * {@inheritDoc}
      */
-    @Experimental
     @Override
     public Map<String, String> getStorageProperties(String contentUrl)
     {
@@ -287,7 +285,6 @@ public abstract class AbstractTenantRoutingContentStore extends AbstractRoutingC
      * {@inheritDoc}
      */
     @Override
-    @Experimental
     public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
     {
         return getTenantContentStore().requestSendContentToArchive(contentUrl, archiveParams);
@@ -297,7 +294,6 @@ public abstract class AbstractTenantRoutingContentStore extends AbstractRoutingC
      * {@inheritDoc}
      */
     @Override
-    @Experimental
     public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
     {
         return getTenantContentStore().requestRestoreContentFromArchive(contentUrl, restoreParams);

repository/src/main/java/org/alfresco/service/cmr/repository/ContentService.java

@@ -29,7 +29,6 @@ package org.alfresco.service.cmr.repository;
 import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.Auditable;
-import org.alfresco.service.Experimental;
 import org.alfresco.service.cmr.dictionary.InvalidTypeException;
 import org.alfresco.service.namespace.QName;
 
@@ -260,7 +259,6 @@ public interface ContentService
      * @return Returns a key-value (String-String) collection of storage headers/properties with their respective values for a given {@link NodeRef}.
      */
     @Auditable(parameters = {"nodeRef", "propertyQName"})
-    @Experimental
     default Map<String, String> getStorageProperties(NodeRef nodeRef, QName propertyQName)
     {
         return Collections.emptyMap();
@@ -270,7 +268,6 @@ public interface ContentService
      * Submit a request to send content to archive (offline) state.
      * If no connector is present or connector is not supporting sending to archive, then {@link UnsupportedOperationException} will be returned.
      * Specific connector will decide which storage class/tier will be set for content.
-     * This method is experimental and subject to changes.
      *
      * @param nodeRef a reference to a node having a content property
      * @param propertyQName the name of the property, which must be of type <b>content</b>
@@ -279,7 +276,6 @@ public interface ContentService
      * @throws UnsupportedOperationException when method not implemented
      */
     @Auditable(parameters = {"nodeRef", "propertyQName", "archiveParams"})
-    @Experimental
     default boolean requestSendContentToArchive(NodeRef nodeRef, QName propertyQName,
                                                 Map<String, Serializable> archiveParams)
     {
@@ -293,7 +289,6 @@ public interface ContentService
      * Keys of this map should be restricted to {@code ContentRestoreParams} enumeration.
      * For AWS S3 map can indicating expiry days, Glacier restore tier.
      * For Azure Blob map can indicate rehydrate priority.
-     * This method is experimental and subject to changes.
      *
      * @param nodeRef a reference to a node having a content property
      * @param propertyQName the name of the property, which must be of type <b>content</b>
@@ -302,7 +297,6 @@ public interface ContentService
      * @throws UnsupportedOperationException when method not implemented
      */
     @Auditable(parameters = {"nodeRef", "propertyQName", "restoreParams"})
-    @Experimental
     default boolean requestRestoreContentFromArchive(NodeRef nodeRef, QName propertyQName, Map<String, Serializable> restoreParams)
     {
         throw new UnsupportedOperationException("Request to restore content from archive is not supported by content service.");

repository/src/main/java/org/alfresco/transform/client/registry/CombinedConfig.java

@@ -47,6 +47,8 @@ import java.io.StringReader;
 import java.util.Collections;
 import java.util.List;
 
+import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM_CONFIG_LATEST;
+
 /**
  * This class reads multiple T-Engine config and local files and registers as if they were all
  * in one file. Transform options are shared between all sources.<p>
@@ -104,7 +106,7 @@ public class CombinedConfig extends CombinedTransformConfig
 
     private boolean addRemoteConfig(String baseUrl, String remoteType)
     {
-        String url = baseUrl + (baseUrl.endsWith("/") ? "" : "/") + "transform/config";
+        String url = baseUrl + (baseUrl.endsWith("/") ? "" : "/") + ENDPOINT_TRANSFORM_CONFIG_LATEST;
         HttpGet httpGet = new HttpGet(url);
         boolean successReadingConfig = true;
         try

repository/src/main/resources/alfresco/bootstrap/sitesSpace.xml

@@ -33,9 +33,12 @@
                      <view:properties>
                         <cm:description></cm:description>
                         <cm:name>extensions</cm:name>
+                        <cm:isIndexed>false</cm:isIndexed>
+                        <cm:isContentIndexed>false</cm:isContentIndexed>
                      </view:properties>
                      <view:aspects>
                         <sys:hidden/>
+                        <cm:indexControl/>
                     </view:aspects>
                   </cm:folder>
                </cm:contains>
@@ -50,9 +53,12 @@
                      <view:properties>
                         <cm:description></cm:description>
                         <cm:name>module-deployments</cm:name>
+                        <cm:isIndexed>false</cm:isIndexed>
+                        <cm:isContentIndexed>false</cm:isContentIndexed>
                      </view:properties>
                      <view:aspects>
                         <sys:hidden/>
+                        <cm:indexControl/>
                     </view:aspects>
                   </cm:folder>
                </cm:contains>