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

* ACS-2827: Initial commit

* ACS-2827: Fix build

* ACS-2827: Rename test files

* ACS-2827: Increase retry time

.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

@@ -26,13 +26,16 @@ branches:
 
 env:
   global:
+    - TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)
     - TAS_SCRIPTS=../alfresco-community-repo/packaging/tests/scripts
     - TAS_ENVIRONMENT=./packaging/tests/environment
     - LOG_WARN="-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
 
 stages:
+  - name: prepare
+    if: commit_message !~ /\[skip tests\]/ AND commit_message !~ /\[force[^\]]*\]/
   - name: test
-    if: commit_message !~ /\[skip tests\]/
+    if: commit_message !~ /\[skip tests\]/ AND commit_message !~ /\[force[^\]]*\]/
   - name: release
     if: commit_message !~ /\[no release\]/ AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND fork = false
   - name: update_downstream
@@ -43,7 +46,13 @@ install: travis_retry travis_wait 40 bash scripts/travis/build.sh
 
 jobs:
   include:
+    - name: "Prepare"
+      stage: prepare
+      install: skip
+      script: travis_retry travis_wait 80 bash scripts/travis/prepare.sh
+
     - name: "Source Clear Scan (SCA)"
+      stage: test
       if: branch = master OR branch =~ /release\/.*/
       # Run Veracode
       install: skip
@@ -51,43 +60,49 @@ jobs:
 
     - name: "Core, Data-Model, Repository - AllUnitTestsSuite - Build and test"
       if: commit_message !~ /\[skip repo\]/
+      install: skip
       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 core,data-model -am -DfailIfNoTests=false
+        - travis_retry mvn -B test -pl "repository,mmt" -am "-Dtest=AllUnitTestsSuite,AllMmtUnitTestSuite" -DfailIfNoTests=false
 
     - name: "Repository - AppContext01TestSuite"
       if: commit_message !~ /\[skip repo\]/
+      install: skip
       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
-      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
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AppContext01TestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContext02TestSuite"
       if: commit_message !~ /\[skip repo\]/
+      install: skip
       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
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext02TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AppContext02TestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContext03TestSuite"
       if: commit_message !~ /\[skip repo\]/
+      install: skip
       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
-      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
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AppContext03TestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContext04TestSuite"
       if: commit_message !~ /\[skip repo\]/
+      install: skip
       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
-      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
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AppContext04TestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContext05TestSuite"
       if: commit_message !~ /\[skip repo\]/
+      install: skip
       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
@@ -95,142 +110,161 @@ jobs:
         - cp repository/src/test/resources/realms/alfresco-realm.json "${HOME}/tmp"
         - export HOST_IP=$(hostname  -I | cut -f1 -d' ')
         - docker run -d -e KEYCLOAK_USER=admin -e KEYCLOAK_PASSWORD=admin -e DB_VENDOR=h2 -p 8999:8080 -e KEYCLOAK_IMPORT=/tmp/alfresco-realm.json -v $HOME/tmp/alfresco-realm.json:/tmp/alfresco-realm.json alfresco/alfresco-identity-service:1.2
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext05TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "-Didentity-service.auth-server-url=http://${HOST_IP}:8999/auth"
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AppContext05TestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "-Didentity-service.auth-server-url=http://${HOST_IP}:8999/auth"
 
     - name: "Repository - AppContext06TestSuite"
       if: commit_message !~ /\[skip repo\]/
+      install: skip
       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
-      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
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AppContext06TestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContextExtraTestSuite"
       if: commit_message !~ /\[skip repo\]/
+      install: skip
       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
-      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
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AppContextExtraTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - MiscContextTestSuite"
       if: commit_message !~ /\[skip repo\]/
+      install: skip
       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
-      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
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=MiscContextTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - SearchTestSuite"
       if: commit_message !~ /\[skip repo\]/
+      install: skip
       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
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=SearchTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco -Dindex.subsystem.name=solr6
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=SearchTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco -Dindex.subsystem.name=solr6
 
     - name: "Repository - MariaDB 10.2.18 tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
+      install: skip
       before_script:
         - docker run -d -p 3307:3306 --name mariadb -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco mariadb:10.2.18 --transaction-isolation=READ-COMMITTED --max-connections=300 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
 
     - name: "Repository - MariaDB 10.4 tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
+      install: skip
       before_script:
         - docker run -d -p 3307:3306 --name mariadb -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco mariadb:10.4 --transaction-isolation=READ-COMMITTED --max-connections=300 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
 
     - name: "Repository - MariaDB 10.5 tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
+      install: skip
       before_script:
         - docker run -d -p 3307:3306 --name mariadb -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco mariadb:10.5 --transaction-isolation=READ-COMMITTED --max-connections=300 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
 
     - name: "Repository - MariaDB 10.6 tests"
       # We run tests on the latest version of MariaDB on pull requests plus the normal master and release branches - ignored on feature branches
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/                         ) OR commit_message =~ /\[db\]/ OR commit_message =~ /\[latest db\]/
+      install: skip
       before_script:
         - docker run -d -p 3307:3306 --name mariadb -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco mariadb:10.6 --transaction-isolation=READ-COMMITTED --max-connections=300 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
 
     - name: "Repository - MySQL 5.7.23 tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
+      install: skip
       before_script:
         - docker run -d -p 3307:3306 -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco  mysql:5.7.23 --transaction-isolation='READ-COMMITTED' --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - MySQL 8 tests"
       # We run tests on the latest version of MySQL on pull requests plus the normal master and release branches - ignored on feature branches
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/                         ) OR commit_message =~ /\[db\]/ OR commit_message =~ /\[latest db\]/
+      install: skip
       before_script:
         - docker run -d -p 3307:3306 -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco  mysql:8 --transaction-isolation='READ-COMMITTED'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - PostgreSQL 10.9 tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
+      install: skip
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:10.9 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - PostgreSQL 11.7 tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
+      install: skip
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.7 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - PostgreSQL 11.12 tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
+      install: skip
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:11.12 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - PostgreSQL 12.4 tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
+      install: skip
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:12.4 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - PostgreSQL 12.7 tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
+      install: skip
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:12.7 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - PostgreSQL 13.1 tests"
       # We only run DB tests on the latest version of PostgreSQL on feature branches
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip db\]/ AND type != pull_request) OR commit_message =~ /\[db\]/
+      install: skip
       before_script:
         - docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=alfresco -e POSTGRES_USER=alfresco -e POSTGRES_DB=alfresco postgres:13.1 postgres -c 'max_connections=300'
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - PostgreSQL 13.3 tests"
       # We only run DB tests on the latest version of PostgreSQL on feature branches
       if: commit_message !~ /\[skip db\]/ OR commit_message =~ /\[latest db\]/
+      install: skip
       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
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - Messaging tests"
       if: commit_message !~ /\[skip repo\]/
+      install: skip
       before_script:
         - docker run -d -p 61616:61616 -p 5672:5672 alfresco/alfresco-activemq:5.16.1
-      script: travis_wait 20 mvn -B test -pl repository -Dtest=CamelRoutesTest,CamelComponentsTest
+      script: travis_wait 20 mvn -B test -pl repository -am -Dtest=CamelRoutesTest,CamelComponentsTest -DfailIfNoTests=false
 
     - name: "Remote-api - AppContext01TestSuite"
       if: commit_message !~ /\[skip repo\]/
+      install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       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
@@ -238,30 +272,34 @@ jobs:
 
     - name: "Remote-api - AppContext02TestSuite"
       if: commit_message !~ /\[skip repo\]/
+      install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       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:${TRANSFORMERS_TAG}
       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"
       if: commit_message !~ /\[skip repo\]/
+      install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       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:${TRANSFORMERS_TAG}
       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"
       if: commit_message !~ /\[skip repo\]/
+      install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       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:${TRANSFORMERS_TAG}
       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"
       if: commit_message !~ /\[skip repo\]/
+      install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       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
@@ -270,99 +308,126 @@ jobs:
     - name: "REST API TAS tests part1"
       # TAS tests are generally skipped on feature branches as they will be repeated on the enterprise repo or community packaging builds
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
+      install: travis_retry travis_wait 40 env REQUIRES_LOCAL_IMAGES=true bash scripts/travis/build.sh
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script: travis_wait 60 mvn -B install -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part1 -Denvironment=default -DrunBugs=false
+      script: travis_wait 60 mvn -B verify -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part1 -Denvironment=default -DrunBugs=false
 
     - name: "REST API TAS tests part2"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
+      install: travis_retry travis_wait 40 env REQUIRES_LOCAL_IMAGES=true bash scripts/travis/build.sh
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script: travis_wait 60 mvn -B install -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part2 -Denvironment=default -DrunBugs=false
+      script: travis_wait 60 mvn -B verify -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part2 -Denvironment=default -DrunBugs=false
 
     - name: "REST API TAS tests part3"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
+      install: travis_retry travis_wait 40 env REQUIRES_LOCAL_IMAGES=true bash scripts/travis/build.sh
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script: travis_wait 60 mvn -B install -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part3 -Denvironment=default -DrunBugs=false
+      script: travis_wait 60 mvn -B verify -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part3 -Denvironment=default -DrunBugs=false
 
     - name: "CMIS TAS tests - BROWSER binding"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
+      install: travis_retry travis_wait 40 env REQUIRES_LOCAL_IMAGES=true bash scripts/travis/build.sh
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script: travis_wait 40 mvn -B install -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-browser -Denvironment=default -DrunBugs=false
+      script: travis_wait 40 mvn -B verify -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-browser -Denvironment=default -DrunBugs=false
 
     - name: "CMIS TAS tests - ATOM binding"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
+      install: travis_retry travis_wait 40 env REQUIRES_LOCAL_IMAGES=true bash scripts/travis/build.sh
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script: travis_wait 40 mvn -B install -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-atom -Denvironment=default -DrunBugs=false
+      script: travis_wait 40 mvn -B verify -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-atom -Denvironment=default -DrunBugs=false
 
     - name: "CMIS TAS tests - WEBSERVICES binding"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
+      install: travis_retry travis_wait 40 env REQUIRES_LOCAL_IMAGES=true bash scripts/travis/build.sh
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script: travis_wait 40 mvn -B install -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-webservices -Denvironment=default -DrunBugs=false
+      script: travis_wait 40 mvn -B verify -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-webservices -Denvironment=default -DrunBugs=false
 
     - name: "Email TAS tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
+      install: travis_retry travis_wait 40 env REQUIRES_LOCAL_IMAGES=true bash scripts/travis/build.sh
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script: travis_wait 30 mvn -B install -f packaging/tests/tas-email/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+      script: travis_wait 30 mvn -B verify -f packaging/tests/tas-email/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
 
     - name: "WebDAV TAS tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
+      install: travis_retry travis_wait 40 env REQUIRES_LOCAL_IMAGES=true bash scripts/travis/build.sh
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script: travis_wait 30 mvn -B install -f packaging/tests/tas-webdav/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+      script: travis_wait 30 mvn -B verify -f packaging/tests/tas-webdav/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
 
     - name: "Integration TAS tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip tas\]/) OR commit_message =~ /\[tas\]/
+      install: travis_retry travis_wait 40 env REQUIRES_LOCAL_IMAGES=true bash scripts/travis/build.sh
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script: travis_wait 30 mvn -B install -f packaging/tests/tas-integration/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+      script: travis_wait 30 mvn -B verify -f packaging/tests/tas-integration/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
 
     - name: "Share Services - ShareServicesTestSuite"
       if: commit_message !~ /\[skip repo\]/
+      install: skip
       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'
-      script: travis_wait 20 mvn -B test -pl :alfresco-share-services -Dtest=ShareServicesTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
+      script: travis_wait 20 mvn -B test -pl :alfresco-share-services -am -Dtest=ShareServicesTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "AGS Unit & Integration Tests 01 (PostgreSQL)"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip ags\]/) OR commit_message =~ /\[ags\]/
+      install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       script: travis_retry travis_wait 80 mvn -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-postgres -PagsAllTestSuitePt1 -f amps/ags/pom.xml ${LOG_WARN}
 
     - name: "AGS        Integration Tests 02 (PostgreSQL)"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip ags\]/) OR commit_message =~ /\[ags\]/
+      install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       script: travis_retry travis_wait 80 mvn -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-postgres -PagsAllTestSuitePt2 -f amps/ags/pom.xml ${LOG_WARN}
 
     - name: "AGS        Integration Tests 03 (PostgreSQL)"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip ags\]/) OR commit_message =~ /\[ags\]/
+      install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       script: travis_retry travis_wait 80 mvn -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-postgres -PagsAllTestSuitePt3 -f amps/ags/pom.xml ${LOG_WARN}
 
+    - name: "AGS Unit & Integration Tests 04 (PostgreSQL)"
+      if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip ags\]/) OR commit_message =~ /\[ags\]/
+      install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
+      script: travis_retry travis_wait 80 mvn -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-postgres -PagsAllTestSuitePt4 -f amps/ags/pom.xml ${LOG_WARN}
+
     - name: "AGS Unit & Integration Tests 01 (MySQL) "
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip ags\]/) OR commit_message =~ /\[ags on MySQL\]/
+      install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       script: travis_retry travis_wait 80 mvn -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-mysql    -PagsAllTestSuitePt1 -f amps/ags/pom.xml ${LOG_WARN}
 
     - name: "AGS        Integration Tests 02 (MySQL) "
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip ags\]/) OR commit_message =~ /\[ags on MySQL\]/
+      install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       script: travis_retry travis_wait 80 mvn -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-mysql    -PagsAllTestSuitePt2 -f amps/ags/pom.xml ${LOG_WARN}
 
     - name: "AGS        Integration Tests 03 (MySQL) "
-      if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip ags\]/) OR commit_message =~ /\[ags on MySQL\]/
+      if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip ags\]/) OR commit_message =~ /\[ags\]/
+      install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
       script: travis_retry travis_wait 80 mvn -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-mysql    -PagsAllTestSuitePt3 -f amps/ags/pom.xml ${LOG_WARN}
 
+    - name: "AGS Unit & Integration Tests 04 (MySQL) "
+      if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip ags\]/) OR commit_message =~ /\[ags on MySQL\]/
+      install: travis_retry travis_wait 40 env REQUIRES_INSTALLED_ARTIFACTS=true bash scripts/travis/build.sh
+      script: travis_retry travis_wait 80 mvn -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pags -Pstart-mysql    -PagsAllTestSuitePt4 -f amps/ags/pom.xml ${LOG_WARN}
+
     - name: "AGS Community Rest API Tests"
       if: (branch =~ /(release\/.*$|master)/ AND commit_message !~ /\[skip ags\]/) OR commit_message =~ /\[ags\]/
+      install: travis_retry travis_wait 40 env REQUIRES_LOCAL_IMAGES=true bash scripts/travis/build.sh
       addons:
         artifacts:
           paths:
@@ -373,11 +438,12 @@ jobs:
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ./amps/ags/rm-community/rm-community-repo/docker-compose.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8080/alfresco"
-      script: travis_wait 40 mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false -Pags
+      script: travis_wait 40 mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -am -DfailIfNoTests=false -Dskip.automationtests=false -Pags
       after_script: bash amps/ags/travis/scripts/getLogs.sh
 
     - name: "Push to Nexus"
       stage: release
+      install: skip
       before_script: bash scripts/travis/verify_release_tag.sh
       script: travis_wait 40 bash scripts/travis/maven_release.sh
 

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>17.5</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>17.5</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>17.5</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/files/DeclareAndFileDocumentAsRecordTests.java

@@ -73,6 +73,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
+import org.alfresco.utility.model.TestGroup;
 
 /**
  * API tests for declaring document as record and filing it immediately to a record folder location within the file plan
@@ -257,7 +258,7 @@ public class DeclareAndFileDocumentAsRecordTests extends BaseRMRestTest
      * Then I receive an error indicating that I have attempted to declare and file a document into an invalid record folder
      * And the document is not declared as a record
      */
-    @Test (dataProvider = "invalidDestinationPaths")
+    @Test (dataProvider = "invalidDestinationPaths",groups = { TestGroup.NOT_SUPPORTED_ON_SINGLE_PIPELINE })
     public void declareAndFileToInvalidLocationUsingActionsAPI(String containerPath, String expectedException) throws Exception
     {
         STEP("Declare document as record with an invalid location parameter value");

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/FileVersionAsRecordTests.java

@@ -62,6 +62,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
+import org.alfresco.utility.model.TestGroup;
 
 /**
  * API tests for declaring a document version as record and filing to a record folder location within the file plan
@@ -207,7 +208,7 @@ public class FileVersionAsRecordTests extends BaseRMRestTest
      * record folder
      * And the document is not declared as a version record
      */
-    @Test (dataProvider = "invalidDestinationPaths")
+    @Test (dataProvider = "invalidDestinationPaths", groups = { TestGroup.NOT_SUPPORTED_ON_SINGLE_PIPELINE })
     public void declareVersionAndFileToInvalidLocationUsingActionsAPI(String containerPath, String expectedException) throws Exception
     {
         STEP("Declare document as record version with an invalid location parameter value");

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>17.5</version>
    </parent>
 
    <modules>

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

@@ -1,4 +1,3 @@
-TRANSFORMERS_TAG=2.5.5
-SOLR6_TAG=2.0.2
+SOLR6_TAG=2.0.3
 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/docker-compose.yml

@@ -26,7 +26,8 @@ services:
                 -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
                 -Dsolr.host=search
                 -Dsolr.port=8983
-                -Dsolr.secureComms=none
+                -Dsolr.secureComms=secret
+                -Dsolr.sharedSecret=secret
                 -Dsolr.base.url=/solr
                 -Dindex.subsystem.name=solr6
                 -Dalfresco.restApi.basicAuthScheme=true
@@ -61,15 +62,19 @@ services:
         image: alfresco/alfresco-search-services:${SOLR6_TAG}
         environment:
             #Solr needs to know how to register itself with Alfresco
-            - SOLR_ALFRESCO_HOST=alfresco
-            - SOLR_ALFRESCO_PORT=8080
+            SOLR_ALFRESCO_HOST: "alfresco"
+            SOLR_ALFRESCO_PORT: "8080"
             #Alfresco needs to know how to call solr
-            - SOLR_SOLR_HOST=search
-            - SOLR_SOLR_PORT=8983
+            SOLR_SOLR_HOST: "search"
+            SOLR_SOLR_PORT: "8983"
             #Create the default alfresco and archive cores
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
-             #HTTP by default
-            - ALFRESCO_SECURE_COMMS=none
+            SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
+            #HTTP by default
+            ALFRESCO_SECURE_COMMS: "secret"
+            JAVA_TOOL_OPTIONS:
+              "
+              -Dalfresco.secureComms.secret=secret
+              "
         ports:
             - 8083:8983 #Browser port
 

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>17.5</version>
    </parent>
 
    <properties>
@@ -361,6 +361,12 @@
                <integrationTestSuite>**/AllTestSuitePt3.class</integrationTestSuite>
            </properties>
        </profile>
+       <profile>
+           <id>agsAllTestSuitePt4</id>
+           <properties>
+               <integrationTestSuite>**/AllTestSuitePt4.class</integrationTestSuite>
+           </properties>
+       </profile>
 
       <profile>
          <id>use-mysql</id>

amps/ags/rm-community/rm-community-repo/src/test/properties/local/alfresco-global.properties

@@ -66,7 +66,8 @@ ftp.enabled=false
 
 # Solr config
 index.subsystem.name=solr6
-solr.secureComms=none
+solr.secureComms=secret
+solr.sharedSecret=secret
 solr.port=8983
 
 #By default the  basic auth is on false - REPO-2575

amps/ags/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuitePt1.java

@@ -43,19 +43,16 @@ import org.junit.runner.RunWith;
 @ClassnameFilters({
 
     // The following packages are run by Pt1. IF YOU CHANGE THIS LIST ALSO CHANGE IT IN AllTestSuitePt3.
-    "org\\.alfresco\\.module\\.org_alfresco_module_rm\\.test\\.legacy\\.action\\..*Test",
-    "org\\.alfresco\\.module\\.org_alfresco_module_rm\\.test\\.legacy\\.capabilities\\..*Test",
-    "org\\.alfresco\\.module\\.org_alfresco_module_rm\\.test\\.legacy\\.jscript\\..*Test",
-    "org\\.alfresco\\.module\\.org_alfresco_module_rm\\.test\\.legacy\\.security\\..*Test",
     "org\\.alfresco\\.module\\.org_alfresco_module_rm\\.test\\.legacy\\.service\\..*Test",
-    "org\\.alfresco\\.module\\.org_alfresco_module_rm\\.test\\.legacy\\.webscript\\..*Test",
-    // There appears to be some common setup taking place in the first 2 packages, which is why all legacy tests are
-    // together even though they take a little longer to run that way.
+    "org\\.alfresco\\.module\\.org_alfresco_module_rm\\.test\\.legacy\\.jscript\\..*Test",
 
     // Exclude all UnitTests
     "!.*UnitTest",
 
     // Put the test classes you want to exclude here
+    "!.*DispositionServiceImplTest",
+    "!.*FilePlanPermissionServiceImplTest",
+    // above 2 tests from service package require setup from FileReportActionTest so they've been moved to part 4
     "!.*DataLoadSystemTest",
     "!.*RM2072Test",
     "!.*RM2190Test",

amps/ags/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuitePt4.java

@@ -0,0 +1,78 @@
+/*
+ * #%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.module.org_alfresco_module_rm.test;
+
+import org.junit.extensions.cpsuite.ClasspathSuite;
+import org.junit.extensions.cpsuite.ClasspathSuite.ClassnameFilters;
+import org.junit.extensions.cpsuite.ClasspathSuite.SuiteTypes;
+import org.junit.extensions.cpsuite.SuiteType;
+import org.junit.runner.RunWith;
+
+/**
+ * Convenience test suite that runs all the tests. THIS HAS BEEN SPLIT INTO PARTS SO THAT THE BUILD TIME IS REDUCED.
+ *
+ * @author Marcin Strankowski
+ * @since 2.1
+ */
+@RunWith(ClasspathSuite.class)
+@SuiteTypes({SuiteType.TEST_CLASSES, SuiteType.RUN_WITH_CLASSES, SuiteType.JUNIT38_TEST_CLASSES})
+@ClassnameFilters({
+
+    // The following packages are run by Pt1. IF YOU CHANGE THIS LIST ALSO CHANGE IT IN AllTestSuitePt3.
+    "org\\.alfresco\\.module\\.org_alfresco_module_rm\\.test\\.legacy\\.action\\..*Test",
+    "org\\.alfresco\\.module\\.org_alfresco_module_rm\\.test\\.legacy\\.capabilities\\..*Test",
+    "org\\.alfresco\\.module\\.org_alfresco_module_rm\\.test\\.legacy\\.security\\..*Test",
+    "org\\.alfresco\\.module\\.org_alfresco_module_rm\\.test\\.legacy\\.webscript\\..*Test",
+    "org\\.alfresco\\.module\\.org_alfresco_module_rm\\.test\\.legacy\\.service\\.*DispositionServiceImplTest",
+    "org\\.alfresco\\.module\\.org_alfresco_module_rm\\.test\\.legacy\\.service\\.*FilePlanPermissionServiceImplTest",
+
+    // 2 tests from service package are here, they seem to require FileReportActionTest being ran beforehand
+    // and it would take too much time to run them in 1st test suite
+
+    // Exclude all UnitTests
+    "!.*UnitTest",
+
+    // Put the test classes you want to exclude here
+    "!.*DataLoadSystemTest",
+    "!.*RM2072Test",
+    "!.*RM2190Test",
+    "!.*RM981SystemTest",
+    "!.*RM3993Test",
+    "!.*RM4163Test",
+    "!.*RecordsManagementEventServiceImplTest",
+    "!.*RmRestApiTest",
+    "!.*NotificationServiceHelperSystemTest",
+    "!.*RetryingTransactionHelperBaseTest",
+    "!.*RMCaveatConfigServiceImplTest",
+    // This test is running successfully locally but not on bamboo (if executed as a single test).
+    // The problem can be reproduced if the whole test suite is run locally as well.
+    // Tests should not be dependant on other test classes and should run in any order without any problems.
+    "!.*EmailMapScriptTest"
+})
+public class AllTestSuitePt4
+{
+}

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

@@ -4,7 +4,7 @@
 
 # Version label
 version.major=7
-version.minor=0
+version.minor=3
 version.revision=0
 version.label=
 
@@ -15,4 +15,4 @@ version.edition=Community
 version.scmrevision=@scm-path@-r@scm-revision@
 
 # Build number
-version.build=r@scm-revision@-b@build-number@
+version.build=r@scm-revision@-b@build-number@

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>17.5</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>17.5</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>17.5</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>17.5</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>
@@ -128,8 +128,8 @@
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>commons-dbcp</groupId>
-         <artifactId>commons-dbcp</artifactId>
+         <groupId>org.apache.commons</groupId>
+         <artifactId>commons-dbcp2</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

core/src/main/java/org/alfresco/util/transaction/ConnectionPoolException.java

@@ -21,7 +21,7 @@ package org.alfresco.util.transaction;
 import org.alfresco.error.AlfrescoRuntimeException;
 
 /**
- * Exception wraps {@link java.util.NoSuchElementException} from {@link org.apache.commons.dbcp.BasicDataSource}
+ * Exception wraps {@link java.util.NoSuchElementException} from {@link org.apache.commons.dbcp2.BasicDataSource}
  * 
  * @author alex.mukha
  * @since 4.1.9

data-model/pom.xml

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

data-model/src/main/java/org/alfresco/opencmis/mapping/ObjectTypeIdLuceneBuilder.java

@@ -78,6 +78,10 @@ public class ObjectTypeIdLuceneBuilder extends BaseLuceneBuilder
         String field = getLuceneFieldName();
         String stringValue = getValueAsString(value);
         TypeDefinitionWrapper type = cmisDictionaryService.findType(stringValue);
+        if (type == null)
+        {
+            throw new CmisInvalidArgumentException("Unknown type: " + stringValue);
+        }
         return lqpa
                 .getFieldQuery(field, type.getAlfrescoClass().toString(), AnalysisMode.IDENTIFIER, luceneFunction);
     }

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>17.5</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>17.5</version>
     </parent>
 </project>

packaging/docker-alfresco/Dockerfile

@@ -1,6 +1,6 @@
-# Fetch image based on Tomcat 9.0, Java 11 and Centos 8
+# Fetch image based on Tomcat 9.0, Java 11 and Centos 7
 # More infos about this image: https://github.com/Alfresco/alfresco-docker-base-tomcat
-FROM alfresco/alfresco-base-tomcat:9.0.54-java-11-centos-7
+FROM alfresco/alfresco-base-tomcat:tomcat9-jre11-centos7-202203091924
 
 # Set default docker_context.
 ARG resource_path=target

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>17.5</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>17.5</version>
     </parent>
 
     <modules>

packaging/tests/environment/.env

@@ -1,4 +1,3 @@
-TRANSFORMERS_TAG=2.5.5
-SOLR6_TAG=2.0.2
+SOLR6_TAG=2.0.3
 POSTGRES_TAG=13.3
 ACTIVEMQ_TAG=5.16.1

packaging/tests/environment/docker-compose-minimal+transforms.yml

@@ -28,7 +28,8 @@ services:
         -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
         -Dsolr.host=solr6
         -Dsolr.port=8983
-        -Dsolr.secureComms=none
+        -Dsolr.secureComms=secret
+        -Dsolr.sharedSecret=secret
         -Dsolr.base.url=/solr
         -Dindex.subsystem.name=solr6
         -Dalfresco.restApi.basicAuthScheme=true
@@ -63,15 +64,19 @@ services:
     image: alfresco/alfresco-search-services:${SOLR6_TAG}
     environment:
       #Solr needs to know how to register itself with Alfresco
-      - SOLR_ALFRESCO_HOST=alfresco
-      - SOLR_ALFRESCO_PORT=8080
+      SOLR_ALFRESCO_HOST: "alfresco"
+      SOLR_ALFRESCO_PORT: "8080"
       #Alfresco needs to know how to call solr
-      - SOLR_SOLR_HOST=solr6
-      - SOLR_SOLR_PORT=8983
+      SOLR_SOLR_HOST: "solr6"
+      SOLR_SOLR_PORT: "8983"
       #Create the default alfresco and archive cores
-      - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+      SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
       #HTTP by default
-      - ALFRESCO_SECURE_COMMS=none
+      ALFRESCO_SECURE_COMMS: "secret"
+      JAVA_TOOL_OPTIONS:
+        "
+        -Dalfresco.secureComms.secret=secret
+        "
     ports:
       - 8083:8983 #Browser port
 

packaging/tests/environment/docker-compose-minimal.yml

@@ -28,7 +28,8 @@ services:
         -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
         -Dsolr.host=solr6
         -Dsolr.port=8983
-        -Dsolr.secureComms=none
+        -Dsolr.secureComms=secret
+        -Dsolr.sharedSecret=secret
         -Dsolr.base.url=/solr
         -Dindex.subsystem.name=solr6
         -Dalfresco.restApi.basicAuthScheme=true
@@ -66,15 +67,19 @@ services:
     image: alfresco/alfresco-search-services:${SOLR6_TAG}
     environment:
       #Solr needs to know how to register itself with Alfresco
-      - SOLR_ALFRESCO_HOST=alfresco
-      - SOLR_ALFRESCO_PORT=8080
+      SOLR_ALFRESCO_HOST: "alfresco"
+      SOLR_ALFRESCO_PORT: "8080"
       #Alfresco needs to know how to call solr
-      - SOLR_SOLR_HOST=solr6
-      - SOLR_SOLR_PORT=8983
+      SOLR_SOLR_HOST: "solr6"
+      SOLR_SOLR_PORT: "8983"
       #Create the default alfresco and archive cores
-      - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+      SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
       #HTTP by default
-      - ALFRESCO_SECURE_COMMS=none
+      ALFRESCO_SECURE_COMMS: "secret"
+      JAVA_TOOL_OPTIONS:
+        "
+        -Dalfresco.secureComms.secret=secret
+        "
     ports:
       - 8083:8983 #Browser port
 

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>17.5</version>
     </parent>
 
     <modules>

packaging/tests/scripts/start-compose.sh

@@ -27,6 +27,9 @@ fi
 
 echo "Starting ACS stack in ${DOCKER_COMPOSE_PATH}"
 
+export TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)
+export TRANSFORM_ROUTER_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-service.version -q -DforceStdout)
+
 # .env files are picked up from project directory correctly on docker-compose 1.23.0+
 docker-compose --file "${DOCKER_COMPOSE_PATH}" --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d
 

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>17.5</version>
     </parent>
 
     <developers>

packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/search/AbstractCmisE2ETest.java

@@ -0,0 +1,76 @@
+package org.alfresco.cmis.search;
+
+import java.lang.reflect.Method;
+
+import org.alfresco.cmis.CmisProperties;
+import org.alfresco.utility.Utility;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import org.springframework.test.context.ContextConfiguration;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+
+@ContextConfiguration("classpath:alfresco-cmis-context.xml")
+@Component
+@Scope(value = "prototype")
+public abstract class AbstractCmisE2ETest extends AbstractE2EFunctionalTest
+{
+    private static Logger LOGGER = LoggerFactory.getLogger(AbstractCmisE2ETest.class);
+
+    @Autowired
+    protected CmisProperties cmisProperties;
+
+    public String documentContent = "CMIS document content";
+
+    @BeforeMethod(alwaysRun = true)
+    public void showStartTestInfo(Method method)
+    {
+        LOGGER.info(String.format("*** STARTING Test: [%s] ***", method.getName()));
+    }
+
+    @AfterMethod(alwaysRun = true)
+    public void showEndTestInfo(Method method)
+    {
+        LOGGER.info(String.format("*** ENDING Test: [%s] ***", method.getName()));
+    }
+
+    public Integer getElasticWaitTimeInSeconds()
+    {
+        return cmisProperties.envProperty().getSolrWaitTimeInSeconds();
+    }
+
+    /**
+     * Repeat Elastic Query till results count returns expectedCountResults
+     * @param query CMIS Query to be executed
+     * @param expectedCountResults Number of results expected
+     * @return true when results count is equals to expectedCountResults
+     */
+    protected boolean waitForIndexing(String query, long expectedCountResults)
+    {
+
+        for (int searchCount = 1; searchCount <= SEARCH_MAX_ATTEMPTS; searchCount++)
+        {
+
+            try
+            {
+                cmisApi.withQuery(query).assertResultsCount().equals(expectedCountResults);
+                return true;
+            }
+            catch (AssertionError ae)
+            {
+                LOGGER.info(String.format("WaitForIndexing in Progress: %s", ae));
+            }
+
+
+            Utility.waitToLoopTime(getElasticWaitTimeInSeconds(), "Wait For Indexing");
+
+        }
+
+        return false;
+    }
+
+
+}

packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/search/AbstractE2EFunctionalTest.java

@@ -0,0 +1,58 @@
+package org.alfresco.cmis.search;
+
+import org.alfresco.cmis.CmisWrapper;
+import org.alfresco.dataprep.SiteService.Visibility;
+import org.alfresco.utility.data.DataContent;
+import org.alfresco.utility.data.DataSite;
+import org.alfresco.utility.data.DataUser;
+import org.alfresco.utility.data.RandomData;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.UserModel;
+import org.alfresco.utility.network.ServerHealth;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.annotations.BeforeClass;
+
+@ContextConfiguration ("classpath:alfresco-cmis-context.xml")
+public abstract class AbstractE2EFunctionalTest extends AbstractTestNGSpringContextTests
+{
+    /** The number of retries that a query will be tried before giving up. */
+    protected static final int SEARCH_MAX_ATTEMPTS = 20;
+
+    @Autowired
+    protected ServerHealth serverHealth;
+
+    @Autowired
+    protected DataSite dataSite;
+
+    @Autowired
+    protected DataContent dataContent;
+
+    @Autowired
+    protected CmisWrapper cmisApi;
+
+    @Autowired
+    protected DataUser dataUser;
+
+    protected UserModel testUser, adminUserModel;
+    protected SiteModel testSite;
+
+    protected static String unique_searchString;
+
+    @BeforeClass (alwaysRun = true)
+    public void setup()
+    {
+        serverHealth.assertServerIsOnline();
+
+        adminUserModel = dataUser.getAdminUser();
+        testUser = dataUser.createRandomTestUser("UserSearch");
+
+        testSite = new SiteModel(RandomData.getRandomName("SiteSearch"));
+        testSite.setVisibility(Visibility.PRIVATE);
+
+        testSite = dataSite.usingUser(testUser).createSite(testSite);
+
+        unique_searchString = testSite.getTitle().replace("SiteSearch", "Unique");
+    }
+}

packaging/tests/tas-cmis/src/test/java/org/alfresco/cmis/search/SearchInFolderTests.java

@@ -0,0 +1,62 @@
+package org.alfresco.cmis.search;
+
+import org.alfresco.utility.Utility;
+import org.alfresco.utility.data.provider.XMLDataConfig;
+import org.alfresco.utility.data.provider.XMLTestDataProvider;
+import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.FileType;
+import org.alfresco.utility.model.FolderModel;
+import org.alfresco.utility.model.QueryModel;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class SearchInFolderTests extends AbstractCmisE2ETest
+{
+    private FolderModel parentFolder, subFolder1, subFolder2, subFolder3;
+    private FileModel subFile1, subFile2, subFile3, subFile4, subFile5;
+
+    @BeforeClass(alwaysRun = true)
+    public void createTestData() throws Exception
+    {
+        // create input data
+        parentFolder = FolderModel.getRandomFolderModel();
+        subFolder1 = FolderModel.getRandomFolderModel();
+        subFolder2 = FolderModel.getRandomFolderModel();
+        subFolder3 = new FolderModel("subFolder");
+        subFile5 = new FileModel("fifthFile.txt",FileType.TEXT_PLAIN, "fifthFile content");
+        subFile1 = new FileModel("firstFile", FileType.MSEXCEL);
+        subFile2 = FileModel.getRandomFileModel(FileType.MSPOWERPOINT2007);
+        subFile3 = FileModel.getRandomFileModel(FileType.TEXT_PLAIN);
+        subFile4 = new FileModel("fourthFile", "fourthFileTitle", "fourthFileDescription", FileType.MSWORD2007);
+
+        cmisApi.authenticateUser(testUser).usingSite(testSite).createFolder(parentFolder)
+                .then().usingResource(parentFolder)
+                .createFile(subFile5).assertThat().contentIs("fifthFile content")
+                .createFolder(subFolder1)
+                .createFolder(subFolder2)
+                .createFolder(subFolder3)
+                .createFile(subFile1)
+                .createFile(subFile2)
+                .createFile(subFile3)
+                .createFile(subFile4);
+        // wait for index
+        Utility.waitToLoopTime(getElasticWaitTimeInSeconds());
+    }
+
+    @AfterClass(alwaysRun = true)
+    public void cleanupEnvironment()
+    {
+        dataContent.deleteSite(testSite);
+    }
+
+    @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
+    @XMLDataConfig(file = "src/test/resources/search-in-folder.xml")
+    public void executeCMISQuery(QueryModel query)
+    {
+        String currentQuery = String.format(query.getValue(), parentFolder.getNodeRef());
+        cmisApi.authenticateUser(testUser);
+        Assert.assertTrue(waitForIndexing(currentQuery, query.getResults()), String.format("Result count not as expected for query: %s", currentQuery));
+    }
+}

packaging/tests/tas-cmis/src/test/resources/default.properties

@@ -7,7 +7,7 @@ alfresco.port=8082
 admin.user=admin
 admin.password=admin
 
-solrWaitTimeInSeconds=30
+solrWaitTimeInSeconds=60
 
 # in containers we cannot access directly JMX, so we will use http://jolokia.org agent
 # disabling this we will use direct JMX calls to server

packaging/tests/tas-cmis/src/test/resources/search-in-folder.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--CMIS Queries: passing the search query as first param and results expected -->
+<testData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<queries>
+		<query value="SELECT cmis:name, cmis:parentId, cmis:path, cmis:allowedChildObjectTypeIds FROM cmis:folder where IN_FOLDER('%s') AND cmis:name = 'subFolder'" expectedResults="1" />
+		<query value="SELECT cmis:name, cmis:objectId, cmis:lastModifiedBy, cmis:creationDate, cmis:contentStreamFileName FROM cmis:document where IN_FOLDER('%s') AND cmis:name = 'fourthFile'" expectedResults="1" />
+		<query value="SELECT cmis:parentId FROM cmis:folder where IN_FOLDER('%s')" expectedResults="3" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s')" expectedResults="5" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') ORDER BY cmis:name ASC" expectedResults="5" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') ORDER BY cmis:name DESC" expectedResults="5" />
+		<query value="SELECT * FROM cmis:folder where IN_FOLDER('%s') ORDER BY cmis:lastModificationDate ASC"  expectedResults="3" />
+		<query value="SELECT * FROM cmis:folder where IN_FOLDER('%s') ORDER BY cmis:lastModificationDate DESC"  expectedResults="3" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') ORDER BY cmis:createdBy DESC" expectedResults="5" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') AND cmis:name IS NOT NULL" expectedResults="5" />
+		<query value="SELECT * FROM cmis:folder where IN_FOLDER('%s') AND cmis:name IS NOT NULL" expectedResults="3" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') AND cmis:name LIKE 'fourthFile'" expectedResults="1" />
+		<query value="SELECT * FROM cmis:folder where IN_FOLDER('%s') AND NOT(cmis:name NOT IN ('subFolder'))" expectedResults="1" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') AND cmis:name IN ('fourthFile', 'fifthFile.txt')" expectedResults="2" />
+		<query value="SELECT * FROM cmis:document where IN_FOLDER('%s') AND cmis:name NOT IN ('fourthFile', 'fifthFile.txt')" expectedResults="3" />
+		<query value="SELECT * FROM cmis:folder where IN_FOLDER('%s') AND cmis:name &lt;&gt; 'subFolder'" expectedResults="2" />
+		<query value="SELECT cmis:secondaryObjectTypeIds FROM cmis:folder where IN_FOLDER('%s') AND cmis:name = 'subFolder'" expectedResults="1" />
+	</queries>
+</testData> 

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>17.5</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>17.5</version>
     </parent>
 
     <developers>

packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTestsBulk2.java

@@ -60,15 +60,15 @@ public class IntegrationFullTestsBulk2  extends IntegrationTest
         ftpProtocol.authenticateUser(testUser1).usingSite(testSitePublic).createFolder(testFolder1)
             .usingResource(testFolder1).createFile(wordFile)
             .assertThat().contentIs("tasTesting");
-        
+
         STEP("2. Open document for edit using CMIS");
         cmisAPI.authenticateUser(testUser1).usingResource(wordFile).checkOut();
         FileModel wordFilePWC = cmisAPI.usingResource(wordFile).withCMISUtil().getPWCFileModel();
-        
+
         STEP("3. Try to edit document using Webdav while checked-out with CMIS - content should be updated");
         webDavProtocol.authenticateUser(testUser1).usingResource(wordFilePWC).update("update")
             .and().assertThat().contentIs("update");
-        
+
         STEP("4. Copy document to testFolder2 with ftp");
         FileModel copiedWordFile = new FileModel(wordFile);
         ftpProtocol.usingSite(testSitePublic).createFolder(testFolder2)
@@ -76,15 +76,15 @@ public class IntegrationFullTestsBulk2  extends IntegrationTest
         copiedWordFile.setCmisLocation(ftpProtocol.getLastResourceWithoutPrefix());
         ftpProtocol.usingResource(testFolder1).assertThat().hasFiles(wordFile)
             .and().usingResource(testFolder2).assertThat().hasFiles(copiedWordFile);
-        
+
         STEP("5. Update document from folder2, check its content is updated with Webdav");
         webDavProtocol.usingResource(copiedWordFile).update("Step5")
             .and().assertThat().contentIs("Step5");
-        
+
         STEP("6. Update document with WebDAV");
         webDavProtocol.authenticateUser(testUser1).usingResource(wordFile).update("WebDAVUpdate");
     }
-    
+
     /**
      * Scenario 84
      * 1. Create folder1 with webdav
@@ -150,7 +150,7 @@ public class IntegrationFullTestsBulk2  extends IntegrationTest
      * 13. Check file is deleted with WebDAV
      */
     @Test(groups = { TestGroup.INTEGRATION, TestGroup.FULL })
-    @TestRail(section = { TestGroup.INTEGRATION, TestGroup.CONTENT }, executionType = ExecutionType.REGRESSION, 
+    @TestRail(section = { TestGroup.INTEGRATION, TestGroup.CONTENT }, executionType = ExecutionType.REGRESSION,
         description = "Update file with different user roles and protocols")
     public void updateFileWithDifferentRolesUsingDifferentProtocols() throws Exception
     {
@@ -276,41 +276,41 @@ public class IntegrationFullTestsBulk2  extends IntegrationTest
         UserModel user1 = dataUser.createRandomTestUser();
         UserModel user2 = dataUser.createRandomTestUser();
         user2.setUserRole(UserRole.SiteManager);
-        
+
         STEP("2. User1 creates site1 and invites user2 as manager");
         SiteModel site = dataSite.usingUser(user1).createPublicRandomSite();
         restAPI.authenticateUser(user1).withCoreAPI().usingSite(site).addPerson(user2);
-        
+
         STEP("3. User1 adds document1 and tag1 to doc");
         dataContent.usingUser(user1).usingSite(site).createContent(testFile);
         RestTagModel tag = restAPI.withCoreAPI().usingResource(testFile).addTag("tag1");
         restAPI.withCoreAPI().usingResource(testFile).getNodeTags().assertThat().entriesListContains("tag", "tag1");
-        
+
         STEP("4. User2 gets tags and verifies tag1 appears");
         restAPI.authenticateUser(user2).withCoreAPI().usingResource(testFile).getNodeTags().assertThat().entriesListContains("tag", "tag1");
-        
+
         STEP("5. User2 delete tag1");
         restAPI.withCoreAPI().usingResource(testFile).deleteTag(tag);
         restAPI.withCoreAPI().usingResource(testFile).getNodeTags().assertThat().entriesListDoesNotContain("tag", "tag1");
-        
+
         STEP("6. User1 tries to update tag1");
         restAPI.authenticateUser(user2).withCoreAPI().usingTag(tag).update("updatedTag");
         restAPI.assertStatusCodeIs(HttpStatus.FORBIDDEN)
             .assertLastError().containsSummary(RestErrorModel.PERMISSION_WAS_DENIED)
             .containsErrorKey(RestErrorModel.PERMISSION_DENIED_ERRORKEY);
-        
+
         STEP("7. User1 add new tag tag2");
         tag = restAPI.authenticateUser(user1).withCoreAPI().usingResource(testFile).addTag("tag2");
         restAPI.withCoreAPI().usingResource(testFile).getNodeTags().assertThat().entriesListContains("tag", "tag2");
-        
+
         STEP("8. User2 verifies tag2 appears and tag1 is not in the list");
         restAPI.authenticateUser(user2).withCoreAPI().usingResource(testFile).getNodeTags()
             .assertThat().entriesListDoesNotContain("tag", "tag1")
             .assertThat().entriesListContains("tag", "tag2");
-        
+
         STEP("9. User2 deletes document1");
         dataContent.usingUser(user2).usingResource(testFile).deleteContent();
-        
+
         STEP("10. User1 tries to delete tag2");
         restAPI.authenticateUser(user1).withCoreAPI().usingResource(testFile).deleteTag(tag);
         restAPI.assertStatusCodeIs(HttpStatus.NOT_FOUND)
@@ -329,9 +329,9 @@ public class IntegrationFullTestsBulk2  extends IntegrationTest
      * 7. User1 deletes the document1 with ftp
      * 8. Verify user2 cannot update document1 with cmis
      */
-        @Test(groups = { TestGroup.INTEGRATION, TestGroup.FULL }, expectedExceptions = CmisObjectNotFoundException.class, expectedExceptionsMessageRegExp = ".*Object not found:.*")
-        @TestRail(section = { TestGroup.INTEGRATION, TestGroup.CONTENT }, executionType = ExecutionType.REGRESSION, description = "Negative scenarios for update document")
-        public void fileUpdateNegativeScenariosTest() throws Exception
+    @Test(groups = { TestGroup.INTEGRATION, TestGroup.FULL }, expectedExceptions = CmisObjectNotFoundException.class, expectedExceptionsMessageRegExp = ".*Object not found:.*")
+    @TestRail(section = { TestGroup.INTEGRATION, TestGroup.CONTENT }, executionType = ExecutionType.REGRESSION, description = "Negative scenarios for update document")
+    public void fileUpdateNegativeScenariosTest() throws Exception
         {
             STEP("1. Create user1, user2");
         UserModel user1 = dataUser.createRandomTestUser();

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>17.5</version>
     </parent>
 
     <developers>

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/actions/ActionsTests.java

@@ -11,6 +11,7 @@ import org.alfresco.rest.model.RestActionDefinitionModelsCollection;
 import org.alfresco.rest.model.RestNodeModel;
 import org.alfresco.utility.Utility;
 import org.alfresco.utility.model.FileModel;
+import org.alfresco.utility.model.FolderModel;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.TestGroup;
 import org.alfresco.utility.model.UserModel;
@@ -21,10 +22,14 @@ import org.springframework.http.HttpStatus;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import java.util.Properties;
+
 public class ActionsTests extends RestTest
 {
     private UserModel adminUser;
     private FileModel document;
+    private FolderModel folder;
+    private FileModel randomFile;
     private SiteModel publicSite;
 
     @BeforeClass(alwaysRun = true)
@@ -33,6 +38,8 @@ public class ActionsTests extends RestTest
         adminUser = dataUser.getAdminUser();
         publicSite = dataSite.createPublicRandomSite();
         document = dataContent.usingSite(publicSite).usingUser(adminUser).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
+        folder = dataContent.usingUser(adminUser).createFolder();
+        randomFile = dataContent.usingUser(adminUser).usingResource(folder).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
     }
 
     @TestRail(section = { TestGroup.REST_API,TestGroup.ACTIONS }, executionType = ExecutionType.SANITY,
@@ -106,6 +113,22 @@ public class ActionsTests extends RestTest
         });
     }
 
+    @TestRail(section = { TestGroup.REST_API,TestGroup.ACTIONS }, executionType = ExecutionType.SANITY,
+            description = "Test for private action execution from POST api/-default-/public/alfresco/versions/1/action-executions, should not be possible to execute private action using V1 REST API")
+    @Test(groups = { TestGroup.REST_API, TestGroup.ACTIONS, TestGroup.SANITY})
+    public void executePrivateActionV1RESTAPI() throws Exception
+    {
+        // 'count-children' action is expected to be private (not exposed) by default
+        String actionDefinitionId = "count-children";
+        JSONObject response = restClient.authenticateUser(adminUser)
+                .withCoreAPI()
+                .usingActions()
+                .executeAction(actionDefinitionId, folder);
+
+        restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN);
+        restClient.assertLastError().containsSummary("Action '" + actionDefinitionId + "' is not exposed within 'http-v1' execution source.");
+    }
+
     @TestRail (section = { TestGroup.REST_API, TestGroup.ACTIONS }, executionType = ExecutionType.SANITY,
             description = "Sanity test for POST /action-executions")
     @Test (groups = { TestGroup.REST_API, TestGroup.ACTIONS, TestGroup.SANITY })
@@ -141,7 +164,7 @@ public class ActionsTests extends RestTest
                 withCoreAPI().
                 usingActions().
                 getActionDefinitionById("add-features");
-        
+
         restClient.assertStatusCodeIs(HttpStatus.OK);
         assertFalse(restActionDefinition.getId().isEmpty());
         restActionDefinition.getId().equals("add-features");

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

@@ -7,9 +7,7 @@ import org.alfresco.utility.Utility;
 import org.alfresco.utility.model.FileModel;
 import org.alfresco.utility.model.FolderModel;
 import org.alfresco.utility.model.SiteModel;
-
 import org.alfresco.utility.model.UserModel;
-
 import org.springframework.http.HttpStatus;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
@@ -40,17 +38,20 @@ public abstract class RenditionIntegrationTests extends RestTest
         FileModel file = new FileModel();
         file.setNodeRef(nodeId);
 
-        // 1. Create a rendition of the file using RESTAPI
+        // 1. Preemptively delete an existing rendition of the file using RESTAPI
+        restClient.withCoreAPI().usingNode(file).deleteNodeRendition(renditionId);
+
+        // 2. Create a rendition of the file using RESTAPI
         restClient.withCoreAPI().usingNode(file).createNodeRendition(renditionId);
         Assert.assertEquals(Integer.valueOf(restClient.getStatusCode()).intValue(), HttpStatus.ACCEPTED.value(),
                 "Failed to submit a request for rendition. [" + fileName+ ", " + renditionId+"] [source file, rendition ID]. ");
 
-        // 2. Verify that a rendition of the file is created and has content using RESTAPI
+        // 3. Verify that a rendition of the file is created and has content using RESTAPI
         RestResponse restResponse = restClient.withCoreAPI().usingNode(file).getNodeRenditionContentUntilIsCreated(renditionId);
         Assert.assertEquals(Integer.valueOf(restClient.getStatusCode()).intValue(), HttpStatus.OK.value(),
                 "Failed to produce rendition. [" + fileName+ ", " + renditionId+"] [source file, rendition ID] ");
 
-        // 3. Check the returned content type
+        // 4. Check the returned content type
         Assert.assertEquals(restClient.getResponseHeaders().getValue("Content-Type"), expectedMimeType+";charset=UTF-8",
                 "Rendition was created but it has the wrong Content-Type. [" + fileName+ ", " + renditionId + "] [source file, rendition ID]");
 

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>17.5</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>17.5</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>17.5</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -24,7 +24,7 @@
 
     <properties>
         <acs.version.major>7</acs.version.major>
-        <acs.version.minor>2</acs.version.minor>
+        <acs.version.minor>3</acs.version.minor>
         <acs.version.revision>0</acs.version.revision>
         <acs.version.label />
         <amp.min.version>${acs.version.major}.0.0</amp.min.version>
@@ -47,42 +47,43 @@
         <dependency.alfresco-trashcan-cleaner.version>2.4.1</dependency.alfresco-trashcan-cleaner.version>
         <dependency.alfresco-jlan.version>7.1</dependency.alfresco-jlan.version>
         <dependency.alfresco-server-root.version>6.0.1</dependency.alfresco-server-root.version>
-        <dependency.alfresco-messaging-repo.version>1.2.15</dependency.alfresco-messaging-repo.version>
+        <dependency.alfresco-messaging-repo.version>1.2.19</dependency.alfresco-messaging-repo.version>
         <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-service.version>1.5.3</dependency.alfresco-transform-service.version>
+        <dependency.alfresco-transform-core.version>2.6.0</dependency.alfresco-transform-core.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.spring.version>5.3.18</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>
-        <dependency.webscripts.version>8.28</dependency.webscripts.version>
+        <dependency.webscripts.version>8.29</dependency.webscripts.version>
         <dependency.bouncycastle.version>1.70</dependency.bouncycastle.version>
         <dependency.mockito-core.version>3.11.2</dependency.mockito-core.version>
         <dependency.org-json.version>20211205</dependency.org-json.version>
-        <dependency.commons-dbcp.version>1.4-DBCP330</dependency.commons-dbcp.version>
+        <dependency.commons-dbcp.version>2.9.0</dependency.commons-dbcp.version>
         <dependency.commons-io.version>2.11.0</dependency.commons-io.version>
         <dependency.gson.version>2.8.5</dependency.gson.version>
         <dependency.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.tika.version>2.2.1</dependency.tika.version>
         <dependency.spring-security.version>5.6.1</dependency.spring-security.version>
         <dependency.truezip.version>7.7.10</dependency.truezip.version>
         <dependency.poi.version>4.1.2</dependency.poi.version>
         <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 +103,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.aos-module.version>1.4.1</alfresco.aos-module.version> 
+        <alfresco.api-explorer.version>7.2.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
 
         <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
-        <license-maven-plugin.version>2.0.1.alfresco-1</license-maven-plugin.version>
+        <license-maven-plugin.version>2.0.1.alfresco-2</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.80</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 +147,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>17.5</tag>
     </scm>
 
     <distributionManagement>
@@ -563,6 +564,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 +613,7 @@
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
+                <artifactId>slf4j-reload4j</artifactId>
                 <version>${dependency.slf4j.version}</version>
             </dependency>
             <dependency>
@@ -631,7 +638,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>
@@ -749,8 +756,8 @@
                 <version>${dependency.mockito-core.version}</version>
             </dependency>
             <dependency>
-                <groupId>commons-dbcp</groupId>
-                <artifactId>commons-dbcp</artifactId>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-dbcp2</artifactId>
                 <version>${dependency.commons-dbcp.version}</version>
             </dependency>
             <dependency>
@@ -760,7 +767,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 +801,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 +857,7 @@
             <dependency>
                 <groupId>org.reflections</groupId>
                 <artifactId>reflections</artifactId>
-                <version>0.9.12</version>
+                <version>0.10.2</version>
             </dependency>
             <!-- swagger parser -->
             <dependency>
@@ -881,7 +888,7 @@
                 <plugin>
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.38.0</version>
+                    <version>0.39.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -939,7 +946,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>17.5</version>
     </parent>
 
     <dependencies>

remote-api/src/main/java/org/alfresco/repo/webdav/LockInfoImpl.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -390,8 +390,9 @@ public class LockInfoImpl implements Serializable, LockInfo
         else
         {
             Date now = dateNow();
-            long timeout = ((expires.getTime() - now.getTime()) / 1000);
-            return timeout;
+            long remainingTimeoutInSecondsRoundedUp = (Math.max(expires.getTime() - now.getTime(), 0) + 999) / 1000;
+
+            return remainingTimeoutInSecondsRoundedUp;
         }
     }
 

remote-api/src/main/java/org/alfresco/repo/webdav/LockMethod.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * 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 Remote API
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 package org.alfresco.repo.webdav;
 
 import java.util.Date;
@@ -449,30 +449,18 @@ public class LockMethod extends WebDAVMethod
      */
     protected final void createLock(FileInfo lockNode, String userName) throws WebDAVServerException
     {
-        // Create Lock token
-        lockToken = WebDAV.makeLockToken(lockNode.getNodeRef(), userName);
-
-        if (createExclusive)
-        {
-            // Lock the node
-            lockInfo.setTimeoutSeconds(getLockTimeout());
-            lockInfo.setExclusiveLockToken(lockToken);
-        }
-        else
-        {
+        if (!createExclusive) {
             // Shared lock creation should already have been prohibited when parsing the request body
             throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
         }
 
-        // Store lock depth
+        lockToken = WebDAV.makeLockToken(lockNode.getNodeRef(), userName);
+        lockInfo.setExclusiveLockToken(lockToken);
         lockInfo.setDepth(WebDAV.getDepthName(m_depth));
-        // Store lock scope (shared/exclusive)
-        String scope = createExclusive ? WebDAV.XML_EXCLUSIVE : WebDAV.XML_SHARED;
-        lockInfo.setScope(scope);
-        // Store the owner of this lock
+        lockInfo.setScope(WebDAV.XML_EXCLUSIVE);
         lockInfo.setOwner(userName);
-        // Lock the node
-        getDAVLockService().lock(lockNode.getNodeRef(), lockInfo);
+
+        getDAVLockService().lock(lockNode.getNodeRef(), lockInfo, getLockTimeout());
         
         if (logger.isDebugEnabled())
         {

remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockService.java

@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Remote API
- * %%
- * 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 Remote API
+ * %%
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 
 package org.alfresco.repo.webdav;
 
@@ -56,7 +56,9 @@ public interface WebDAVLockService
     void lock(NodeRef nodeRef, String userName, int timeout);
 
     void lock(NodeRef nodeRef, LockInfo lockInfo);
-    
+
+    void lock(NodeRef nodeRef, LockInfo lockInfo, int timeout);
+
     /**
      * Shared method for webdav/vti to unlock node. Unlocked node is automatically removed from
      * current sessions's locked resources list.

remote-api/src/main/java/org/alfresco/repo/webdav/WebDAVLockServiceImpl.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -32,7 +32,6 @@ import java.util.List;
 import javax.servlet.http.HttpSession;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.lock.LockUtils;
 import org.alfresco.repo.lock.mem.Lifetime;
 import org.alfresco.repo.lock.mem.LockState;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -237,57 +236,15 @@ public class WebDAVLockServiceImpl implements WebDAVLockService
         }
     }
 
-    public void lock(NodeRef nodeRef, LockInfo lockInfo)
-    {
-        boolean performSessionBehavior = false;
-        long timeout;
-        
-        timeout = lockInfo.getRemainingTimeoutSeconds();    
-        
-        // ALF-11777 fix, do not lock node for more than 24 hours (webdav and vti)
-        if (timeout >= WebDAV.TIMEOUT_24_HOURS || timeout == WebDAV.TIMEOUT_INFINITY)
-        {   
-            timeout = WebDAV.TIMEOUT_24_HOURS;
-            lockInfo.setTimeoutSeconds((int) timeout);
-            performSessionBehavior = true;
-        }
-        
-        // TODO: lock children according to depth? lock type?
-        final String additionalInfo = lockInfo.toJSON();
-        lockService.lock(nodeRef, LockType.WRITE_LOCK, (int) timeout, Lifetime.EPHEMERAL, additionalInfo);
-        
-
-        if (logger.isDebugEnabled())
-        {
-            logger.debug(nodeRef + " was locked for " + timeout + " seconds.");
-        }
-
-        if (performSessionBehavior)
-        {
-            HttpSession session = currentSession.get();
-
-            if (session == null)
-            {
-                if (logger.isDebugEnabled())
-                {
-                    logger.debug("Couldn't find current session.");
-                }
-                return;
-            }
-
-            storeObjectInSessionList(session, LOCKED_RESOURCES, new Pair<String, NodeRef>(AuthenticationUtil.getRunAsUser(), nodeRef));
-
-            if (logger.isDebugEnabled())
-            {
-                logger.debug(nodeRef + " was added to the session " + session.getId() + " for post expiration processing.");
-            }
-        }
+    public void lock(NodeRef nodeRef, LockInfo lockInfo) {
+        int timeout = (int) lockInfo.getRemainingTimeoutSeconds();
+        lock(nodeRef, lockInfo, timeout);
     }
-    
+
     /**
      * Shared method for webdav/vti protocols to lock node. If node is locked for more than 24 hours it is automatically added
      * to the current session locked resources list.
-     * 
+     *
      * @param nodeRef the node to lock
      * @param userName userName
      * @param timeout the number of seconds before the locks expires
@@ -295,8 +252,68 @@ public class WebDAVLockServiceImpl implements WebDAVLockService
     @Override
     public void lock(NodeRef nodeRef, String userName, int timeout)
     {
-        LockInfo lockInfo = createLock(nodeRef, userName, true, timeout);
-        lock(nodeRef, lockInfo);
+        LockInfo lockInfo = createLock(nodeRef, userName, true);
+        lock(nodeRef, lockInfo, timeout);
+    }
+
+    public void lock(NodeRef nodeRef, LockInfo lockInfo, int timeout)
+    {
+        // ALF-11777 fix, do not lock node for more than 24 hours (webdav and vti)
+        boolean performSessionBehavior = false;
+        if (timeout > WebDAV.TIMEOUT_24_HOURS || timeout == WebDAV.TIMEOUT_INFINITY)
+        {
+            timeout = WebDAV.TIMEOUT_24_HOURS;
+            performSessionBehavior = true;
+        }
+
+        validateLockTimeout(timeout);
+        lockInner(nodeRef, lockInfo, timeout);
+
+        if (performSessionBehavior)
+        {
+            performLockSessionBehavior(nodeRef);
+        }
+    }
+
+    private void validateLockTimeout(int timeout) {
+        if (timeout != WebDAV.TIMEOUT_INFINITY && timeout == LockService.TIMEOUT_INFINITY) {
+            throw new IllegalArgumentException("Timeout == " + LockService.TIMEOUT_INFINITY +
+                    " is treated as permanence for locks. For maximum allowed timeout set " + WebDAV.TIMEOUT_INFINITY);
+        }
+    }
+
+    private void lockInner(NodeRef nodeRef, LockInfo lockInfo, int timeout) {
+        //Update/set true expiry date of a lock to be used in additional information
+        lockInfo.setTimeoutSeconds(timeout);
+
+        // TODO: lock children according to depth? lock type?
+        final String additionalInfo = lockInfo.toJSON();
+        lockService.lock(nodeRef, LockType.WRITE_LOCK, timeout, Lifetime.EPHEMERAL, additionalInfo);
+
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(nodeRef + " was locked for " + timeout + " seconds.");
+        }
+    }
+
+    private void performLockSessionBehavior(NodeRef nodeRef) {
+        HttpSession session = currentSession.get();
+
+        if (session == null)
+        {
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Couldn't find current session.");
+            }
+            return;
+        }
+
+        storeObjectInSessionList(session, LOCKED_RESOURCES, new Pair<String, NodeRef>(AuthenticationUtil.getRunAsUser(), nodeRef));
+
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(nodeRef + " was added to the session " + session.getId() + " for post expiration processing.");
+        }
     }
     
     /**
@@ -444,19 +461,15 @@ public class WebDAVLockServiceImpl implements WebDAVLockService
      * @param nodeRef NodeRef
      * @param userName String
      * @param createExclusive boolean
-     * @param timeoutSecs int
      */
-    private LockInfo createLock(NodeRef nodeRef, String userName, boolean createExclusive, int timeoutSecs)
+    private LockInfo createLock(NodeRef nodeRef, String userName, boolean createExclusive)
     {
-        // Create Lock token
         String lockToken = WebDAV.makeLockToken(nodeRef, userName);
 
         LockInfo lockInfo = new LockInfoImpl();
         
         if (createExclusive)
         {
-            // Lock the node
-            lockInfo.setTimeoutSeconds(timeoutSecs);
             lockInfo.setExclusiveLockToken(lockToken);
         }
         else
@@ -464,15 +477,11 @@ public class WebDAVLockServiceImpl implements WebDAVLockService
             lockInfo.addSharedLockToken(lockToken);
         }
 
-        // Store lock depth
         lockInfo.setDepth(WebDAV.getDepthName(WebDAV.DEPTH_INFINITY));
-        // Store lock scope (shared/exclusive)
         String scope = createExclusive ? WebDAV.XML_EXCLUSIVE : WebDAV.XML_SHARED;
         lockInfo.setScope(scope);
-        // Store the owner of this lock
         lockInfo.setOwner(userName);
-        
-        // TODO: to help with debugging/refactoring (remove later)
+
         String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
         if (!currentUser.equals(userName))
         {

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/ActionsImpl.java

@@ -26,11 +26,14 @@
 package org.alfresco.rest.api.impl;
 
 import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.action.ActionExecutionContext;
+import org.alfresco.repo.action.RuntimeActionService;
 import org.alfresco.rest.api.Actions;
 import org.alfresco.rest.api.model.Action;
 import org.alfresco.rest.api.model.ActionDefinition;
 import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
 import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
+import org.alfresco.rest.framework.core.exceptions.PermissionDeniedException;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.rest.framework.resource.parameters.SortColumn;
@@ -72,6 +75,9 @@ public class ActionsImpl implements Actions
     private NamespaceService namespaceService;
     private NodeService nodeService;
     private NamespacePrefixResolver prefixResolver;
+    private RuntimeActionService runtimeActionService;
+
+    private final String HTTP_V1_EXECUTION_SOURCE = "http-v1";
 
     public void setActionService(ActionService actionService)
     {
@@ -98,6 +104,11 @@ public class ActionsImpl implements Actions
         this.prefixResolver = prefixResolver;
     }
 
+    public void setRuntimeActionService(RuntimeActionService runtimeActionService)
+    {
+        this.runtimeActionService = runtimeActionService;
+    }
+
     @Override
     public ActionDefinition getActionDefinitionById(String actionDefinitionId)
     {
@@ -263,6 +274,16 @@ public class ActionsImpl implements Actions
             throw new EntityNotFoundException(action.getActionDefinitionId());
         }
 
+        final ActionExecutionContext actionExecutionContext = ActionExecutionContext
+                .builder(actionDef.getName())
+                .withExecutionSource(HTTP_V1_EXECUTION_SOURCE)
+                .build();
+
+        if (!runtimeActionService.isExposed(actionExecutionContext))
+        {
+            throw new PermissionDeniedException("Action '" + actionDef.getName() + "' is not exposed within '" + HTTP_V1_EXECUTION_SOURCE + "' execution source.");
+        }
+
         // targetId is optional, however, currently targetId must be a valid node ID.
         NodeRef actionedUponNodeRef = null;
         if (action.getTargetId() != null && !action.getTargetId().isEmpty())

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/impl/NodesImpl.java

@@ -3132,26 +3132,18 @@ public class NodesImpl implements Nodes
             // Write content
             writeContent(nodeRef, fileName, content.getInputStream(), true);
         }
-        
+
         if ((versionMajor != null) || (versionComment != null))
         {
-            behaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_VERSIONABLE);
-            try
+            // by default, first version is major, unless specified otherwise
+            VersionType versionType = VersionType.MAJOR;
+            if ((versionMajor != null) && (!versionMajor))
             {
-                // by default, first version is major, unless specified otherwise
-                VersionType versionType = VersionType.MAJOR;
-                if ((versionMajor != null) && (!versionMajor))
-                {
-                    versionType = VersionType.MINOR;
-                }
-
-                createVersion(nodeRef, false, versionType, versionComment);
-
-                extractMetadata(nodeRef);
-            } finally
-            {
-                behaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_VERSIONABLE);
+                versionType = VersionType.MINOR;
             }
+
+            createVersion(nodeRef, false, versionType, versionComment);
+            extractMetadata(nodeRef);
         }
 
         return nodeRef;

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
 {