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

MTN-22905 Fix case sensitivity issues on people search backport

* useCQ = true

* useCQ back to original

* useCQ = true

* Copyright Update

* useCQ restored, Javascrpit changed

* Javascript changes to filter

* PR comments requested change

* Revert "PR comments requested change"

This reverts commit 0673b6c3ff.

* Revert "useCQ restored, Javascrpit changed"

This reverts commit 00b79b5aca.

* Revert "Copyright Update"

This reverts commit 76d1f1c005.

* Revert "useCQ = true"

This reverts commit 215ad952f5.

* Revert "useCQ back to original"

This reverts commit deb5e82218.

* Revert "useCQ = true"

This reverts commit 115910ffc1.

* test change

* Initial changes

* Further changes

* Space deleted

* jobtitle search

* Restore check sorting and mock

* Avoid null [hint:useCQ]

* Wrong sign

* Fix

* Clean up

* Initial changes

* Rename Method

(cherry picked from commit 1ccb8a2164)

.travis.yml

@@ -26,16 +26,13 @@ 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\]/ AND commit_message !~ /\[force[^\]]*\]/
+    if: commit_message !~ /\[skip tests\]/
   - name: release
     if: commit_message !~ /\[no release\]/ AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND fork = false
   - name: update_downstream
@@ -46,13 +43,7 @@ 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
@@ -60,49 +51,43 @@ 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 -am -DfailIfNoTests=false
-        - travis_retry mvn -B test -pl "repository,mmt" -am "-Dtest=AllUnitTestsSuite,AllMmtUnitTestSuite" -DfailIfNoTests=false
+        - travis_retry mvn -B test -pl core,data-model
+        - travis_retry mvn -B test -pl "repository,mmt" "-Dtest=AllUnitTestsSuite,AllMmtUnitTestSuite"
 
     - 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:${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
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
+      script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext01TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContext02TestSuite"
       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 -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
+      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
 
     - 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:${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
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
+      script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext03TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContext04TestSuite"
       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:${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
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
+      script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext04TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContext05TestSuite"
       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
@@ -110,161 +95,142 @@ 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 -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"
+      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"
 
     - 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:${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
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
+      script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContext06TestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - AppContextExtraTestSuite"
       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:${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
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
+      script: travis_wait 20 mvn -B test -pl repository -Dtest=AppContextExtraTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - MiscContextTestSuite"
       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:${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
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
+      script: travis_wait 20 mvn -B test -pl repository -Dtest=MiscContextTestSuite -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
 
     - name: "Repository - SearchTestSuite"
       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 -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
+      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
 
     - 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 -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
+      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
 
     - name: "Repository - 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 -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
+      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
 
     - name: "Repository - 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 -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
+      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
 
     - name: "Repository - 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 -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
+      script: travis_wait 20 mvn -B test -pl repository -Dtest=AllDBTestsTestSuite -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
 
     - name: "Repository - MySQL 5.7.23 tests"
       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 -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
+      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
 
     - 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 -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
+      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
 
     - 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 -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
+      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
 
     - 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 -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
+      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
 
     - 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 -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
+      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
 
     - 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 -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
+      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
 
     - 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 -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
+      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
 
     - 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 -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
+      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
 
     - 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 -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
+      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
 
     - 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 -am -Dtest=CamelRoutesTest,CamelComponentsTest -DfailIfNoTests=false
+      script: travis_wait 20 mvn -B test -pl repository -Dtest=CamelRoutesTest,CamelComponentsTest
 
     - 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
@@ -272,34 +238,30 @@ 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:${TRANSFORMERS_TAG}
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
       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:${TRANSFORMERS_TAG}
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
       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:${TRANSFORMERS_TAG}
+        - docker run -d -p 8090:8090 -e JAVA_OPTS=" -Xms256m -Xmx256m" alfresco/alfresco-transform-core-aio:2.5.7
       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
@@ -308,126 +270,99 @@ 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 verify -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part1 -Denvironment=default -DrunBugs=false
+      script: travis_wait 60 mvn -B install -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 verify -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part2 -Denvironment=default -DrunBugs=false
+      script: travis_wait 60 mvn -B install -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 verify -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part3 -Denvironment=default -DrunBugs=false
+      script: travis_wait 60 mvn -B install -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 verify -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-browser -Denvironment=default -DrunBugs=false
+      script: travis_wait 40 mvn -B install -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 verify -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-atom -Denvironment=default -DrunBugs=false
+      script: travis_wait 40 mvn -B install -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 verify -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-webservices -Denvironment=default -DrunBugs=false
+      script: travis_wait 40 mvn -B install -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 verify -f packaging/tests/tas-email/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+      script: travis_wait 30 mvn -B install -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 verify -f packaging/tests/tas-webdav/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+      script: travis_wait 30 mvn -B install -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 verify -f packaging/tests/tas-integration/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+      script: travis_wait 30 mvn -B install -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 -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
+      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
 
     - 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\]/
-      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}
+      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 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:
@@ -438,12 +373,11 @@ 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 -am -DfailIfNoTests=false -Dskip.automationtests=false -Pags
+      script: travis_wait 40 mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -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>17.1</version>
+      <version>15.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>17.1</version>
+      <version>15.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>17.1</version>
+      <version>15.5</version>
    </parent>
 
    <build>

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

@@ -73,7 +73,6 @@ 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
@@ -258,7 +257,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",groups = { TestGroup.NOT_SUPPORTED_ON_SINGLE_PIPELINE })
+    @Test (dataProvider = "invalidDestinationPaths")
     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,7 +62,6 @@ 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
@@ -208,7 +207,7 @@ public class FileVersionAsRecordTests extends BaseRMRestTest
      * record folder
      * And the document is not declared as a version record
      */
-    @Test (dataProvider = "invalidDestinationPaths", groups = { TestGroup.NOT_SUPPORTED_ON_SINGLE_PIPELINE })
+    @Test (dataProvider = "invalidDestinationPaths")
     public void declareVersionAndFileToInvalidLocationUsingActionsAPI(String containerPath, String expectedException) throws Exception
     {
         STEP("Declare document as record version with an invalid location parameter value");

amps/ags/rm-community/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>17.1</version>
+      <version>15.5</version>
    </parent>
 
    <modules>

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

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

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>17.1</version>
+      <version>15.5</version>
    </parent>
 
    <properties>
@@ -361,12 +361,6 @@
                <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/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuitePt1.java

@@ -43,16 +43,19 @@ 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\\.service\\..*Test",
+    "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.
 
     // 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

@@ -1,78 +0,0 @@
-/*
- * #%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,8 +4,8 @@
 
 # Version label
 version.major=7
-version.minor=3
-version.revision=0
+version.minor=2
+version.revision=1
 version.label=
 
 # Edition 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-rest-api-explorer/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-        <version>17.1</version>
+        <version>15.5</version>
     </parent>
 
     <build>

amps/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.1</version>
+        <version>15.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>17.1</version>
+        <version>15.5</version>
     </parent>
 
     <properties>

core/pom.xml

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

data-model/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.1</version>
+        <version>15.5</version>
     </parent>
 
     <properties>

mmt/pom.xml

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

packaging/distribution/pom.xml

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

packaging/docker-alfresco/pom.xml

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

packaging/pom.xml

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

packaging/tests/environment/.env

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

packaging/tests/pom.xml

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

packaging/tests/scripts/start-compose.sh

@@ -27,9 +27,6 @@ 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>17.1</version>
+        <version>15.5</version>
     </parent>
 
     <developers>

packaging/tests/tas-email/pom.xml

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

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

@@ -11,7 +11,6 @@ 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;
@@ -22,14 +21,10 @@ 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)
@@ -38,8 +33,6 @@ 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,
@@ -113,22 +106,6 @@ 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 })
@@ -164,7 +141,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,7 +7,9 @@ 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;
@@ -38,20 +40,17 @@ public abstract class RenditionIntegrationTests extends RestTest
         FileModel file = new FileModel();
         file.setNodeRef(nodeId);
 
-        // 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
+        // 1. 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]. ");
 
-        // 3. Verify that a rendition of the file is created and has content using RESTAPI
+        // 2. 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] ");
 
-        // 4. Check the returned content type
+        // 3. 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-webdav/pom.xml

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

packaging/war/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>17.1</version>
+        <version>15.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>17.1</version>
+    <version>15.5</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -24,10 +24,10 @@
 
     <properties>
         <acs.version.major>7</acs.version.major>
-        <acs.version.minor>3</acs.version.minor>
-        <acs.version.revision>0</acs.version.revision>
+        <acs.version.minor>2</acs.version.minor>
+        <acs.version.revision>1</acs.version.revision>
         <acs.version.label />
-        <amp.min.version>${acs.version.major}.1.0</amp.min.version>
+        <amp.min.version>${acs.version.major}.0.0</amp.min.version>
 
         <version.edition>Community</version.edition>
         <licenseName>community</licenseName>
@@ -51,8 +51,7 @@
         <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-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-transform-model.version>1.4.15</dependency.alfresco-transform-model.version>
         <dependency.alfresco-greenmail.version>6.2</dependency.alfresco-greenmail.version>
         <dependency.acs-event-model.version>0.0.13</dependency.acs-event-model.version>
 
@@ -119,7 +118,7 @@
         <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.80</dependency.tas-restapi.version>
+        <dependency.tas-restapi.version>1.79</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>
@@ -147,7 +146,7 @@
         <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
         <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
         <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>17.1</tag>
+        <tag>15.5</tag>
     </scm>
 
     <distributionManagement>
@@ -888,7 +887,7 @@
                 <plugin>
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.39.1</version>
+                    <version>0.38.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>

remote-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.1</version>
+        <version>15.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 - 2022 Alfresco Software Limited
+ * 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 
@@ -390,9 +390,8 @@ public class LockInfoImpl implements Serializable, LockInfo
         else
         {
             Date now = dateNow();
-            long remainingTimeoutInSecondsRoundedUp = (Math.max(expires.getTime() - now.getTime(), 0) + 999) / 1000;
-
-            return remainingTimeoutInSecondsRoundedUp;
+            long timeout = ((expires.getTime() - now.getTime()) / 1000);
+            return timeout;
         }
     }
 

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

@@ -1,28 +1,28 @@
-/*
- * #%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%
- */
+/*
+ * #%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%
+ */
 package org.alfresco.repo.webdav;
 
 import java.util.Date;
@@ -449,18 +449,30 @@ public class LockMethod extends WebDAVMethod
      */
     protected final void createLock(FileInfo lockNode, String userName) throws WebDAVServerException
     {
-        if (!createExclusive) {
+        // Create Lock token
+        lockToken = WebDAV.makeLockToken(lockNode.getNodeRef(), userName);
+
+        if (createExclusive)
+        {
+            // Lock the node
+            lockInfo.setTimeoutSeconds(getLockTimeout());
+            lockInfo.setExclusiveLockToken(lockToken);
+        }
+        else
+        {
             // Shared lock creation should already have been prohibited when parsing the request body
             throw new WebDAVServerException(HttpServletResponse.SC_PRECONDITION_FAILED);
         }
 
-        lockToken = WebDAV.makeLockToken(lockNode.getNodeRef(), userName);
-        lockInfo.setExclusiveLockToken(lockToken);
+        // Store lock depth
         lockInfo.setDepth(WebDAV.getDepthName(m_depth));
-        lockInfo.setScope(WebDAV.XML_EXCLUSIVE);
+        // 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);
-
-        getDAVLockService().lock(lockNode.getNodeRef(), lockInfo, getLockTimeout());
+        // Lock the node
+        getDAVLockService().lock(lockNode.getNodeRef(), lockInfo);
         
         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 - 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%
- */
+/*
+ * #%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%
+ */
 
 package org.alfresco.repo.webdav;
 
@@ -56,9 +56,7 @@ 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 - 2022 Alfresco Software Limited
+ * 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 
@@ -32,6 +32,7 @@ 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;
@@ -236,15 +237,57 @@ public class WebDAVLockServiceImpl implements WebDAVLockService
         }
     }
 
-    public void lock(NodeRef nodeRef, LockInfo lockInfo) {
-        int timeout = (int) lockInfo.getRemainingTimeoutSeconds();
-        lock(nodeRef, lockInfo, timeout);
-    }
+    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.");
+            }
+        }
+    }
+    
     /**
      * 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
@@ -252,68 +295,8 @@ public class WebDAVLockServiceImpl implements WebDAVLockService
     @Override
     public void lock(NodeRef nodeRef, String userName, int timeout)
     {
-        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.");
-        }
+        LockInfo lockInfo = createLock(nodeRef, userName, true, timeout);
+        lock(nodeRef, lockInfo);
     }
     
     /**
@@ -461,15 +444,19 @@ 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)
+    private LockInfo createLock(NodeRef nodeRef, String userName, boolean createExclusive, int timeoutSecs)
     {
+        // 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
@@ -477,11 +464,15 @@ 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/impl/ActionsImpl.java

@@ -26,14 +26,11 @@
 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;
@@ -75,9 +72,6 @@ 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)
     {
@@ -104,11 +98,6 @@ public class ActionsImpl implements Actions
         this.prefixResolver = prefixResolver;
     }
 
-    public void setRuntimeActionService(RuntimeActionService runtimeActionService)
-    {
-        this.runtimeActionService = runtimeActionService;
-    }
-
     @Override
     public ActionDefinition getActionDefinitionById(String actionDefinitionId)
     {
@@ -274,16 +263,6 @@ 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/resources/alfresco/public-rest-context.xml

@@ -566,7 +566,6 @@
         <property name="namespaceService" ref="NamespaceService"/>
         <property name="nodeService" ref="NodeService"/>
         <property name="prefixResolver" ref="namespaceService"/>
-        <property name="runtimeActionService" ref="actionService"/>
     </bean>
     <bean id="Actions" class="org.springframework.aop.framework.ProxyFactoryBean">
         <property name="proxyInterfaces" value="org.alfresco.rest.api.Actions"/>

remote-api/src/test/java/org/alfresco/repo/webdav/WebDAVMethodTest.java

@@ -406,82 +406,82 @@ public class WebDAVMethodTest
     }
     
     /* MNT-10555 Test */
-//    @Category(IntermittentlyFailingTests.class) // ACS-959
-//    @Test
-//    public void expiryLockTest()
-//    {
-//        // ACE-4347 extra debug logging just for this test so we can see what's going on when it next fails
-//        Level repoWebdavSaveLogLevel = Logger.getLogger("org.alfresco.repo.webdav").getLevel();
-//        Logger.getLogger("org.alfresco.repo.webdav").setLevel(Level.ALL);
-//        Level webdavProtocolSaveLogLevel = Logger.getLogger("org.alfresco.webdav.protocol").getLevel();
-//        Logger.getLogger("org.alfresco.webdav.protocol").setLevel(Level.ALL);
-//        try
-//        {
-//            setUpApplicationContext();
-//
-//            req = new MockHttpServletRequest();
-//            resp = new MockHttpServletResponse();
-//
-//            String rootPath = "/app:company_home";
-//            StoreRef storeRef = new StoreRef("workspace://SpacesStore");
-//            NodeRef storeRootNodeRef = nodeService.getRootNode(storeRef);
-//            List<NodeRef> nodeRefs = searchService.selectNodes(storeRootNodeRef, rootPath, null, namespaceService, false);
-//            NodeRef defaultRootNode = nodeRefs.get(0);
-//
-//            NodeRef rootNodeRef = tenantService.getRootNode(nodeService, searchService, namespaceService, rootPath, defaultRootNode);
-//
-//            // Create test folder.
-//            NodeRef folderNodeRef = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName("test"), ContentModel.TYPE_FOLDER,
-//                    Collections.<QName, Serializable> singletonMap(ContentModel.PROP_NAME, "WebDavMethodExpiryLockTest" + System.currentTimeMillis())).getChildRef();
-//
-//            // Create test document.
-//            NodeRef nodeRef = nodeService.createNode(folderNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName("test"), ContentModel.TYPE_CONTENT,
-//                    Collections.<QName, Serializable> singletonMap(ContentModel.PROP_NAME, "text.txt")).getChildRef();
-//
-//            lockMethod = new LockMethod();
-//            lockMethod.createExclusive = true;
-//            lockMethod.m_timeoutDuration = 1;
-//            lockMethod.setDetails(req, resp, webDAVHelper, nodeRef);
-//
-//            transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Object>()
-//            {
-//                @Override
-//                public Object execute() throws Throwable
-//                {
-//                    try
-//                {
-//                    // LOCK document.
-//                    lockMethod.executeImpl();
-//
-//                    //wait for the lock to expire up to 5 seconds
-//                    int timeout = 5;
-//                    while( timeout > 0 && !lockMethod.lockInfo.isExpired())
-//                    {
-//                        Thread.sleep(1000);
-//                        timeout--;
-//                    }
-//
-//                    // LOCK against an expired lock.
-//                    lockMethod.executeImpl();
-//                }
-//                catch (WebDAVServerException e)
-//                {
-//                    logger.debug(e);
-//                    Assert.fail("Document was not locked again, when lock has expired.");
-//                }
-//                return null;
-//                }
-//            });
-//
-//            // Remove test folder.
-//            nodeService.deleteNode(folderNodeRef);
-//        }
-//        finally
-//        {
-//            Logger.getLogger("org.alfresco.webdav.protocol").setLevel(webdavProtocolSaveLogLevel);
-//            Logger.getLogger("org.alfresco.repo.webdav").setLevel(repoWebdavSaveLogLevel);
-//        }
-//    }
+    @Category(IntermittentlyFailingTests.class) // ACS-959
+    @Test
+    public void expiryLockTest()
+    {
+        // ACE-4347 extra debug logging just for this test so we can see what's going on when it next fails
+        Level repoWebdavSaveLogLevel = Logger.getLogger("org.alfresco.repo.webdav").getLevel();
+        Logger.getLogger("org.alfresco.repo.webdav").setLevel(Level.ALL);
+        Level webdavProtocolSaveLogLevel = Logger.getLogger("org.alfresco.webdav.protocol").getLevel();
+        Logger.getLogger("org.alfresco.webdav.protocol").setLevel(Level.ALL);
+        try
+        {
+            setUpApplicationContext();
+    
+            req = new MockHttpServletRequest();
+            resp = new MockHttpServletResponse();
+    
+            String rootPath = "/app:company_home";
+            StoreRef storeRef = new StoreRef("workspace://SpacesStore");
+            NodeRef storeRootNodeRef = nodeService.getRootNode(storeRef);
+            List<NodeRef> nodeRefs = searchService.selectNodes(storeRootNodeRef, rootPath, null, namespaceService, false);
+            NodeRef defaultRootNode = nodeRefs.get(0);
+    
+            NodeRef rootNodeRef = tenantService.getRootNode(nodeService, searchService, namespaceService, rootPath, defaultRootNode);
+    
+            // Create test folder.
+            NodeRef folderNodeRef = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName("test"), ContentModel.TYPE_FOLDER,
+                    Collections.<QName, Serializable> singletonMap(ContentModel.PROP_NAME, "WebDavMethodExpiryLockTest" + System.currentTimeMillis())).getChildRef();
+    
+            // Create test document.
+            NodeRef nodeRef = nodeService.createNode(folderNodeRef, ContentModel.ASSOC_CONTAINS, QName.createQName("test"), ContentModel.TYPE_CONTENT,
+                    Collections.<QName, Serializable> singletonMap(ContentModel.PROP_NAME, "text.txt")).getChildRef();
+    
+            lockMethod = new LockMethod();
+            lockMethod.createExclusive = true;
+            lockMethod.m_timeoutDuration = 1;
+            lockMethod.setDetails(req, resp, webDAVHelper, nodeRef);
+    
+            transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Object>()
+            {
+                @Override
+                public Object execute() throws Throwable
+                {
+                    try
+                {
+                    // LOCK document.
+                    lockMethod.executeImpl();
+                    
+                    //wait for the lock to expire up to 5 seconds
+                    int timeout = 5;
+                    while( timeout > 0 && !lockMethod.lockInfo.isExpired())
+                    {
+                        Thread.sleep(1000);
+                        timeout--;
+                    }
+                    
+                    // LOCK against an expired lock.
+                    lockMethod.executeImpl();
+                }
+                catch (WebDAVServerException e)
+                {
+                    logger.debug(e);
+                    Assert.fail("Document was not locked again, when lock has expired.");
+                }
+                return null;
+                }
+            });
+    
+            // Remove test folder.
+            nodeService.deleteNode(folderNodeRef);
+        }
+        finally
+        {
+            Logger.getLogger("org.alfresco.webdav.protocol").setLevel(webdavProtocolSaveLogLevel);
+            Logger.getLogger("org.alfresco.repo.webdav").setLevel(repoWebdavSaveLogLevel);
+        }
+    }
     
     private void assertStatusCode(int expectedStatusCode, String userAgent)
     {

repository/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.1</version>
+        <version>15.5</version>
     </parent>
 
     <dependencies>
@@ -713,7 +713,7 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-transform-model</artifactId>
-            <version>${dependency.alfresco-transform-core.version}</version>
+            <version>${dependency.alfresco-transform-model.version}</version>
         </dependency>
 
         <!-- Test dependencies -->
@@ -735,7 +735,7 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-transform-model</artifactId>
-            <version>${dependency.alfresco-transform-core.version}</version>
+            <version>${dependency.alfresco-transform-model.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>

repository/src/main/java/org/alfresco/repo/action/ActionExecutionContext.java

@@ -1,93 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2022 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * 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.action;
-
-import java.util.Objects;
-
-/**
- * Instances of this class are responsible for holding an action id with additional data used to identify the action's
- * execution context like:
- * <ul>
- *     <li>REST API</li>
- *     <li>rules execution</li>
- *     <li>...</li>
- * </ul>
- */
-public class ActionExecutionContext
-{
-    private final String actionId;
-    private final String executionSource;
-
-    private ActionExecutionContext(String actionId, String executionSource)
-    {
-        this.actionId = actionId;
-        this.executionSource = executionSource;
-    }
-
-    String getActionId()
-    {
-        return actionId;
-    }
-
-    String getExecutionSource()
-    {
-        return executionSource;
-    }
-
-    boolean isExecutionSourceKnown()
-    {
-        return Objects.nonNull(executionSource);
-    }
-
-    public static Builder builder(final String actionId)
-    {
-        Objects.requireNonNull(actionId);
-        return new Builder(actionId);
-    }
-
-    public static class Builder
-    {
-        private final String actionId;
-        private String executionSource;
-
-        private Builder(String actionId)
-        {
-            this.actionId = actionId;
-        }
-
-        public ActionExecutionContext build()
-        {
-            return new ActionExecutionContext(actionId, executionSource);
-        }
-
-        public Builder withExecutionSource(final String executionSource)
-        {
-            Objects.requireNonNull(executionSource);
-            this.executionSource = executionSource;
-            return this;
-        }
-    }
-}

repository/src/main/java/org/alfresco/repo/action/ActionServiceImpl.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -33,14 +33,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Properties;
 import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.evaluator.ActionConditionEvaluator;
@@ -127,8 +120,6 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A
     private ActionTrackingService actionTrackingService;
     private PolicyComponent policyComponent;
     private ActionServiceMonitor monitor;
-    private Properties configProperties;
-    private ActionExecutionValidator actionExecutionValidator;
 
     /**
      * The asynchronous action execution queues map of name, queue
@@ -245,17 +236,7 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A
     {
         this.asynchronousActionExecutionQueues = asynchronousActionExecutionQueues;
     }
-
-    public void setConfigurationProperties(Properties properties)
-    {
-        this.configProperties = properties;
-    }
-
-    protected Properties getConfigurationProperties()
-    {
-        return configProperties;
-    }
-
+    
     /**
      * This method registers an {@link AsynchronousActionExecutionQueue} with the {@link ActionService}.
      * @param key String
@@ -275,11 +256,6 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A
                     ActionModel.TYPE_ACTION_PARAMETER, new JavaBehaviour(this, "getCopyCallback"));
         this.policyComponent.bindClassBehaviour(QName.createQName(NamespaceService.ALFRESCO_URI, "onCopyComplete"),
                     ActionModel.TYPE_ACTION_PARAMETER, new JavaBehaviour(this, "onCopyComplete"));
-        if (configProperties == null)
-        {
-            configProperties = applicationContext.getBean("global-properties", Properties.class);
-        }
-        actionExecutionValidator = new ActionExecutionValidator(configProperties::getProperty, actionDefinitions::containsKey);
     }
 
     /**
@@ -1894,58 +1870,5 @@ public class ActionServiceImpl implements ActionService, RuntimeActionService, A
         LoggingAwareExecuter executer = (LoggingAwareExecuter) this.applicationContext.getBean(action.getActionDefinitionName());
         return executer.onLogException(logger,t, message);
     }
-
-    @Override
-    public boolean isExposed(ActionExecutionContext actionExecutionContext)
-    {
-        return actionExecutionValidator.isExposed(actionExecutionContext);
-    }
-
-    static class ActionExecutionValidator
-    {
-        private final Function<String, String> config;
-        private final Predicate<String> isPublic;
-
-        ActionExecutionValidator(Function<String, String> config, Predicate<String> isPublic)
-        {
-            this.config = Objects.requireNonNull(config);
-            this.isPublic = Objects.requireNonNull(isPublic);
-        }
-
-        boolean isExposed(ActionExecutionContext actionExecutionContext)
-        {
-            Objects.requireNonNull(actionExecutionContext);
-            return isExposedInConfig(actionExecutionContext).orElseGet(() -> isPublic(actionExecutionContext));
-        }
-
-        private Optional<Boolean> isExposedInConfig(ActionExecutionContext actionExecutionContext)
-        {
-            return getConfigKeys(actionExecutionContext).
-                    map(config).
-                    filter(Objects::nonNull).
-                    map(Boolean::parseBoolean).
-                    findFirst();
-        }
-
-        private Boolean isPublic(ActionExecutionContext actionExecutionContext)
-        {
-            return isPublic.test(actionExecutionContext.getActionId());
-        }
-
-        private static Stream<String> getConfigKeys(ActionExecutionContext actionExecutionContext)
-        {
-            if (actionExecutionContext.isExecutionSourceKnown())
-            {
-                return Stream.of(
-                        getConfigKey(actionExecutionContext.getExecutionSource(), actionExecutionContext.getActionId()),
-                        getConfigKey(actionExecutionContext.getActionId()));
-            }
-            return Stream.of(getConfigKey(actionExecutionContext.getActionId()));
-        }
-
-        static String getConfigKey(String... parts)
-        {
-            return Stream.of(parts).collect(Collectors.joining(".", "org.alfresco.repo.action.", ".exposed"));
-        }
-    }
+    
 }

repository/src/main/java/org/alfresco/repo/action/RuntimeActionService.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * 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 
@@ -125,14 +125,4 @@ public interface RuntimeActionService
      * @return true if it was handled, false for default handling
      */
     public boolean onLogException(Action action, Log logger, Throwable t, String message);
-
-    /**
-     * Allows you to check if an action can be executed/used in a given execution context
-     * @param actionExecutionContext describes action and its execution context
-     * @return true if action can be executed, false otherwise
-     */
-    default boolean isExposed(ActionExecutionContext actionExecutionContext)
-    {
-        return true;
-    }
 }

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2019-2022 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * If the software was purchased under a paid Alfresco license, the terms of

repository/src/main/java/org/alfresco/repo/lock/LockServiceImpl.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -321,7 +321,7 @@ public class LockServiceImpl implements LockService,
     public void lock(NodeRef nodeRef, LockType lockType)
     {
         // Lock with no expiration
-        lock(nodeRef, lockType, TIMEOUT_INFINITY);
+        lock(nodeRef, lockType, 0);
     }
 
     /**
@@ -371,8 +371,16 @@ public class LockServiceImpl implements LockService,
     public void lock(NodeRef nodeRef, LockType lockType, int timeToExpire, Lifetime lifetime, String additionalInfo)
     {
         invokeBeforeLock(nodeRef, lockType);
-        validateTimeToExpire(timeToExpire, lifetime);
-        lifetime = switchLifetimeMode(timeToExpire, lifetime);
+        if (lifetime.equals(Lifetime.EPHEMERAL) && (timeToExpire > MAX_EPHEMERAL_LOCK_SECONDS))
+        {
+            throw new IllegalArgumentException("Attempt to create ephemeral lock for " +
+                    timeToExpire + " seconds - exceeds maximum allowed time.");
+        }
+        if (lifetime.equals(Lifetime.EPHEMERAL) && (timeToExpire > ephemeralExpiryThreshold))
+        {
+            lifetime = Lifetime.PERSISTENT;
+        }
+         
         
         nodeRef = tenantService.getName(nodeRef);
         
@@ -434,22 +442,6 @@ public class LockServiceImpl implements LockService,
             }
         }
     }
-
-    private void validateTimeToExpire(int timeToExpire, Lifetime lifetime) {
-        if (lifetime.equals(Lifetime.EPHEMERAL) && (timeToExpire > MAX_EPHEMERAL_LOCK_SECONDS))
-        {
-            throw new IllegalArgumentException("Attempt to create ephemeral lock for " +
-                    timeToExpire + " seconds - exceeds maximum allowed time.");
-        }
-    }
-
-    private Lifetime switchLifetimeMode(int timeToExpire, Lifetime lifetime) {
-        if (lifetime.equals(Lifetime.EPHEMERAL) && (timeToExpire > ephemeralExpiryThreshold))
-        {
-            return Lifetime.PERSISTENT;
-        }
-        return lifetime;
-    }
     
     private void persistLockProps(NodeRef nodeRef, LockType lockType, Lifetime lifetime, String userName, Date expiryDate, String additionalInfo)
     {  
@@ -476,16 +468,16 @@ public class LockServiceImpl implements LockService,
      */
     private Date makeExpiryDate(int timeToExpire)
     {
-        boolean permanent = timeToExpire <= TIMEOUT_INFINITY;
-        if (permanent) {
-            return null;
+        // Set the expiry date
+        Date expiryDate = null;
+        if (timeToExpire > 0)
+        {
+            expiryDate = new Date();
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(expiryDate);
+            calendar.add(Calendar.SECOND, timeToExpire);
+            expiryDate = calendar.getTime();
         }
-
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(new Date());
-        calendar.add(Calendar.SECOND, timeToExpire);
-        Date expiryDate = calendar.getTime();
-
         return expiryDate;
     }
 

repository/src/main/java/org/alfresco/repo/search/impl/solr/DbCmisQueryLanguage.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software. 
  * If the software was purchased under a paid Alfresco license, the terms of 
@@ -23,7 +23,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.repo.search.impl;
+package org.alfresco.repo.search.impl.solr;
 
 import org.alfresco.opencmis.dictionary.CMISDictionaryService;
 import org.alfresco.opencmis.search.CMISQueryOptions;

repository/src/main/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguage.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * 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 
@@ -23,7 +23,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.repo.search.impl;
+package org.alfresco.repo.search.impl.solr;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -36,7 +36,6 @@ import org.alfresco.repo.domain.solr.SearchDAO;
 import org.alfresco.repo.search.impl.lucene.AbstractLuceneQueryLanguage;
 import org.alfresco.repo.search.impl.lucene.LuceneQueryLanguageSPI;
 import org.alfresco.repo.search.impl.querymodel.QueryModelException;
-import org.alfresco.repo.search.impl.solr.SolrJSONResultSet;
 import org.alfresco.repo.search.results.ChildAssocRefResultSet;
 import org.alfresco.repo.solr.NodeParameters;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -62,16 +61,12 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
     LuceneQueryLanguageSPI indexQueryLanguage;
     
     QueryConsistency queryConsistency = QueryConsistency.DEFAULT;
-    QueryConsistency solrQueryConsistency = null; // Deprecated
     
     private NodeService nodeService;
     
     private SearchDAO searchDao;
     
-    private Boolean hybridEnabled;
-    private Boolean solrHybridEnabled; // Deprecated
-
-    private String subsystemName;
+    private boolean hybridEnabled;
     
     /**
      * @param dbQueryLanguage the dbQueryLanguage to set
@@ -97,12 +92,6 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
         this.queryConsistency = queryConsistency;
     }
 
-    // Deprecated
-    public void setSolrQueryConsistency(QueryConsistency solrQueryConsistency)
-    {
-        this.solrQueryConsistency = solrQueryConsistency;
-    }
-
     /**
      * @param nodeService the nodeService to set
      */
@@ -116,35 +105,17 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
         this.searchDao = searchDao;
     }
 
-    public void setHybridEnabled(Boolean hybridEnabled)
+    public void setHybridEnabled(boolean hybridEnabled)
     {
         this.hybridEnabled = hybridEnabled;
     }
 
-    // Deprecated
-    public void setSolrHybridEnabled(Boolean solrHybridEnabled)
-    {
-        this.solrHybridEnabled = solrHybridEnabled;
-    }
-
-    public void setSubsystemName(String subsystemName)
-    {
-        this.subsystemName = subsystemName;
-    }
-
     public ResultSet executeQuery(SearchParameters searchParameters)
     {
         QueryConsistency consistency = searchParameters.getQueryConsistency();
         if(consistency == QueryConsistency.DEFAULT)
         {
-            if(solrQueryConsistency != null)
-            {
-                consistency = solrQueryConsistency;
-            }
-            else 
-            {
-                consistency = queryConsistency;
-            }
+            consistency = queryConsistency;
         }
  
         switch(consistency)
@@ -154,7 +125,7 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
             {
                 if(logger.isDebugEnabled())
                 {
-                    logger.debug("Using "+subsystemName+" query: "+dbQueryLanguage.getName()+" for "+searchParameters);
+                    logger.debug("Using SOLR query: "+dbQueryLanguage.getName()+" for "+searchParameters);
                 }
                 StopWatch stopWatch = new StopWatch("index only");
                 stopWatch.start();
@@ -162,7 +133,7 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
                 stopWatch.stop();
                 if (logger.isDebugEnabled())
                 {
-                    logger.debug(subsystemName+" returned " + results.length() + " results in " +
+                    logger.debug("SOLR returned " + results.length() + " results in " +
                                  stopWatch.getLastTaskTimeMillis() + "ms");
                 }
                 return results;
@@ -194,7 +165,7 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
                 throw new QueryModelException("No query language available");
             }
         case HYBRID:
-            if (((solrHybridEnabled != null) && (!solrHybridEnabled)) || (hybridEnabled == null) || (!hybridEnabled))
+            if (!hybridEnabled)
             {
                 throw new DisabledFeatureException("Hybrid query is disabled.");
             }
@@ -238,7 +209,7 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
                     {
                         if(logger.isDebugEnabled())
                         {
-                            logger.debug("Using "+subsystemName+" query: "+dbQueryLanguage.getName()+" for "+searchParameters);
+                            logger.debug("Using SOLR query: "+dbQueryLanguage.getName()+" for "+searchParameters);
                         }
                         stopWatch.start();
 
@@ -247,7 +218,7 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
                         stopWatch.stop();
                         if (logger.isDebugEnabled())
                         {
-                            logger.debug(subsystemName+" returned " + results.length() + " results in " +
+                            logger.debug("SOLR returned " + results.length() + " results in " +
                                          stopWatch.getLastTaskTimeMillis() + "ms");
                         }
                         return results;
@@ -260,14 +231,14 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
                 {
                     if(logger.isDebugEnabled())
                     {
-                        logger.debug("(No DB QL) Using "+subsystemName+" query: "+"dbQueryLanguage==null"+" for "+searchParameters);
+                        logger.debug("(No DB QL) Using SOLR query: "+"dbQueryLanguage==null"+" for "+searchParameters);
                     }
                     stopWatch.start();
                     ResultSet results = indexQueryLanguage.executeQuery(searchParameters);
                     stopWatch.stop();
                     if (logger.isDebugEnabled())
                     {
-                        logger.debug(subsystemName+" returned " + results.length() + " results in " +
+                        logger.debug("SOLR returned " + results.length() + " results in " +
                                      stopWatch.getLastTaskTimeMillis() + "ms");
                     }
                     return results;
@@ -311,21 +282,21 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
     {        
         if (indexQueryLanguage == null || dbQueryLanguage == null)
         {
-            throw new QueryModelException("Both "+subsystemName+" and DB query language required for hybrid search [index=" +
+            throw new QueryModelException("Both index and DB query language required for hybrid search [index=" +
                                           indexQueryLanguage + ", DB=" + dbQueryLanguage + "]");
         }
         
         StopWatch stopWatch = new StopWatch("hybrid search");
         if (logger.isDebugEnabled())
         {
-            logger.debug("Hybrid search, using "+subsystemName+" query: "+dbQueryLanguage.getName()+" for "+searchParameters);
+            logger.debug("Hybrid search, using SOLR query: "+dbQueryLanguage.getName()+" for "+searchParameters);
         }
         stopWatch.start("index query");
         ResultSet indexResults = indexQueryLanguage.executeQuery(searchParameters);
         stopWatch.stop();
         if (logger.isDebugEnabled())
         {
-            logger.debug(subsystemName+" query returned " + indexResults.length() + " results in " +
+            logger.debug("SOLR query returned " + indexResults.length() + " results in " +
                          stopWatch.getLastTaskTimeMillis() + "ms");
         }
         // TODO: if the results are up-to-date, then nothing more to do - return the results.
@@ -334,7 +305,7 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
         {
             if (logger.isWarnEnabled())
             {
-                logger.warn("Hybrid search can only use database when "+subsystemName+" is also in use. " +
+                logger.warn("Hybrid search can only use database when SOLR is also in use. " +
                             "Skipping DB search, returning results from index.");
             }
             return indexResults;            
@@ -374,7 +345,7 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
         {
             nodeRefs.add(n.getNodeRef());
         }
-        // Only use the Search Index results for nodes that haven't changed since indexing.
+        // Only use the SOLR results for nodes that haven't changed since indexing.
         for (ChildAssociationRef car : indexResults.getChildAssocRefs())
         {
             if (!nodeRefs.contains(car.getChildRef()))
@@ -389,7 +360,7 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
         stopWatch.stop(); // merge result sets
         if (logger.isDebugEnabled())
         {
-            String stats = String.format(subsystemName+"=%d, DB=%d, total=%d",
+            String stats = String.format("SOLR=%d, DB=%d, total=%d",
                         indexResults.length(), dbResults.length(), results.length());
             logger.debug("Hybrid search returning combined results with counts: " + stats);
             logger.debug(stopWatch.prettyPrint());

repository/src/main/java/org/alfresco/repo/search/impl/solr/DisabledFeatureException.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * 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 
@@ -23,19 +23,19 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.repo.search.impl;
-
-/**
- * Identifies an attempt to use a disabled feature.
- * 
- * @author Matt Ward
- */
-public class DisabledFeatureException extends RuntimeException
-{
-    private static final long serialVersionUID = 1L;
-
-    DisabledFeatureException(String message)
-    {
-        super(message);
-    }
+package org.alfresco.repo.search.impl.solr;
+
+/**
+ * Identifies an attempt to use a disabled feature.
+ * 
+ * @author Matt Ward
+ */
+public class DisabledFeatureException extends RuntimeException
+{
+    private static final long serialVersionUID = 1L;
+
+    DisabledFeatureException(String message)
+    {
+        super(message);
+    }
 }

repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrOpenCMISQueryServiceImpl.java

@@ -1,29 +1,29 @@
-/*
- * #%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.search.impl;
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.repo.search.impl.solr;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -52,19 +52,19 @@ import org.apache.chemistry.opencmis.commons.enums.CapabilityQuery;
 /**
  * @author Andy
  */
-public class OpenCMISQueryServiceImpl implements CMISQueryService
+public class SolrOpenCMISQueryServiceImpl implements CMISQueryService
 {
-    private LuceneQueryLanguageSPI queryLanguage;
+    private LuceneQueryLanguageSPI solrQueryLanguage;
     
     private NodeService nodeService;
 
     private DictionaryService alfrescoDictionaryService;
 
     private CMISDictionaryService cmisDictionaryService;
-
-    public void setQueryLanguage(LuceneQueryLanguageSPI queryLanguage)
+    
+    public void setSolrQueryLanguage(LuceneQueryLanguageSPI solrQueryLanguage)
     {
-        this.queryLanguage = queryLanguage;
+        this.solrQueryLanguage = solrQueryLanguage;
     }
 
     public void setNodeService(NodeService nodeService)
@@ -87,7 +87,7 @@ public class OpenCMISQueryServiceImpl implements CMISQueryService
     {
     	SearchParameters searchParameters = options.getAsSearchParmeters();
     	searchParameters.addExtraParameter("cmisVersion", options.getCmisVersion().toString());
-        ResultSet rs = queryLanguage.executeQuery(searchParameters);
+        ResultSet rs = solrQueryLanguage.executeQuery(searchParameters);
         
         CapabilityJoin joinSupport = getJoinSupport();
         if(options.getQueryMode() == CMISQueryOptions.CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS)

repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java

@@ -25,15 +25,27 @@
  */
 package org.alfresco.repo.security.permissions.impl.acegi;
 
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
 import net.sf.acegisecurity.AccessDeniedException;
 import net.sf.acegisecurity.Authentication;
 import net.sf.acegisecurity.ConfigAttribute;
 import net.sf.acegisecurity.ConfigAttributeDefinition;
 import net.sf.acegisecurity.afterinvocation.AfterInvocationProvider;
+
 import org.alfresco.opencmis.search.CMISResultSet;
-import org.alfresco.repo.search.SearchEngineResultSet;
 import org.alfresco.repo.search.SimpleResultSetMetaData;
 import org.alfresco.repo.search.impl.lucene.PagingLuceneResultSet;
+import org.alfresco.repo.search.impl.solr.SolrJSONResultSet;
 import org.alfresco.repo.search.impl.querymodel.QueryEngineResults;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.permissions.PermissionCheckCollection;
@@ -60,17 +72,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
 /**
  * Enforce permission after the method call
  * 
@@ -275,8 +276,8 @@ public class ACLEntryAfterInvocationProvider implements AfterInvocationProvider,
             {
                 return decide(authentication, object, config, (ChildAssociationRef) returnedObject);
             }
-            else if (SearchEngineResultSet.class.isAssignableFrom(returnedObject.getClass()) &&
-                        (!anyDenyDenies || (!postProcessDenies && ((SearchEngineResultSet)returnedObject).getProcessedDenies())))
+            else if (SolrJSONResultSet.class.isAssignableFrom(returnedObject.getClass()) &&
+                        (!anyDenyDenies || (!postProcessDenies && ((SolrJSONResultSet)returnedObject).getProcessedDenies())))
             {
                 return returnedObject;
             }

repository/src/main/java/org/alfresco/service/cmr/lock/LockService.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * 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 
@@ -42,8 +42,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
 @AlfrescoPublicApi
 public interface LockService
 {
-   int TIMEOUT_INFINITY = 0;
-
    /**
     * Places a lock on a node.  
     * <p>

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

@@ -75,9 +75,6 @@
         <property name="monitor">
             <ref bean="actionServiceMonitor"/>
         </property>
-        <property name="configurationProperties">
-            <ref bean="global-properties"/>
-        </property>
     </bean>
 
     <bean id="defaultAsynchronousActionExecutionQueue" class="org.alfresco.repo.action.AsynchronousActionExecutionQueueImpl" init-method="init">

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

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

repository/src/main/resources/alfresco/subsystems/Search/common-opencmis-context.xml

@@ -4,7 +4,7 @@
 <!-- Core and miscellaneous bean definitions -->
 <beans>
 
-    <bean id="base.search.cmis.alfresco.switching" abstract="true" class="org.alfresco.repo.search.impl.DbOrIndexSwitchingQueryLanguage">
+    <bean id="search.cmis.alfresco.switching" class="org.alfresco.repo.search.impl.solr.DbOrIndexSwitchingQueryLanguage" >
         <property name="factories">
             <list>
                 <ref bean="search.indexerAndSearcherFactory" />
@@ -19,19 +19,15 @@
         <property name="indexQueryLanguage">
             <ref bean="search.cmis.alfresco.index" />
         </property>
-
-        <property name="queryConsistency" value="${query.cmis.queryConsistency}"/>
-        <property name="solrQueryConsistency" value="${solr.query.cmis.queryConsistency}"/>
-
-        <!-- Deprecated -->
-        <property name="hybridEnabled" value="${query.hybrid.enabled}"/>
-        <property name="solrHybridEnabled" value="${solr.query.hybrid.enabled}"/>
-
+        <property name="queryConsistency">
+            <value>${solr.query.cmis.queryConsistency}</value>
+        </property>
         <property name="nodeService" ref="NodeService"/>
         <property name="searchDao" ref="searchDAO"/>
+        <property name="hybridEnabled" value="${solr.query.hybrid.enabled}"/>
     </bean>
 
-    <bean id="base.search.cmis.alfresco.switching1.1" abstract="true" class="org.alfresco.repo.search.impl.DbOrIndexSwitchingQueryLanguage">
+    <bean id="search.cmis.alfresco.switching1.1" class="org.alfresco.repo.search.impl.solr.DbOrIndexSwitchingQueryLanguage" >
         <property name="factories">
             <list>
                 <ref bean="search.indexerAndSearcherFactory" />
@@ -46,15 +42,12 @@
         <property name="indexQueryLanguage">
             <ref bean="search.cmis.alfresco.index" />
         </property>
-
-        <property name="queryConsistency" value="${query.cmis.queryConsistency}"/>
-
-        <!-- Deprecated -->
-        <property name="solrQueryConsistency" value="${solr.query.cmis.queryConsistency}"/> 
-
+        <property name="queryConsistency">
+            <value>${solr.query.cmis.queryConsistency}</value>
+        </property>
     </bean>
 
-    <bean id="base.search.cmis.strict.switching" abstract="true" class="org.alfresco.repo.search.impl.DbOrIndexSwitchingQueryLanguage">
+    <bean id="search.cmis.strict.switching" class="org.alfresco.repo.search.impl.solr.DbOrIndexSwitchingQueryLanguage" >
         <property name="factories">
             <list>
                 <ref bean="search.indexerAndSearcherFactory" />
@@ -69,19 +62,15 @@
         <property name="indexQueryLanguage">
             <ref bean="search.cmis.alfresco.index" />
         </property>
-
-        <property name="queryConsistency" value="${query.cmis.queryConsistency}"/>
-        <property name="solrQueryConsistency" value="${solr.query.cmis.queryConsistency}"/>
-
-        <!-- Deprecated -->
-        <property name="hybridEnabled" value="${query.hybrid.enabled}"/>
-        <property name="solrHybridEnabled" value="${solr.query.hybrid.enabled}"/>
-
+        <property name="queryConsistency">
+            <value>${solr.query.cmis.queryConsistency}</value>
+        </property>
         <property name="nodeService" ref="NodeService"/>
         <property name="searchDao" ref="searchDAO"/>
+        <property name="hybridEnabled" value="${solr.query.hybrid.enabled}"/>
     </bean>
 
-    <bean id="search.cmis.alfresco.db" class="org.alfresco.repo.search.impl.DbCmisQueryLanguage" >
+    <bean id="search.cmis.alfresco.db" class="org.alfresco.repo.search.impl.solr.DbCmisQueryLanguage" >
         <property name="factories">
             <list>
                 <ref bean="search.indexerAndSearcherFactory" />
@@ -101,7 +90,7 @@
         </property>
     </bean>
 
-    <bean id="search.cmis.alfresco.db1.1" class="org.alfresco.repo.search.impl.DbCmisQueryLanguage" >
+    <bean id="search.cmis.alfresco.db1.1" class="org.alfresco.repo.search.impl.solr.DbCmisQueryLanguage" >
         <property name="factories">
             <list>
                 <ref bean="search.indexerAndSearcherFactory" />

repository/src/main/resources/alfresco/subsystems/Search/common-search-context.xml

@@ -64,8 +64,8 @@
         </property>
         <!-- Query collections should be loaded on demand using this component - once loaded thay are available for use -->
     </bean>
-
-    <bean id="base.search.fts.alfresco.switching" abstract="true" class="org.alfresco.repo.search.impl.DbOrIndexSwitchingQueryLanguage">
+    
+    <bean id="search.fts.alfresco.switching" class="org.alfresco.repo.search.impl.solr.DbOrIndexSwitchingQueryLanguage" >
         <property name="factories">
             <list>
                 <ref bean="search.indexerAndSearcherFactory" />
@@ -80,16 +80,12 @@
         <property name="indexQueryLanguage">
             <ref bean="search.fts.alfresco.index" />
         </property>
-
-        <property name="queryConsistency" value="${query.fts.queryConsistency}"/>
-        <property name="solrQueryConsistency" value="${solr.query.fts.queryConsistency}"/>
-
-        <!-- Deprecated -->
-        <property name="hybridEnabled" value="${query.hybrid.enabled}"/>
-        <property name="solrHybridEnabled" value="${solr.query.hybrid.enabled}"/> 
-
+        <property name="queryConsistency">
+            <value>${solr.query.fts.queryConsistency}</value>
+        </property>
         <property name="searchDao" ref="searchDAO"/>
-    </bean>
+        <property name="hybridEnabled" value="${solr.query.hybrid.enabled}"/>
+    </bean> 
 
     <bean id="search.fts.alfresco.db" class="org.alfresco.repo.search.impl.solr.DbAftsQueryLanguage" >
         <property name="dictionaryService" ref="dictionaryService" />

repository/src/main/resources/alfresco/subsystems/Search/noindex/common-search.properties

@@ -2,14 +2,9 @@ search.solrTrackingSupport.enabled=true
 search.solrTrackingSupport.ignorePathsForSpecificTypes=false
 search.solrTrackingSupport.ignorePathsForSpecificAspects=false
 
-# Deprecated
-solr.query.fts.queryConsistency=
-solr.query.cmis.queryConsistency=
-solr.query.hybrid.enabled=
-
-query.fts.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
-query.cmis.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
-query.hybrid.enabled=false
+solr.query.fts.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
+solr.query.cmis.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
+solr.query.hybrid.enabled=false
 
 search.solrShardRegistry.purgeOnInit=false
 search.solrShardRegistry.shardInstanceTimeoutInSeconds=300

repository/src/main/resources/alfresco/subsystems/Search/noindex/noindex-search-context.xml

@@ -99,11 +99,7 @@
             <ref bean="search.indexerAndSearcherFactory" />
         </property>
     </bean>
-
-    <bean id="search.fts.alfresco.switching" parent="base.search.fts.alfresco.switching" >
-        <property name="subsystemName" value="noindex"/>
-    </bean>
-
+    
     <bean id="search.fts.alfresco.index" class="org.alfresco.repo.search.impl.solr.NoIndexQueryLanguage" >
         <property name="factories">
             <list>

repository/src/main/resources/alfresco/subsystems/Search/noindex/opencmis-context.xml

@@ -5,19 +5,7 @@
 
    <import resource="../common-opencmis-context.xml" />
 
-    <bean id="search.cmis.alfresco.switching" parent="base.search.cmis.alfresco.switching" >
-        <property name="subsystemName" value="noindex"/>
-    </bean>
-
-    <bean id="search.cmis.alfresco.switching1.1" parent="base.search.cmis.alfresco.switching1.1" >
-        <property name="subsystemName" value="noindex"/>
-    </bean>
-
-    <bean id="search.cmis.strict.switching" parent="base.search.cmis.strict.switching" >
-        <property name="subsystemName" value="noindex"/>
-    </bean>
-
-  <bean id="search.OpenCMISQueryService" class="org.alfresco.repo.search.impl.OpenCMISQueryServiceImpl" >
+  <bean id="search.OpenCMISQueryService" class="org.alfresco.repo.search.impl.solr.SolrOpenCMISQueryServiceImpl" >
        <property name="cmisDictionaryService">
             <ref bean="OpenCMISDictionaryService" />
         </property>
@@ -27,12 +15,12 @@
         <property name="alfrescoDictionaryService">
             <ref bean="dictionaryService" />
         </property>
-        <property name="queryLanguage">
+        <property name="solrQueryLanguage">
             <ref bean="search.cmis.alfresco.switching" />
         </property>
     </bean>
 
-   <bean id="search.OpenCMISQueryService1.1" class="org.alfresco.repo.search.impl.OpenCMISQueryServiceImpl" >
+   <bean id="search.OpenCMISQueryService1.1" class="org.alfresco.repo.search.impl.solr.SolrOpenCMISQueryServiceImpl" >
        <property name="cmisDictionaryService">
             <ref bean="OpenCMISDictionaryService1.1" />
         </property>
@@ -42,7 +30,7 @@
         <property name="alfrescoDictionaryService">
             <ref bean="dictionaryService" />
         </property>
-        <property name="queryLanguage">
+        <property name="solrQueryLanguage">
             <ref bean="search.cmis.alfresco.switching1.1" />
         </property>
     </bean>

repository/src/main/resources/alfresco/subsystems/Search/solr/common-search.properties

@@ -2,14 +2,9 @@ search.solrTrackingSupport.enabled=true
 search.solrTrackingSupport.ignorePathsForSpecificTypes=false
 search.solrTrackingSupport.ignorePathsForSpecificAspects=false
 
-# Deprecated
-solr.query.fts.queryConsistency=
-solr.query.cmis.queryConsistency=
-solr.query.hybrid.enabled=
-
-query.fts.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
-query.cmis.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
-query.hybrid.enabled=false
+solr.query.fts.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
+solr.query.cmis.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
+solr.query.hybrid.enabled=false
 
 search.solrShardRegistry.purgeOnInit=false
 search.solrShardRegistry.shardInstanceTimeoutInSeconds=300

repository/src/main/resources/alfresco/subsystems/Search/solr/opencmis-context.xml

@@ -4,19 +4,7 @@
 <beans>
    <import resource="../common-opencmis-context.xml" />
 
-    <bean id="search.cmis.alfresco.switching" parent="base.search.cmis.alfresco.switching" >
-        <property name="subsystemName" value="solr"/>
-    </bean>
-
-    <bean id="search.cmis.alfresco.switching1.1" parent="base.search.cmis.alfresco.switching1.1" >
-        <property name="subsystemName" value="solr"/>
-    </bean>
-
-    <bean id="search.cmis.strict.switching" parent="base.search.cmis.strict.switching" >
-        <property name="subsystemName" value="solr"/>
-    </bean>
-
-   <bean id="search.OpenCMISQueryService" class="org.alfresco.repo.search.impl.OpenCMISQueryServiceImpl" >
+   <bean id="search.OpenCMISQueryService" class="org.alfresco.repo.search.impl.solr.SolrOpenCMISQueryServiceImpl" >
        <property name="cmisDictionaryService">
             <ref bean="OpenCMISDictionaryService" />
         </property>
@@ -26,12 +14,12 @@
         <property name="alfrescoDictionaryService">
             <ref bean="dictionaryService" />
         </property>
-        <property name="queryLanguage">
+        <property name="solrQueryLanguage">
             <ref bean="search.cmis.alfresco.switching" />
         </property>
     </bean>
 
-   <bean id="search.OpenCMISQueryService1.1" class="org.alfresco.repo.search.impl.OpenCMISQueryServiceImpl" >
+   <bean id="search.OpenCMISQueryService1.1" class="org.alfresco.repo.search.impl.solr.SolrOpenCMISQueryServiceImpl" >
        <property name="cmisDictionaryService">
             <ref bean="OpenCMISDictionaryService1.1" />
         </property>
@@ -41,7 +29,7 @@
         <property name="alfrescoDictionaryService">
             <ref bean="dictionaryService" />
         </property>
-        <property name="queryLanguage">
+        <property name="solrQueryLanguage">
             <ref bean="search.cmis.alfresco.switching1.1" />
         </property>
     </bean>

repository/src/main/resources/alfresco/subsystems/Search/solr/solr-search-context.xml

@@ -168,11 +168,7 @@
         </property>
         
     </bean>
-
-    <bean id="search.fts.alfresco.switching" parent="base.search.fts.alfresco.switching" >
-        <property name="subsystemName" value="solr"/>
-    </bean>
-
+    
     <bean id="search.index.alfresco" class="org.alfresco.repo.search.impl.solr.SolrQueryLanguage"  >
         <property name="factories">
             <list>

repository/src/main/resources/alfresco/subsystems/Search/solr4/common-search.properties

@@ -2,14 +2,9 @@ search.solrTrackingSupport.enabled=true
 search.solrTrackingSupport.ignorePathsForSpecificTypes=false
 search.solrTrackingSupport.ignorePathsForSpecificAspects=false
 
-# Deprecated
-solr.query.fts.queryConsistency=
-solr.query.cmis.queryConsistency=
-solr.query.hybrid.enabled=
-
-query.fts.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
-query.cmis.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
-query.hybrid.enabled=false
+solr.query.fts.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
+solr.query.cmis.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
+solr.query.hybrid.enabled=false
 
 search.solrShardRegistry.purgeOnInit=false
 search.solrShardRegistry.shardInstanceTimeoutInSeconds=300

repository/src/main/resources/alfresco/subsystems/Search/solr4/opencmis-context.xml

@@ -4,19 +4,7 @@
 <beans>
    <import resource="../common-opencmis-context.xml" />
 
-    <bean id="search.cmis.alfresco.switching" parent="base.search.cmis.alfresco.switching" >
-        <property name="subsystemName" value="solr4"/>
-    </bean>
-
-    <bean id="search.cmis.alfresco.switching1.1" parent="base.search.cmis.alfresco.switching1.1" >
-        <property name="subsystemName" value="solr4"/>
-    </bean>
-
-    <bean id="search.cmis.strict.switching" parent="base.search.cmis.strict.switching" >
-        <property name="subsystemName" value="solr4"/>
-    </bean>
-
-   <bean id="search.OpenCMISQueryService" class="org.alfresco.repo.search.impl.OpenCMISQueryServiceImpl" >
+   <bean id="search.OpenCMISQueryService" class="org.alfresco.repo.search.impl.solr.SolrOpenCMISQueryServiceImpl" >
        <property name="cmisDictionaryService">
             <ref bean="OpenCMISDictionaryService" />
         </property>
@@ -26,12 +14,12 @@
         <property name="alfrescoDictionaryService">
             <ref bean="dictionaryService" />
         </property>
-        <property name="queryLanguage">
+        <property name="solrQueryLanguage">
             <ref bean="search.cmis.alfresco.switching" />
         </property>
     </bean>
 
-   <bean id="search.OpenCMISQueryService1.1" class="org.alfresco.repo.search.impl.OpenCMISQueryServiceImpl" >
+   <bean id="search.OpenCMISQueryService1.1" class="org.alfresco.repo.search.impl.solr.SolrOpenCMISQueryServiceImpl" >
        <property name="cmisDictionaryService">
             <ref bean="OpenCMISDictionaryService1.1" />
         </property>
@@ -41,7 +29,7 @@
         <property name="alfrescoDictionaryService">
             <ref bean="dictionaryService" />
         </property>
-        <property name="queryLanguage">
+        <property name="solrQueryLanguage">
             <ref bean="search.cmis.alfresco.switching1.1" />
         </property>
     </bean>

repository/src/main/resources/alfresco/subsystems/Search/solr4/solr-search-context.xml

@@ -218,10 +218,6 @@
         </property>
     </bean>
 
-    <bean id="search.fts.alfresco.switching" parent="base.search.fts.alfresco.switching" >
-        <property name="subsystemName" value="sol4"/>
-    </bean>
-
     <bean id="search.fts.alfresco.index" class="org.alfresco.repo.search.impl.solr.SolrQueryLanguage"  >
         <property name="factories">
             <list>

repository/src/main/resources/alfresco/subsystems/Search/solr6/common-search.properties

@@ -2,14 +2,9 @@ search.solrTrackingSupport.enabled=true
 search.solrTrackingSupport.ignorePathsForSpecificTypes=false
 search.solrTrackingSupport.ignorePathsForSpecificAspects=false
 
-# Deprecated
-solr.query.fts.queryConsistency=
-solr.query.cmis.queryConsistency=
-solr.query.hybrid.enabled=
-
-query.fts.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
-query.cmis.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
-query.hybrid.enabled=false
+solr.query.fts.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
+solr.query.cmis.queryConsistency=TRANSACTIONAL_IF_POSSIBLE
+solr.query.hybrid.enabled=false
 
 search.solrShardRegistry.purgeOnInit=false
 search.solrShardRegistry.shardInstanceTimeoutInSeconds=300

repository/src/main/resources/alfresco/subsystems/Search/solr6/opencmis-context.xml

@@ -4,19 +4,7 @@
 <beans>
    <import resource="../common-opencmis-context.xml" />
 
-    <bean id="search.cmis.alfresco.switching" parent="base.search.cmis.alfresco.switching" >
-        <property name="subsystemName" value="solr6"/>
-    </bean>
-
-    <bean id="search.cmis.alfresco.switching1.1" parent="base.search.cmis.alfresco.switching1.1" >
-        <property name="subsystemName" value="solr6"/>
-    </bean>
-
-    <bean id="search.cmis.strict.switching" parent="base.search.cmis.strict.switching" >
-        <property name="subsystemName" value="solr6"/>
-    </bean>
-
-   <bean id="search.OpenCMISQueryService" class="org.alfresco.repo.search.impl.OpenCMISQueryServiceImpl" >
+   <bean id="search.OpenCMISQueryService" class="org.alfresco.repo.search.impl.solr.SolrOpenCMISQueryServiceImpl" >
        <property name="cmisDictionaryService">
             <ref bean="OpenCMISDictionaryService" />
         </property>
@@ -26,12 +14,12 @@
         <property name="alfrescoDictionaryService">
             <ref bean="dictionaryService" />
         </property>
-        <property name="queryLanguage">
+        <property name="solrQueryLanguage">
             <ref bean="search.cmis.alfresco.switching" />
         </property>
     </bean>
 
-   <bean id="search.OpenCMISQueryService1.1" class="org.alfresco.repo.search.impl.OpenCMISQueryServiceImpl" >
+   <bean id="search.OpenCMISQueryService1.1" class="org.alfresco.repo.search.impl.solr.SolrOpenCMISQueryServiceImpl" >
        <property name="cmisDictionaryService">
             <ref bean="OpenCMISDictionaryService1.1" />
         </property>
@@ -41,7 +29,7 @@
         <property name="alfrescoDictionaryService">
             <ref bean="dictionaryService" />
         </property>
-        <property name="queryLanguage">
+        <property name="solrQueryLanguage">
             <ref bean="search.cmis.alfresco.switching1.1" />
         </property>
     </bean>

repository/src/main/resources/alfresco/subsystems/Search/solr6/solr-search-context.xml

@@ -238,10 +238,6 @@
         </property>
     </bean>
 
-    <bean id="search.fts.alfresco.switching" parent="base.search.fts.alfresco.switching" >
-        <property name="subsystemName" value="solr6"/>
-    </bean>
-
     <bean id="search.fts.alfresco.index" class="org.alfresco.repo.search.impl.solr.SolrQueryLanguage"  >
         <property name="factories">
             <list>

repository/src/test/java/org/alfresco/AllUnitTestsSuite.java

@@ -176,7 +176,6 @@ import org.junit.runners.Suite;
     org.alfresco.repo.action.CompositeActionImplTest.class,
     org.alfresco.repo.action.CompositeActionConditionImplTest.class,
     org.alfresco.repo.action.executer.TransformActionExecuterTest.class,
-    org.alfresco.repo.action.PrivateActionValidationTest.class,
     org.alfresco.repo.audit.AuditableAnnotationTest.class,
     org.alfresco.repo.audit.PropertyAuditFilterTest.class,
     org.alfresco.repo.audit.access.NodeChangeTest.class,

repository/src/test/java/org/alfresco/opencmis/OpenCmisLocalTest.java

@@ -25,9 +25,6 @@
  */
 package org.alfresco.opencmis;
 
-import static java.time.Duration.of;
-import static java.time.temporal.ChronoUnit.MILLIS;
-
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -64,7 +61,7 @@ import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.FileFilterMode.Client;
 import org.alfresco.util.GUID;
 import org.alfresco.util.TempFileProvider;
-import org.alfresco.util.TestHelper;
+import org.alfresco.util.testing.category.FrequentlyFailingTests;
 import org.alfresco.util.testing.category.LuceneTests;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
@@ -80,7 +77,6 @@ import org.apache.chemistry.opencmis.commons.data.ContentStream;
 import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
 import org.apache.chemistry.opencmis.commons.enums.BindingType;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
-import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisStorageException;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl;
 import org.apache.chemistry.opencmis.commons.impl.server.AbstractServiceFactory;
@@ -91,7 +87,6 @@ import org.apache.chemistry.opencmis.server.shared.TempStoreOutputStreamFactory;
 import org.junit.experimental.categories.Category;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.context.ApplicationContext;
-import org.springframework.dao.ConcurrencyFailureException;
 
 /**
  * Tests basic local CMIS interaction
@@ -472,6 +467,7 @@ public class OpenCmisLocalTest extends TestCase
      * This test would have fit better within CheckOutCheckInServiceImplTest but
      * was added here to make use of existing methods
      */
+    @Category(FrequentlyFailingTests.class) // ACS-962
     public void testCancelCheckoutWhileInCheckedOutState()
     {
         ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
@@ -488,7 +484,7 @@ public class OpenCmisLocalTest extends TestCase
 
         // Set file properties
         String docname = "myDoc-" + GUID.generate() + ".txt";
-        Map<String, String> props = new HashMap<>();
+        Map<String, String> props = new HashMap<String, String>();
         {
             props.put(PropertyIds.OBJECT_TYPE_ID, BaseTypeId.CMIS_DOCUMENT.value());
             props.put(PropertyIds.NAME, docname);
@@ -505,9 +501,7 @@ public class OpenCmisLocalTest extends TestCase
         NodeRef doc1WorkingCopy = cociService.getWorkingCopy(doc1NodeRef);
 
         /* Cancel Checkout */
-        TestHelper.waitForMethodToFinish(of(100, MILLIS), () ->
-                cociService.cancelCheckout(doc1WorkingCopy),
-                CmisRuntimeException.class, ConcurrencyFailureException.class);
+        cociService.cancelCheckout(doc1WorkingCopy);
 
         /* Check if both the working copy and the document were deleted */
         NodeService nodeService = serviceRegistry.getNodeService();

repository/src/test/java/org/alfresco/repo/action/ActionServiceImplTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * 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 
@@ -25,27 +25,28 @@
  */
 package org.alfresco.repo.action;
 
-import static org.alfresco.repo.action.ActionExecutionContext.builder;
-
 import java.io.Serializable;
 import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator;
 import org.alfresco.repo.action.evaluator.InCategoryEvaluator;
 import org.alfresco.repo.action.evaluator.NoConditionEvaluator;
 import org.alfresco.repo.action.evaluator.compare.ComparePropertyValueOperation;
+import org.alfresco.repo.action.executer.ActionExecuter;
 import org.alfresco.repo.action.executer.ActionExecuterAbstractBase;
 import org.alfresco.repo.action.executer.AddFeaturesActionExecuter;
 import org.alfresco.repo.action.executer.CheckInActionExecuter;
 import org.alfresco.repo.action.executer.CheckOutActionExecuter;
 import org.alfresco.repo.action.executer.CompositeActionExecuter;
 import org.alfresco.repo.action.executer.MoveActionExecuter;
+import org.alfresco.repo.action.executer.ScriptActionExecuter;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
@@ -64,14 +65,19 @@ import org.alfresco.service.cmr.action.CompositeActionCondition;
 import org.alfresco.service.cmr.action.ParameterDefinition;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.test_category.BaseSpringTestsCategory;
+import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
+import org.alfresco.util.PropertyMap;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -97,18 +103,13 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
     private NodeRef nodeRef;
     private NodeRef folder;
     private RetryingTransactionHelper transactionHelper;
-    private Properties globalConfig;
-    private RuntimeActionService runtimeActionService;
-
     
     @Before
     public void before() throws Exception
     {
         super.before();
 
-        this.transactionHelper = applicationContext.getBean("retryingTransactionHelper", RetryingTransactionHelper.class);
-        this.globalConfig = applicationContext.getBean("global-properties", Properties.class);
-        this.runtimeActionService = this.applicationContext.getBean("actionService", RuntimeActionService.class);
+        this.transactionHelper = (RetryingTransactionHelper)this.applicationContext.getBean("retryingTransactionHelper");
 
         // Create the node used for tests
         this.nodeRef = this.nodeService.createNode(
@@ -1294,89 +1295,6 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
        assertEquals(123455, action.getExecutionEndDate().getTime());
        assertEquals(null, action.getExecutionFailureMessage());
     }
-
-    @Test
-    public void testActionExposureBasedOnConfiguration()
-    {
-        globalConfig.remove("org.alfresco.repo.action.public-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.source.public-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.unknown.public-test-action.exposed");
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").build()));
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("source").build()));
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.setProperty("org.alfresco.repo.action.public-test-action.exposed", "true");
-        globalConfig.remove("org.alfresco.repo.action.source.public-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.unknown.public-test-action.exposed");
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").build()));
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("source").build()));
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.setProperty("org.alfresco.repo.action.public-test-action.exposed", "false");
-        globalConfig.remove("org.alfresco.repo.action.source.public-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.unknown.public-test-action.exposed");
-        assertFalse(runtimeActionService.isExposed(builder("public-test-action").build()));
-        assertFalse(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("source").build()));
-        assertFalse(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.remove("org.alfresco.repo.action.public-test-action.exposed");
-        globalConfig.setProperty("org.alfresco.repo.action.source.public-test-action.exposed", "true");
-        globalConfig.remove("org.alfresco.repo.action.unknown.public-test-action.exposed");
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").build()));
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("source").build()));
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.remove("org.alfresco.repo.action.public-test-action.exposed");
-        globalConfig.setProperty("org.alfresco.repo.action.source.public-test-action.exposed", "false");
-        globalConfig.remove("org.alfresco.repo.action.unknown.public-test-action.exposed");
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").build()));
-        assertFalse(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("source").build()));
-        assertTrue(runtimeActionService.isExposed(builder("public-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.remove("org.alfresco.repo.action.private-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.source.private-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.unknown.private-test-action.exposed");
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").build()));
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("source").build()));
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.setProperty("org.alfresco.repo.action.private-test-action.exposed", "true");
-        globalConfig.remove("org.alfresco.repo.action.source.private-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.unknown.private-test-action.exposed");
-        assertTrue(runtimeActionService.isExposed(builder("private-test-action").build()));
-        assertTrue(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("source").build()));
-        assertTrue(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.setProperty("org.alfresco.repo.action.private-test-action.exposed", "false");
-        globalConfig.remove("org.alfresco.repo.action.source.private-test-action.exposed");
-        globalConfig.remove("org.alfresco.repo.action.unknown.private-test-action.exposed");
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").build()));
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("source").build()));
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.remove("org.alfresco.repo.action.private-test-action.exposed");
-        globalConfig.setProperty("org.alfresco.repo.action.source.private-test-action.exposed", "true");
-        globalConfig.remove("org.alfresco.repo.action.unknown.private-test-action.exposed");
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").build()));
-        assertTrue(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("source").build()));
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("unknown").build()));
-
-        globalConfig.remove("org.alfresco.repo.action.private-test-action.exposed");
-        globalConfig.setProperty("org.alfresco.repo.action.source.private-test-action.exposed", "false");
-        globalConfig.remove("org.alfresco.repo.action.unknown.private-test-action.exposed");
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").build()));
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("source").build()));
-        assertFalse(runtimeActionService.isExposed(builder("private-test-action").withExecutionSource("unknown").build()));
-    }
-
-    @Test
-    public void testIfGlobalConfigurationIsUsedEvenIfNotInjectedBySpring()
-    {
-        TestExtendedActionServiceImpl extended = applicationContext.getBean("extendedActionServiceWithoutConfigurationProperty", TestExtendedActionServiceImpl.class);
-
-        assertNotNull(extended.getConfigurationProperties());
-        assertSame(globalConfig, extended.getConfigurationProperties());
-    }
     
     /**
      * This method returns an {@link Action} which will fail when executed.
@@ -1591,26 +1509,8 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
            throw new ActionServiceTransientException("action failed intentionally in " + TransientFailActionExecuter.class.getSimpleName());
        }
     }
+    
 
-    public static class NoOpActionExecuter extends ActionExecuterAbstractBase
-    {
-        @Override
-        protected void addParameterDefinitions(List<ParameterDefinition> paramList)
-        {
-            //do nothing
-        }
-
-        @Override
-        protected void executeImpl(Action action, NodeRef actionedUponNodeRef)
-        {
-            //do nothing
-        }
-    }
-
-    public static class TestExtendedActionServiceImpl extends ActionServiceImpl
-    {
-
-    }
     
     protected static class CancellableSleepAction extends ActionImpl implements CancellableAction
     {

repository/src/test/java/org/alfresco/repo/action/PrivateActionValidationTest.java

@@ -1,152 +0,0 @@
-/*
- * #%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.action;
-
-import static org.alfresco.repo.action.ActionExecutionContext.builder;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.alfresco.repo.action.ActionServiceImpl.ActionExecutionValidator;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class PrivateActionValidationTest
-{
-    @Test
-    public void shouldFailOnNullContext()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(), Set.of());
-
-        try
-        {
-            validator.isExposed(null);
-        }
-        catch (NullPointerException e)
-        {
-            assertNotNull(e);
-            return;
-        }
-        fail("Expected NPE.");
-    }
-
-    @Test
-    public void privateActionShouldNotBeExposedByDefault()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(), Set.of());
-
-        Assert.assertFalse(validator.isExposed(builder("privateA").build()));
-        Assert.assertFalse(validator.isExposed(builder("privateA").withExecutionSource("test").build()));
-    }
-
-    @Test
-    public void publicActionShouldBeExposedByDefault()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(), Set.of("publicA"));
-
-        Assert.assertTrue(validator.isExposed(builder("publicA").build()));
-        Assert.assertTrue(validator.isExposed(builder("publicA").withExecutionSource("test").build()));
-    }
-
-    @Test
-    public void privateActionShouldBeExposedByConfigurationBasedOnActionId()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(
-                "org.alfresco.repo.action.privateA.exposed", "true"), Set.of());
-
-        Assert.assertTrue(validator.isExposed(builder("privateA").build()));
-        Assert.assertTrue(validator.isExposed(builder("privateA").withExecutionSource("test").build()));
-        Assert.assertTrue(validator.isExposed(builder("privateA").withExecutionSource("test2").build()));
-
-        Assert.assertFalse(validator.isExposed(builder("privateB").build()));
-        Assert.assertFalse(validator.isExposed(builder("privateB").withExecutionSource("test").build()));
-        Assert.assertFalse(validator.isExposed(builder("privateB").withExecutionSource("test2").build()));
-    }
-
-    @Test
-    public void privateActionShouldBeExposedByConfigurationBasedOnActionIdAndExecutionSource()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(
-                "org.alfresco.repo.action.test.privateA.exposed", "true"), Set.of());
-
-        Assert.assertFalse(validator.isExposed(builder("privateA").build()));
-        Assert.assertTrue(validator.isExposed(builder("privateA").withExecutionSource("test").build()));
-        Assert.assertFalse(validator.isExposed(builder("privateA").withExecutionSource("test2").build()));
-
-        Assert.assertFalse(validator.isExposed(builder("privateB").build()));
-        Assert.assertFalse(validator.isExposed(builder("privateB").withExecutionSource("test").build()));
-        Assert.assertFalse(validator.isExposed(builder("privateB").withExecutionSource("test2").build()));
-    }
-
-    @Test
-    public void executionSourceConfigurationShouldTakePrecedenceOverGeneralConfigurationForPrivateAction()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(
-                "org.alfresco.repo.action.test.privateA.exposed", "true",
-                "org.alfresco.repo.action.privateA.exposed", "false"), Set.of());
-
-        Assert.assertFalse(validator.isExposed(builder("privateA").build()));
-        Assert.assertTrue(validator.isExposed(builder("privateA").withExecutionSource("test").build()));
-    }
-
-    @Test
-    public void publicActionShouldNotBeExposedByConfigurationBasedOnActionId()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(
-                "org.alfresco.repo.action.publicA.exposed", "false"), Set.of("publicA"));
-
-        Assert.assertFalse(validator.isExposed(builder("publicA").build()));
-        Assert.assertFalse(validator.isExposed(builder("publicA").withExecutionSource("test").build()));
-    }
-
-    @Test
-    public void publicActionShouldNotBeExposedByConfigurationBasedOnActionIdAndExecutionSource()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(
-                "org.alfresco.repo.action.test.publicA.exposed", "false"), Set.of("publicA"));
-
-        Assert.assertTrue(validator.isExposed(builder("publicA").build()));
-        Assert.assertFalse(validator.isExposed(builder("publicA").withExecutionSource("test").build()));
-    }
-
-    @Test
-    public void executionSourceConfigurationShouldTakePrecedenceOverGeneralConfigurationForPublicAction()
-    {
-        final ActionExecutionValidator validator = givenActionExecutionValidator(Map.of(
-                "org.alfresco.repo.action.test.publicA.exposed", "false",
-                "org.alfresco.repo.action.publicA.exposed", "true"), Set.of("publicA"));
-
-        Assert.assertTrue(validator.isExposed(builder("publicA").build()));
-        Assert.assertFalse(validator.isExposed(builder("publicA").withExecutionSource("test").build()));
-    }
-
-    private ActionExecutionValidator givenActionExecutionValidator(Map<String, String> configuration, Set<String> publicActions)
-    {
-        return new ActionExecutionValidator(configuration::get, publicActions::contains);
-    }
-}

repository/src/test/java/org/alfresco/repo/lock/JobLockServiceTest.java

@@ -29,6 +29,7 @@ import static java.time.Duration.of;
 import static java.time.temporal.ChronoUnit.MILLIS;
 import static java.time.temporal.ChronoUnit.SECONDS;
 
+import java.time.Duration;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import junit.framework.AssertionFailedError;
@@ -43,7 +44,6 @@ import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
-import org.alfresco.util.TestHelper;
 import org.alfresco.util.testing.category.DBTests;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -549,22 +549,22 @@ public class JobLockServiceTest extends TestCase
             
             if (callback == null) throw new IllegalStateException();
 
-            TestHelper.waitForMethodToFinish(of(100, MILLIS), () -> {
+            waitForAssertion(of(100, MILLIS), () -> {
                 assertEquals(false,callback.released);
                 assertEquals(0,callback.getIsActiveCount());
-            }, AssertionFailedError.class);
+            });
 
-            TestHelper.waitForMethodToFinish(of(1, SECONDS), () -> {
+            waitForAssertion(of(1, SECONDS), () -> {
                 assertEquals(false, callback.released);
                 assertEquals(1, callback.getIsActiveCount());
-            }, AssertionFailedError.class);
+            });
 
             callback.isActive = false;
 
-            TestHelper.waitForMethodToFinish(of(2, SECONDS), () -> {
+            waitForAssertion(of(2, SECONDS), () -> {
                 assertEquals(true, callback.released);
                 assertEquals(2, callback.getIsActiveCount());
-            }, AssertionFailedError.class);
+            });
         }
         catch (IllegalArgumentException e)
         {            
@@ -621,6 +621,43 @@ public class JobLockServiceTest extends TestCase
             Logger.getLogger("org.alfresco.repo.lock").setLevel(saveLogLevel);
         }
     }
+
+    private static void waitForAssertion(Duration timeout, Runnable assertion)
+    {
+        logger.debug("Waiting for assertion to succeed.");
+        final long lastStep = 10;
+        final long delayMillis = timeout.toMillis() > lastStep ? timeout.toMillis() / lastStep : 1;
+
+        for (int s = 0; s <= lastStep; s++)
+        {
+            try
+            {
+                assertion.run();
+                logger.debug("Assertion succeeded.");
+                return;
+            }
+            catch (AssertionFailedError e)
+            {
+                if (s == lastStep)
+                {
+                    logger.debug("Assertion failed. No more waiting.");
+                    throw e;
+                }
+                logger.debug("Assertion failed. Waiting until it succeeds.", e);
+            }
+            try
+            {
+                Thread.sleep(delayMillis);
+            }
+            catch (InterruptedException e)
+            {
+                Thread.currentThread().interrupt();
+                fail("Thread has been interrupted.");
+            }
+        }
+
+        throw new IllegalStateException("Unexpected.");
+    }
     
     private class TestCallback implements JobLockRefreshCallback
     {

repository/src/test/java/org/alfresco/repo/search/SearchServiceTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * 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 
@@ -28,7 +28,7 @@ package org.alfresco.repo.search;
 import javax.transaction.UserTransaction;
 
 import org.alfresco.model.ContentModel;
-import org.alfresco.repo.search.impl.DisabledFeatureException;
+import org.alfresco.repo.search.impl.solr.DisabledFeatureException;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.MutableAuthenticationDao;

repository/src/test/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguageTest.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * 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 
@@ -38,8 +38,6 @@ import java.util.List;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.domain.node.Node;
 import org.alfresco.repo.domain.solr.SearchDAO;
-import org.alfresco.repo.search.impl.DbOrIndexSwitchingQueryLanguage;
-import org.alfresco.repo.search.impl.DisabledFeatureException;
 import org.alfresco.repo.search.impl.lucene.LuceneQueryLanguageSPI;
 import org.alfresco.repo.search.impl.querymodel.QueryModelException;
 import org.alfresco.repo.solr.NodeParameters;

repository/src/test/java/org/alfresco/util/TestHelper.java

@@ -29,13 +29,8 @@ package org.alfresco.util;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.time.Duration;
-import java.util.Arrays;
 import java.util.function.Supplier;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 /**
  * A helper class to create a concise test.
  *
@@ -44,8 +39,6 @@ import org.apache.commons.logging.LogFactory;
  */
 public class TestHelper
 {
-    private static final Log logger = LogFactory.getLog(TestHelper.class);
-
     /**
      * Checks the thrown exception is the expected exception.
      *
@@ -101,59 +94,4 @@ public class TestHelper
 
         return t;
     }
-
-    /**
-     * Waits for <b>{@code method}</b> to succeed until <b>({@code timeout})</b>.
-     * <p>
-     * If the method failed to succeed because of previous step of test is not finished yet,
-     * it waits and re-executes the given method again.
-     * This will continue until the method do not fail or the <b>{@code timeout}</b> has been reached.
-     *
-     * @param timeout               max time of wait.
-     * @param method                the method that is called for retry.
-     * @param expectedExceptions    array of excepted exception.
-     * @throws Exception            after failing to finish given method with success.
-     */
-    @SafeVarargs
-    public static void waitForMethodToFinish(
-            Duration timeout,
-            Runnable method,
-            Class<? extends Throwable> ... expectedExceptions)
-    {
-        logger.debug("Waiting for method to succeed.");
-        final long lastStep = 10;
-        final long delayMillis = timeout.toMillis() > lastStep ? timeout.toMillis() / lastStep : 1;
-
-        for (int step = 0; step <= lastStep; step++)
-        {
-            try
-            {
-                method.run();
-                logger.debug("Method succeeded.");
-                return;
-            } catch (Throwable e)
-            {
-                if(Arrays.stream(expectedExceptions).noneMatch(expEx -> expEx.isInstance(e)))
-                {
-                    throw e;
-                }
-                if (step == lastStep)
-                {
-                    logger.debug("Method failed - no more waiting.");
-                    throw e;
-                }
-                logger.debug("Method failed. Waiting until it succeeds.", e);
-            }
-            try
-            {
-                Thread.sleep(delayMillis);
-            } catch (InterruptedException e)
-            {
-                Thread.currentThread().interrupt();
-                fail("Thread has been interrupted.");
-            }
-        }
-
-        throw new IllegalStateException("Unexpected.");
-    }
 }

repository/src/test/resources/org/alfresco/repo/action/test-action-services-context.xml

@@ -11,18 +11,6 @@
          <value>1000</value>
       </property>
    </bean>
-
-   <bean id="public-test-action" class="org.alfresco.repo.action.ActionServiceImplTest$NoOpActionExecuter" parent="action-executer">
-      <property name="publicAction">
-         <value>true</value>
-      </property>
-   </bean>
-
-   <bean id="private-test-action" class="org.alfresco.repo.action.ActionServiceImplTest$NoOpActionExecuter" parent="action-executer">
-      <property name="publicAction">
-         <value>false</value>
-      </property>
-   </bean>
    
    <bean id="sleepActionFilter" class="org.alfresco.repo.action.ActionServiceImplTest$SleepActionFilter" parent="baseActionFilter">
        <property name="name">
@@ -43,28 +31,4 @@
    <bean id="transient-fail-action"
          class="org.alfresco.repo.action.ActionServiceImplTest$TransientFailActionExecuter"
          parent="action-executer" />
-
-   <bean id="extendedActionServiceWithoutConfigurationProperty" class="org.alfresco.repo.action.ActionServiceImplTest$TestExtendedActionServiceImpl" init-method="init">
-      <property name="policyComponent">
-         <ref bean="policyComponent" />
-      </property>
-      <property name="nodeService">
-         <ref bean="NodeService" />
-      </property>
-      <property name="searchService">
-         <ref bean="ADMSearchService" />
-      </property>
-      <property name="authenticationContext">
-         <ref bean="authenticationContext" />
-      </property>
-      <property name="actionTrackingService">
-         <ref bean="actionTrackingService" />
-      </property>
-      <property name="dictionaryService">
-         <ref bean="DictionaryService" />
-      </property>
-      <property name="monitor">
-         <ref bean="actionServiceMonitor"/>
-      </property>
-   </bean>
 </beans>

scripts/travis/build.sh

@@ -7,27 +7,8 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
 source "$(dirname "${BASH_SOURCE[0]}")/build_functions.sh"
 
 
-# Build the current project if needed
-if [[ -n ${REQUIRES_INSTALLED_ARTIFACTS} ]] || [[ -n ${REQUIRES_LOCAL_IMAGES} ]] || [[ -n ${BUILD_PROFILES} ]]; then
-
-  if [[ -n ${BUILD_PROFILES} ]]; then
-    PROFILES="${BUILD_PROFILES}"
-  else
-    if [[ "${REQUIRES_LOCAL_IMAGES}" == "true" ]]; then
-      PROFILES="-Pbuild-docker-images -Pags"
-    else
-      PROFILES="-Pags"
-    fi
-  fi
-
-  if [[ "${REQUIRES_INSTALLED_ARTIFACTS}" == "true" ]]; then
-    PHASE="install"
-  else
-    PHASE="package"
-  fi
-
-  mvn -B -V $PHASE -DskipTests -Dmaven.javadoc.skip=true $PROFILES $BUILD_OPTIONS
-fi
+# Build the current project
+mvn -B -V install -DskipTests -Dmaven.javadoc.skip=true -Pbuild-docker-images -Pags
 
 
 popd

scripts/travis/cleanup_cache.sh

@@ -1,5 +1,20 @@
 #!/usr/bin/env bash
 set -ev
 
-find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT" | xargs -r -l rm -rf
+rm -rf "${HOME}/.m2/repository/org/alfresco/acs-community-packaging"
+rm -rf "${HOME}/.m2/repository/org/alfresco/alfresco-community-repo"
+rm -rf "${HOME}/.m2/repository/org/alfresco/alfresco-community-repo-*"
+rm -rf "${HOME}/.m2/repository/org/alfresco/alfresco-core"
+rm -rf "${HOME}/.m2/repository/org/alfresco/alfresco-data-model"
+rm -rf "${HOME}/.m2/repository/org/alfresco/alfresco-enterprise-remote-api"
+rm -rf "${HOME}/.m2/repository/org/alfresco/alfresco-enterprise-repo-*"
+rm -rf "${HOME}/.m2/repository/org/alfresco/alfresco-enterprise-repository"
+rm -rf "${HOME}/.m2/repository/org/alfresco/alfresco-remote-api"
+rm -rf "${HOME}/.m2/repository/org/alfresco/alfresco-repository"
+rm -rf "${HOME}/.m2/repository/org/alfresco/content-services"
+rm -rf "${HOME}/.m2/repository/org/alfresco/content-services*"
+rm -rf "${HOME}/.m2/repository/org/alfresco/content-services-community"
+rm -rf "${HOME}/.m2/repository/org/alfresco/tas/alfresco-community-repo-*-test"
+rm -rf "${HOME}/.m2/repository/org/alfresco/tas/alfresco-enterprise-repo-*-test"
+rm -rf "${HOME}/.m2/repository/org/alfresco/alfresco-governance-services*"
 

scripts/travis/prepare.sh

@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-M2_REPO_DIR="$HOME/.m2/repository"
-M2_REPO_TTL_MINUTES=10080
-M2_REPO_EXPIRED="$(find $M2_REPO_DIR -type f -mmin +$M2_REPO_TTL_MINUTES 2>/dev/null | head -n 1 | wc -l)"
-M2_REPO_FILE_COUNT="$(find $M2_REPO_DIR -type f 2>/dev/null | wc -l)"
-
-ORG_ALFRESCO_M2_REPO_DIR="$M2_REPO_DIR/org/alfresco"
-ORG_ALFRESCO_M2_REPO_TTL_MINUTES=1440
-ORG_ALFRESCO_M2_REPO_EXPIRED="$(find $ORG_ALFRESCO_M2_REPO_DIR -type f -mmin +$ORG_ALFRESCO_M2_REPO_TTL_MINUTES 2>/dev/null | head -n 1 | wc -l)"
-
-echo "Files in the maven repo: $M2_REPO_FILE_COUNT"
-
-if [ $ORG_ALFRESCO_M2_REPO_EXPIRED -eq 1 ];then
-  echo "Invalidating org/alfresco maven local cache."
-  rm -rf "$ORG_ALFRESCO_M2_REPO_DIR"
-fi
-
-if [ $M2_REPO_EXPIRED -eq 1 ];then
-  echo "Invalidating maven local cache."
-  rm -rf "$M2_REPO_DIR"
-fi
-
-if [ $M2_REPO_FILE_COUNT -lt 1000 ] || [ $ORG_ALFRESCO_M2_REPO_EXPIRED -eq 1 ] || [ $M2_REPO_EXPIRED -eq 1 ];then
-  echo "Populating maven cache."
-  export BUILD_PROFILES="-Pall-tas-tests,ags"
-  export BUILD_OPTIONS="-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dmaven.artifact.threads=8"
-  source "$(dirname "${BASH_SOURCE[0]}")/build.sh"
-fi

scripts/travis/update_downstream.sh

@@ -33,11 +33,7 @@ git status
 git --no-pager diff pom.xml
 git add pom.xml
 
-if [[ "${TRAVIS_COMMIT_MESSAGE}" =~ \[force[^\]]*\] ]]; then
-  FORCE_TOKEN=$(echo "${TRAVIS_COMMIT_MESSAGE}" | sed "s|^.*\(\[force[^]]*\]\).*$|\1|g")
-  git commit --allow-empty -m "${FORCE_TOKEN} Update upstream version to ${VERSION}"
-  git push
-elif git status --untracked-files=no --porcelain | grep -q '^' ; then
+if git status --untracked-files=no --porcelain | grep -q '^' ; then
   git commit -m "Update upstream version to ${VERSION}"
   git push
 else