Add precommit for secret scanning, formatting and license header checking.

* Add precommit for secret scanning, formatting and license header checking. * Turn off bash debug logging. * Skip precommit checks that apply to all files. There are too many violations to run against all files. (cherry picked from commit b00e11cb6f)
[maven-release-plugin][skip ci] prepare for next development iteration
2025-09-10 14:11:58 +00:00 · 2024-10-07 14:32:26 +01:00 · 2024-03-26 15:38:34 +00:00 · 2024-03-26 15:38:31 +00:00 · 2024-03-26 15:41:09 +01:00 · 2024-02-27 22:27:23 +00:00
614 changed files with 9858 additions and 11681 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -14,6 +14,15 @@ updates:
    timezone: Africa/Abidjan
  open-pull-requests-limit: 99
  ignore:
+  - dependency-name: com.google.code.gson:gson
+    versions:
+    - "> 2.8.6"
+  - dependency-name: io.fabric8:fabric8-maven-plugin
+    versions:
+    - "> 4.4.0"
+  - dependency-name: javax.servlet:javax.servlet-api
+    versions:
+    - "> 3.0.1"
  - dependency-name: org.acegisecurity:acegi-security
    versions:
    - "> 0.8.2_patched"
@@ -43,7 +52,92 @@ updates:
    - "> 1.0.0"
  - dependency-name: org.freemarker:freemarker
    versions:
-    - "> 2.3.31-alfresco-patched"
+    - "> 2.3.20-alfresco-patched-20200421"
+  - dependency-name: org.eclipse.jetty:jetty-server
+    versions:
+    - 9.4.38.v20210224
+  - dependency-name: org.alfresco.tas:cmis
+    versions:
+    - "1.28"
+  - dependency-name: org.springframework:spring-webmvc
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-web
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-tx
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-orm
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-test
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-jms
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-jdbc
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-expression
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-core
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-context-support
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-context
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-beans
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.springframework:spring-aop
+    versions:
+    - 5.3.4
+    - 5.3.5
+  - dependency-name: org.alfresco.tas:restapi
+    versions:
+    - "1.55"
+  - dependency-name: org.eclipse.jetty:jetty-security
+    versions:
+    - 11.0.1
+  - dependency-name: org.alfresco.aos-module:alfresco-vti-bin
+    versions:
+    - 1.4.0-M1
+  - dependency-name: org.alfresco.aos-module:alfresco-aos-module-distributionzip
+    versions:
+    - 1.4.0-M1
+  - dependency-name: org.alfresco.aos-module:alfresco-aos-module
+    versions:
+    - 1.4.0-M1
+  - dependency-name: org.alfresco.surf:spring-webscripts-api
+    versions:
+    - "8.16"
+  - dependency-name: org.alfresco.surf:spring-webscripts:tests
+    versions:
+    - "8.16"
+  - dependency-name: org.alfresco.surf:spring-webscripts
+    versions:
+    - "8.16"
+  - dependency-name: org.alfresco.surf:spring-surf-core-configservice
+    versions:
+    - "8.16"
  registries:
  - maven-repository-artifacts-alfresco-com-nexus-content-groups-int
 - package-ecosystem: "docker"
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,6 @@ jobs:
    steps:
      - uses: actions/checkout@v4
      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
      - uses: actions/checkout@v4
        with:
@@ -63,36 +62,18 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v1.33.0
        continue-on-error: true
        with:
          srcclr-api-token: ${{ secrets.SRCCLR_API_TOKEN }}
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh
-
-  pmd_scan:
-    name: "PMD Scan"
-    runs-on: ubuntu-latest
-    needs: [prepare]
-    if: >
-      github.event_name == 'pull_request' &&
-      !contains(github.event.head_commit.message, '[skip pmd]') &&
-      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
-    steps:
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
-      - uses: Alfresco/ya-pmd-scan@v4.0.0
-        with:
-          classpath-build-command: "mvn test-compile -ntp -Pags -pl \"-:alfresco-community-repo-docker\""
-
+        
  all_unit_tests_suite:
    name: "Core, Data-Model, Repository - AllUnitTestsSuite - Build and test"
    runs-on: ubuntu-latest
@@ -102,10 +83,9 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run tests"
@@ -140,10 +120,9 @@ jobs:
    env:
      REQUIRES_INSTALLED_ARTIFACTS: true
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -152,7 +131,7 @@ jobs:
      - name: "Set transformers tag"
        run: echo "TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)" >> $GITHUB_ENV
      - name: "Set up the environment"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
      - name: "Run tests"
        run: mvn -B test -pl remote-api -Dtest=${{ matrix.testSuite }} -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
      - name: "Clean Maven cache"
@@ -174,14 +153,13 @@ jobs:
      matrix:
        version: ['10.2.18', '10.4', '10.5']
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: Run MariaDB ${{ matrix.version }} database
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d
        env:
          MARIADB_VERSION: ${{ matrix.version }}
      - name: "Run tests"
@@ -201,14 +179,13 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run MariaDB 10.6 database"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d
        env:
          MARIADB_VERSION: 10.6
      - name: "Run tests"
@@ -228,14 +205,13 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run MySQL 8 database"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mysql up -d
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mysql up -d
        env:
          MYSQL_VERSION: 8
      - name: "Run tests"
@@ -243,8 +219,8 @@ jobs:
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

-  repository_postgresql_13_12_tests:
-    name: "Repository - PostgreSQL 13.12 tests"
+  repository_postgresql_13_7_tests:
+    name: "Repository - PostgreSQL 13.7 tests"
    runs-on: ubuntu-latest
    needs: [prepare]
    if: >
@@ -254,49 +230,22 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - name: "Run PostgreSQL 13.12 database"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
+      - name: "Run PostgreSQL 13.7 database"
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
        env:
-          POSTGRES_VERSION: 13.12
+          POSTGRES_VERSION: 13.7
      - name: "Run tests"
        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

-  repository_postgresql_14_9_tests:
-    name: "Repository - PostgreSQL 14.9 tests"
-    runs-on: ubuntu-latest
-    needs: [prepare]
-    if: >
-      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) && github.event_name != 'pull_request' &&
-      !contains(github.event.head_commit.message, '[skip db]')) ||
-      contains(github.event.head_commit.message, '[db]')) &&
-      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
-    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
-      - name: "Init"
-        run: bash ./scripts/ci/init.sh
-      - name: "Run PostgreSQL 14.9 database"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
-        env:
-          POSTGRES_VERSION: 14.9
-      - name: "Run tests"
-        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
-      - name: "Clean Maven cache"
-        run: bash ./scripts/ci/cleanup_cache.sh
-
-  repository_postgresql_15_4_tests:
-    name: "Repository - PostgreSQL 15.4 tests"
+  repository_postgresql_14_4_tests:
+    name: "Repository - PostgreSQL 14.4 tests"
    runs-on: ubuntu-latest
    needs: [prepare]
    if: >
@@ -306,16 +255,15 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - name: "Run PostgreSQL 15.4 database"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
+      - name: "Run PostgreSQL 14.4 database"
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
        env:
-          POSTGRES_VERSION: 15.4
+          POSTGRES_VERSION: 14.4
      - name: "Run tests"
        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
      - name: "Clean Maven cache"
@@ -330,14 +278,13 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run ActiveMQ"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile activemq up -d
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile activemq up -d
      - name: "Run tests"
        run: mvn -B test -pl repository -am -Dtest=CamelRoutesTest,CamelComponentsTest -DfailIfNoTests=false
      - name: "Clean Maven cache"
@@ -381,10 +328,9 @@ jobs:
            disabledHostnameVerification: false
            mvn-options: '-Dencryption.ssl.keystore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.keystore -Dencryption.ssl.truststore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.truststore'
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Set transformers tag"
@@ -405,7 +351,7 @@ jobs:
          if [ -e ./scripts/ci/tests/${{ matrix.testSuite }}-setup.sh ]; then
            bash ./scripts/ci/tests/${{ matrix.testSuite }}-setup.sh
          fi
-          docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
+          docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
      - name: "Run tests"
        run: mvn -B test -pl repository -am -Dtest=${{ matrix.testSuite }} -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco ${{ matrix.mvn-options }}
      - name: "Clean Maven cache"
@@ -447,19 +393,24 @@ jobs:
            pom-dir: tas-email
          - test-name: "WebDAV TAS tests"
            pom-dir: tas-webdav
-          - test-name: "Integration TAS tests"
+          - test-name: "Integration TAS tests (Java 17)"
            pom-dir: tas-integration
+          - test-name: "Integration TAS tests (Java 11)"
+            pom-dir: tas-integration
+            jre-version: 11
    env:
      REQUIRES_LOCAL_IMAGES: true
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: ${{ matrix.jre-version || '17' }}
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
          bash ./scripts/ci/init.sh
+          export BUILD_OPTIONS="-Ddocker.buildArg.JRE_VERSION=${{ matrix.jre-version }} ${BUILD_OPTIONS}"
          bash ./scripts/ci/build.sh
      - name: "Set up the environment"
        run: |
@@ -490,14 +441,13 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force')
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - name: "Run Postgres 15.4 database"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d
+      - name: "Run Postgres 14.4 database"
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d
      - name: "Run tests"
        run: mvn -B test -pl :alfresco-share-services -am -Dtest=ShareServicesTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
      - name: "Clean Maven cache"
@@ -520,10 +470,9 @@ jobs:
    env:
      REQUIRES_INSTALLED_ARTIFACTS: true
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -552,10 +501,9 @@ jobs:
    env:
      REQUIRES_INSTALLED_ARTIFACTS: true
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -580,10 +528,9 @@ jobs:
    env:
      REQUIRES_LOCAL_IMAGES: true
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -600,7 +547,7 @@ jobs:
        run: mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false -Pags -Pall-tas-tests
      - name: "Configure AWS credentials"
        if: ${{ always() }}
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v1
        with:
          aws-access-key-id: ${{ secrets.AGS_AWS_ACCESS_KEY_ID }}
          aws-secret-access-key: ${{ secrets.AGS_AWS_SECRET_ACCESS_KEY }}
@@ -614,28 +561,3 @@ jobs:
          aws s3 cp --acl private ./amps/ags/rm-automation/rm-automation-community-rest-api/target/reports/rm-automation-community-rest-api.log s3://ags-travis-artifacts/community/${{ github.run_number }}/AGS-Community-Rest-API-Tests/rm-automation-community-rest-api.log
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh
-
-  ags_start_api_explorer:
-    name: "Test Tomcat deployment of api explorer"
-    runs-on: ubuntu-latest
-    needs: [ prepare ]
-    if: >
-      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) &&
-      !contains(github.event.head_commit.message, '[skip ags]')) ||
-      contains(github.event.head_commit.message, '[ags]')) &&
-      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
-    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
-      - name: "Build"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: |
-          bash ./scripts/ci/init.sh
-          bash ./scripts/ci/build.sh
-      - name: "Test Tomcat deployment"
-        run: |
-          mvn verify -Pags,start-api-explorer -DskipTests &
-          ${{ env.TAS_SCRIPTS }}/wait-for-alfresco-start.sh "http://localhost:8085/api-explorer"
--- a/.github/workflows/master_release.yml
+++ b/.github/workflows/master_release.yml
@@ -31,15 +31,14 @@ jobs:
      !contains(github.event.head_commit.message, '[no release]') &&
      github.event_name != 'pull_request'
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
        with:
          persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0      
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.33.0
        with:
          username: ${{ env.GIT_USERNAME }}
          email: ${{ env.GIT_EMAIL }}
@@ -60,15 +59,14 @@ jobs:
      !contains(github.event.head_commit.message, '[no downstream]') &&
      github.event_name != 'pull_request'
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
        with:
          persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0      
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.33.0
        with:
          username: ${{ env.GIT_USERNAME }}
          email: ${{ env.GIT_EMAIL }}
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -133,21 +133,21 @@
        "filename": ".github/workflows/ci.yml",
        "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b",
        "is_verified": false,
-        "line_number": 157
+        "line_number": 136
      },
      {
        "type": "Secret Keyword",
        "filename": ".github/workflows/ci.yml",
        "hashed_secret": "3eaefff58bb411413fcbd76dc410d392529627e7",
        "is_verified": false,
-        "line_number": 188
+        "line_number": 166
      },
      {
        "type": "Secret Keyword",
        "filename": ".github/workflows/ci.yml",
        "hashed_secret": "21b46dc06a4681d07e88157fec3a477484fd314b",
        "is_verified": false,
-        "line_number": 410
+        "line_number": 356
      }
    ],
    ".github/workflows/master_release.yml": [
@@ -671,7 +671,7 @@
        "filename": "remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryAdminConsoleAccessTest.java",
        "hashed_secret": "4ffa743f28fc949c19e65ab045d7906d0609a2c2",
        "is_verified": false,
-        "line_number": 269,
+        "line_number": 264,
        "is_secret": false
      }
    ],
@@ -1283,7 +1283,7 @@
        "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java",
        "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
        "is_verified": false,
-        "line_number": 88,
+        "line_number": 82,
        "is_secret": false
      },
      {
@@ -1291,7 +1291,7 @@
        "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java",
        "hashed_secret": "c464af817287343305cbd6493c593885695df531",
        "is_verified": false,
-        "line_number": 92,
+        "line_number": 86,
        "is_secret": false
      },
      {
@@ -1299,7 +1299,7 @@
        "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java",
        "hashed_secret": "8ad8572a0b3fc4cb3afc1baaebc97a2cae58eb8c",
        "is_verified": false,
-        "line_number": 93,
+        "line_number": 87,
        "is_secret": false
      },
      {
@@ -1307,7 +1307,7 @@
        "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java",
        "hashed_secret": "915692b4d7465b0084354173d552ac90145dc315",
        "is_verified": false,
-        "line_number": 94,
+        "line_number": 88,
        "is_secret": false
      }
    ],
@@ -1317,7 +1317,7 @@
        "filename": "repository/src/test/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java",
        "hashed_secret": "8c85434f6f339a24b808810bd95629d0f5856355",
        "is_verified": false,
-        "line_number": 1280,
+        "line_number": 1281,
        "is_secret": false
      }
    ],
@@ -1427,7 +1427,7 @@
        "filename": "repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java",
        "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
        "is_verified": false,
-        "line_number": 103,
+        "line_number": 109,
        "is_secret": false
      }
    ],
@@ -1860,5 +1860,5 @@
      }
    ]
  },
-  "generated_at": "2024-10-07T13:18:11Z"
+  "generated_at": "2024-10-07T13:32:18Z"
 }
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -53,8 +53,8 @@ Because this project forms a part of Alfresco Content Services, the guidelines a

 You can report an issue in the ALF project of the [Alfresco issue tracker](http://issues.alfresco.com).

-Read [instructions for a good issue report](https://hub.alfresco.com/t5/alfresco-content-services-hub/reporting-an-issue/ba-p/289727).
+Read [instructions for a good issue report](https://community.alfresco.com/docs/DOC-6263-reporting-an-issue).

-Read [instructions for making a contribution](https://hub.alfresco.com/t5/alfresco-content-services-hub/alfresco-contribution-agreement/ba-p/293276).
+Read [instructions for making a contribution](https://community.alfresco.com/docs/DOC-6269-submitting-contributions).

-Please follow [the coding standards](https://hub.alfresco.com/t5/alfresco-content-services-hub/coding-standards-for-alfresco-content-services/ba-p/290457).
+Please follow [the coding standards](https://community.alfresco.com/docs/DOC-4658-coding-standards).
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Repository is a library packaged as a jar file which contains the following:

 Remote API is a library packaged as a jar file which contains the following:
 * REST API framework
-* WebScript implementations including [V1 REST APIs](https://hub.alfresco.com/t5/alfresco-content-services-blog/v1-rest-api-10-things-you-should-know/ba-p/287692)
+* WebScript implementations including [V1 REST APIs](https://community.alfresco.com/community/ecm/blog/2017/05/02/v1-rest-api-10-things-you-should-know)
 * [OpenCMIS](https://chemistry.apache.org/java/opencmis.html) implementations

 #### Artifacts
@@ -94,4 +94,4 @@ The enterprise projects which extend the `alfresco-community-repo` use the same
 artifact version number.

 ### Contributing guide
-Please use [this guide](CONTRIBUTING.md) to make a contribution to the project.
+Please use [this guide](CONTRIBUTING.md) to make a contribution to the project.
--- a/amps/ags/README.md
+++ b/amps/ags/README.md
@@ -71,7 +71,7 @@ the _alfresco-internal_ repository:
   </snapshots>
 </repository>
 ```
-
+ 

 For additional instructions you can check the official Maven documentation:
 * [setting up repositories](https://maven.apache.org/guides/mini/guide-multiple-repositories.html)
@@ -227,7 +227,7 @@ If only the Community or Enterprise images need to be built than the same comman

 The Docker images of the Repo can be started independently from Share running the following command in the rm-repo-enterprise or rm-repo-community folder which contains the Docker-compose.yml file:
 ```
-docker compose up
+docker-compose up
 ```
 > Be aware of the fact that the Share images can not be started independently from Repo

@@ -237,5 +237,5 @@ e.g. In order to start an instance of rm-enterprise-repo and rm-enterprise-share

 If you have a license for jRebel then this can be used from the rm-community-share or rm-enterprise-share directories with:
 ```
-docker compose -f docker-compose.yml -f jrebel-docker-compose.yml --project-name agsdev up --build --force-recreate
+docker-compose -f docker-compose.yml -f jrebel-docker-compose.yml --project-name agsdev up --build --force-recreate
 ```
--- a/amps/ags/ci/scripts/getLogs.sh
+++ b/amps/ags/ci/scripts/getLogs.sh
@@ -4,9 +4,9 @@ set -x
 # Display running containers
 docker ps

-alfrescoContainerId=$(docker ps -a | grep '\-alfresco\-' | awk '{print $1}')
-shareContainerId=$(docker ps -a | grep '\-share\-' | awk '{print $1}')
-solrContainerId=$(docker ps -a | grep '\-search\-' | awk '{print $1}')
+alfrescoContainerId=$(docker ps -a | grep '_alfresco_' | awk '{print $1}')
+shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}')
+solrContainerId=$(docker ps -a | grep '_search_' | awk '{print $1}')

 docker logs $alfrescoContainerId > alfresco.log
 if [ -n "$shareContainerId" ]; then
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.1.1.13-SNAPSHOT</version>
+      <version>21.25-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.1.1.13-SNAPSHOT</version>
+      <version>21.25-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>23.1.1.13-SNAPSHOT</version>
+      <version>21.25-SNAPSHOT</version>
   </parent>

   <build>
@@ -82,25 +82,7 @@
      <dependency>
         <groupId>com.github.docker-java</groupId>
         <artifactId>docker-java</artifactId>
-         <version>3.3.2</version>
-         <exclusions>
-            <exclusion>
-               <groupId>org.bouncycastle</groupId>
-               <artifactId>bcprov-jdk15on</artifactId>
-            </exclusion>
-            <exclusion>
-               <groupId>org.bouncycastle</groupId>
-               <artifactId>bcpkix-jdk15on</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>
-      <dependency>
-         <groupId>org.bouncycastle</groupId>
-         <artifactId>bcprov-jdk15to18</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.bouncycastle</groupId>
-         <artifactId>bcpkix-jdk15to18</artifactId>
+         <version>3.2.13</version>
      </dependency>
   </dependencies>
 </project>
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java
@@ -28,7 +28,7 @@ package org.alfresco.rest.core;

 import static lombok.AccessLevel.PROTECTED;

-import jakarta.annotation.Resource;
+import javax.annotation.Resource;

 import lombok.Getter;
 import lombok.Setter;
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/APIUtils.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/APIUtils.java
@@ -26,8 +26,8 @@
 */
 package org.alfresco.rest.core.v0;

-import jakarta.json.Json;
-import jakarta.json.JsonReader;
+import javax.json.Json;
+import javax.json.JsonReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.format.DateTimeFormatter;
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java
@@ -124,7 +124,7 @@ public abstract class BaseAPI

    /**
     * Helper method to extract the property value for the given nodeRef and property name
-     *
+     * 
     * @param result
     * @param nodeRef
     * @param propertyName
@@ -152,7 +152,7 @@ public abstract class BaseAPI

        return propertyValue;
    }
-
+    
    /**
     * Helper method to extract property values from request result and put them in map as a list that corresponds to a unique property value.
     *
@@ -512,12 +512,7 @@ public abstract class BaseAPI
        try
        {
            HttpResponse httpResponse = doRequestJson(HttpPost.class, requestUrl, adminUser, adminPassword, requestParams);
-            if (httpResponse.getStatusLine().getStatusCode() != expectedStatusCode)
-            {
-                // It's only possible to stream the response body once, so ensure we only do this if the test has failed.
-                JSONObject responseJson = responseBodyToJson(httpResponse);
-                assertEquals("POST request to " + requestUrl + " was not successful. Response: " + responseJson, expectedStatusCode, httpResponse.getStatusLine().getStatusCode());
-            }
+            assertEquals("POST request to " + requestUrl + " was not successful.", expectedStatusCode, httpResponse.getStatusLine().getStatusCode());
            return httpResponse;
        }
        catch (InstantiationException | IllegalAccessException error)
@@ -526,32 +521,6 @@ public abstract class BaseAPI
        }
    }

-    /**
-     * Try to convert the response body to a JSON object.
-     *
-     * @param response The response.
-     * @return The JSON object or null if it was not possible to convert the response.
-     */
-    private JSONObject responseBodyToJson(HttpResponse response)
-    {
-        try
-        {
-            try
-            {
-                return new JSONObject(EntityUtils.toString(response.getEntity()));
-            }
-            catch (JSONException error)
-            {
-                LOGGER.error("Converting message body to JSON failed. Body: {}", response.getEntity().getContent(), error);
-            }
-        }
-        catch (ParseException | IOException error)
-        {
-            LOGGER.error("Parsing message body failed.", error);
-        }
-        return null;
-    }
-
    /**
     * Helper method for handling generic HTTP requests
     * @param requestType request type (a subclass of {@link HttpRequestBase})
@@ -589,7 +558,18 @@ public abstract class BaseAPI
            HttpResponse response = client.execute(adminUser, adminPassword, request);
            LOGGER.info("Response: {}", response.getStatusLine());

-            responseBody = responseBodyToJson(response);
+            try
+            {
+                responseBody = new JSONObject(EntityUtils.toString(response.getEntity()));
+            }
+            catch (JSONException error)
+            {
+                LOGGER.error("Converting message body to JSON failed. Body: {}", responseBody, error);
+            }
+            catch (ParseException | IOException error)
+            {
+                LOGGER.error("Parsing message body failed.", error);
+            }

            switch (response.getStatusLine().getStatusCode())
            {
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentFields.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentFields.java
@@ -61,7 +61,7 @@ public class FilePlanComponentFields
    public static final String PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS = "rma:recordSearchDispositionEvents";
    public static final String PROPERTIES_DECLASSIFICATION_REVIEW_COMPLETED_BY = "rma:declassificationReviewCompletedBy";
    public static final String PROPERTIES_DECLASSIFICATION_REVIEW_COMPLETED_AT = "rma:declassificationReviewCompletedAt";
-
+    

    /** File plan properties */
    public static final String PROPERTIES_COMPONENT_ID = "st:componentId";
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/RecordProperties.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/RecordProperties.java
@@ -125,7 +125,7 @@ public class RecordProperties extends TestModel

    @JsonProperty (required = true, value = PROPERTIES_ORIGINAL_NAME)
    private String originalName;
-
+    
    @JsonProperty (PROPERTIES_CLASSIFICATION)
    private List<String> classification;

--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildProperties.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildProperties.java
@@ -112,10 +112,10 @@ public class RecordCategoryChildProperties extends TestModel

    @JsonProperty (PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE)
    private Boolean recordSearchHasDispositionSchedule;
-
+    
    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD_EXPRESSION)
    private String recordSearchDispositionPeriodExpression;
-
+    
    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY)
    private String recordSearchDispositionAuthority;

@@ -136,7 +136,7 @@ public class RecordCategoryChildProperties extends TestModel

    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS)
    private List<String> recordSearchDispositionEvents;
-
+    
    @JsonProperty (PROPERTIES_OWNER)
    private Owner owner;

--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordfolder/RecordFolderProperties.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordfolder/RecordFolderProperties.java
@@ -112,13 +112,13 @@ public class RecordFolderProperties extends TestModel

    @JsonProperty (PROPERTIES_CLASSIFICATION)
    private List<String> classification;
-
+    
    @JsonProperty (PROPERTIES_DESCRIPTION)
    private String description;

    @JsonProperty (PROPERTIES_OWNER)
    private Owner owner;
-
+ 
    @JsonProperty (PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD)
    private String recordSearchVitalRecordReviewPeriod;

--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/user/UserPermissions.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/user/UserPermissions.java
@@ -28,7 +28,7 @@ package org.alfresco.rest.rm.community.model.user;

 /**
 * Constants for RM user capabilities
- *
+ * 
 * @author Kristijan Conkas
 * @since 2.6
 */
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/NodeAPI.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/NodeAPI.java
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Component;

 /**
 * The v0 REST API for nodes
- *
+ * 
 * @author jcule
 * @since 2.7EA1
 */
@@ -56,7 +56,7 @@ public class NodeAPI extends BaseAPI

    /**
     * Get the node metadata using the using the node data webscript:  Document List v2 Component
-     *
+     * 
     * @param username
     * @param password
     * @param nodeId
@@ -70,5 +70,5 @@ public class NodeAPI extends BaseAPI
        client.close();
        return doGetRequest(username, password, requestURL);
    }
-
+    
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/SearchAPI.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/SearchAPI.java
@@ -143,7 +143,7 @@ public class SearchAPI extends BaseAPI
    /**
     * Search as a user for nodes on site "rm" matching query, using SearchAPI.RM_DEFAULT_RECORD_FILTERS and sorted
     * by sortby and returns the property value for the given nodeRef and property name
-     *
+     * 
     * @param username
     * @param password
     * @param query
@@ -157,9 +157,9 @@ public class SearchAPI extends BaseAPI
    {
        String searchFilterParamaters = MessageFormat.format(RM_DEFAULT_NODES_FILTERS, Boolean.toString(includeFolders),
                    Boolean.toString(includeCategories));
-        return getItemProperty(rmSearch(username, password, "rm", query, searchFilterParamaters, sortby), nodeRef, propertyName);
+        return getItemProperty(rmSearch(username, password, "rm", query, searchFilterParamaters, sortby), nodeRef, propertyName); 
    }
-
+    
    /**
     * Generic faceted search.
     * @param username
@@ -229,17 +229,17 @@ public class SearchAPI extends BaseAPI

    /**
     * Helper method to extract list of names from search result.
-     *
+     * 
     * @param searchResult
     * @return list of document or record names in search result
-     * @throws FileNotFoundException
-     * @throws JsonSyntaxException
-     * @throws JsonIOException
+     * @throws FileNotFoundException 
+     * @throws JsonSyntaxException 
+     * @throws JsonIOException 
     * @throws RuntimeException for malformed search response
     */
    /**
     * Helper method to extract list of names from search result.
-     *
+     * 
     * @param searchResult
     * @return
     */
@@ -247,10 +247,10 @@ public class SearchAPI extends BaseAPI
    {
        return getPropertyValues(searchResult, "name");
    }
-
+    
    /**
     * Helper method to extract list of property values from search result for the given nodeRef.
-     *
+     * 
     * @param searchResult
     * @param nodeRef
     * @param propertyName
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditLoginEventsTests.java
@@ -73,7 +73,7 @@ public class AuditLoginEventsTests extends BaseRMRestTest
        assertTrue("The list of events is not filtered by " + LOGIN_UNSUCCESSFUL.event,
                auditEntries.stream().allMatch(auditEntry -> auditEntry.getEvent().equals(LOGIN_UNSUCCESSFUL.eventDisplayName)));
    }
-
+    
    /**
     * Given I have tried to login using valid credentials
     * When I view the RM audit filtered by Login successful event
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/PreventActionsOnFrozenContentTests.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/PreventActionsOnFrozenContentTests.java
@@ -42,8 +42,8 @@ import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.AssertJUnit.assertFalse;

-import jakarta.json.Json;
-import jakarta.json.JsonObject;
+import javax.json.Json;
+import javax.json.JsonObject;
 import java.io.File;

 import org.alfresco.dataprep.CMISUtil;
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java
@@ -50,6 +50,7 @@ import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.util.EntityUtils;
 import org.json.JSONObject;
+import org.junit.Ignore;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.AssertJUnit;
 import org.testng.annotations.BeforeClass;
@@ -64,9 +65,7 @@ import java.util.List;
 import static org.alfresco.rest.core.v0.BaseAPI.NODE_REF_WORKSPACE_SPACES_STORE;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.CUT_OFF_ASPECT;
-import static org.alfresco.rest.rm.community.model.recordcategory.RetentionPeriodProperty.CREATED_DATE;
-import static org.alfresco.rest.rm.community.model.recordcategory.RetentionPeriodProperty.DATE_FILED;
-import static org.alfresco.rest.rm.community.model.recordcategory.RetentionPeriodProperty.CUT_OFF_DATE;
+import static org.alfresco.rest.rm.community.model.recordcategory.RetentionPeriodProperty.*;
 import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
 import static org.alfresco.utility.report.log.Step.STEP;
 import static org.junit.Assert.assertNull;
@@ -85,25 +84,28 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
    @Autowired
    private RecordFoldersAPI recordFoldersAPI;
    private final static  String TEST_PREFIX = generateTestPrefix(DispositionScheduleLinkedRecordsTest.class);
-    private static final String CATEGORY_RM_3077 = TEST_PREFIX + "RM-3077_manager_sees_me";
-    private static final String COPY_CATEGORY_RM_3077 = "Copy_of_" + CATEGORY_RM_3077;
-    private static final String FOLDER_RM_3077 = "RM-3077_folder_"+ CATEGORY_RM_3077;
-    private static final String COPY_FOLDER_RM_3077 = "Copy_of_" + FOLDER_RM_3077;
-    private static final String FIRST_CATEGORY_RM_3060 = TEST_PREFIX + "RM-3060_category_record";
-    private static final String SECOND_CATEGORY_RM_3060 = "Copy_of_" + FIRST_CATEGORY_RM_3060;
-    private static final String FIRST_FOLDER_RM_3060 = TEST_PREFIX + "RM-3060_folder";
-    private static final String SECOND_FOLDER_RM_3060 = TEST_PREFIX + "RM-3060_disposition_on_Record_Level";
-    private static final String ELECTRONIC_RECORD_RM_3060 = TEST_PREFIX + "RM-3060_electronic_1_record";
-    private static final String NON_ELECTRONIC_RECORD_RM_3060 = TEST_PREFIX + "RM-3060_non-electronic_record";
-    private static final String FIRST_CATEGORY_RM_1622 = TEST_PREFIX + "RM-1622_category_record";
-    private static final String SECOND_CATEGORY_RM_1622 = "Copy_of_" + FIRST_CATEGORY_RM_1622;
-    private static final String FIRST_FOLDER_RM_1622 = TEST_PREFIX + "RM-1622_folder";
-    private static final String ELECTRONIC_RECORD_RM_1622 = TEST_PREFIX + "RM-1622_electronic_1_record";
-    private static final String SECOND_FOLDER_RM_1622 = TEST_PREFIX + "RM-1622_disposition_on_Record_Level";
+    private RecordCategory Category1;
+    private RecordCategoryChild CopyCatFolder,folder1,CatFolder,folder2;
+    private static final String categoryRM3077 = TEST_PREFIX + "RM-3077_manager_sees_me";
+    private static final String copyCategoryRM3077 = "Copy_of_" + categoryRM3077;
+    private static final String folderRM3077 = "RM-3077_folder_"+ categoryRM3077;
+    private static final String copyFolderRM3077 = "Copy_of_" + folderRM3077;
+    private final String folder = TEST_PREFIX + "RM-2937 folder ghosting";
+    private static final String firstCategoryRM3060 = TEST_PREFIX + "RM-3060_category_record";
+    private static final String secondCategoryRM3060 = "Copy_of_" + firstCategoryRM3060;
+    private static final String firstFolderRM3060 = TEST_PREFIX + "RM-3060_folder";
+    private static final String secondFolderRM3060 = TEST_PREFIX + "RM-3060_disposition_on_Record_Level";
+    private static final String electronicRecordRM3060 = TEST_PREFIX + "RM-3060_electronic_1_record";
+    private static final String nonElectronicRecordRM3060 = TEST_PREFIX + "RM-3060_non-electronic_record";
+    private static final String firstCategoryRM1622 = TEST_PREFIX + "RM-1622_category_record";
+    private static final String secondCategoryRM1622 = "Copy_of_" + firstCategoryRM1622;;
+    private static final String firstFolderRM1622 = TEST_PREFIX + "RM-1622_folder";
+    private static final String electronicRecordRM1622 = TEST_PREFIX + "RM-1622_electronic_1_record";
+    private static final String secondFolderRM1622 = TEST_PREFIX + "RM-1622_disposition_on_Record_Level";
    private static final String TRANSFER_LOCATION = TEST_PREFIX + "RM-3060_transferred_records";
    public static final String TRANSFER_TYPE = "rma:transferred";
    private FilePlan filePlanModel;
-    private UserModel rmAdmin;
+    private UserModel rmAdmin, rmManager;

    @BeforeClass(alwaysRun = true)
    public void setupDispositionScheduleLinkedRecordsTest() {
@@ -118,12 +120,11 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
            UserRoles.ROLE_RM_ADMIN.roleId);

        // create "rm Manager" user if it does not exist and assign it to RM Administrator role
-        UserModel rmManager = getDataUser().createRandomTestUser();
+        rmManager = getDataUser().createRandomTestUser();
        rmRolesAndActionsAPI.assignRoleToUser(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), rmManager.getUsername(),
+            getDataUser().usingAdmin().getAdminUser().getPassword(),rmManager.getUsername(),
            UserRoles.ROLE_RM_MANAGER.roleId);
    }
-
    /**
     * Disposition Schedule on Record Folder with linked records test
     * <p>
@@ -135,202 +136,194 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
     * <p>
     * <p/> TestRail Test C775<p/>
     **/
-    @Test(enabled = false) // temporary disabled, see ACS-6073
-    @AlfrescoTest(jira = "RM-1622")
-    public void dispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
-        STEP("Create record category");
-        RecordCategory category1 = createRootCategory(CATEGORY_RM_3077);
-
-        //create retention schedule
-        dispositionScheduleService.createCategoryRetentionSchedule(category1.getName(), false);
-
-        // add cut off step
-        dispositionScheduleService.addCutOffAfterPeriodStep(category1.getName(), "day|2", CREATED_DATE);
-
-        //create a copy of the category recordsCategory
-        String copyCategoryId = copyCategory(getAdminUser(), category1.getId(), COPY_CATEGORY_RM_3077);
-
-        // create folders in both categories
-        RecordCategoryChild catFolder = createRecordFolder(category1.getId(), FOLDER_RM_3077);
-        createRecordFolder(copyCategoryId, COPY_FOLDER_RM_3077);
-
-        // create record  files
-        String electronicRecord = "RM-2801 electronic record";
-        Record elRecord = createElectronicRecord(catFolder.getId(), electronicRecord);
-        String elRecordFullName = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), catFolder.getName(), electronicRecord);
-
-        String nonElectronicRecord = "RM-2801 non-electronic record";
-        Record nonElRecord = createNonElectronicRecord(catFolder.getId(), nonElectronicRecord);
-        String nonElRecordFullName = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), catFolder.getName(), nonElectronicRecord);
-
-        // link the records to copy folder, then complete them
-        List<String> recordLists = new ArrayList<>();
-        recordLists.add(NODE_REF_WORKSPACE_SPACES_STORE + elRecord.getId());
-        recordLists.add(NODE_REF_WORKSPACE_SPACES_STORE + nonElRecord.getId());
-
-        linksAPI.linkRecord(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), HttpStatus.SC_OK, COPY_CATEGORY_RM_3077 + "/" +
-                COPY_FOLDER_RM_3077, recordLists);
-        recordsAPI.completeRecord(rmAdmin.getUsername(), rmAdmin.getPassword(), elRecordFullName);
-        recordsAPI.completeRecord(rmAdmin.getUsername(), rmAdmin.getPassword(), nonElRecordFullName);
-
-        // edit disposition date
-        recordFoldersAPI.postFolderAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),editDispositionDateJson(), catFolder.getName());
-
-        // cut off the Folder
-        recordFoldersAPI.postFolderAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","cutoff"), catFolder.getName());
-
-        // Verify the Content
-        Node electronicNode = getNode(elRecord.getId());
-        assertTrue("The content of " + electronicRecord + " is available",
-            StringUtils.isEmpty(electronicNode.getNodeContent().getResponse().getBody().asString()));
-
-        // verify the Properties
-        AssertJUnit.assertNull("The properties are present even after cutting off the record.", elRecord.getProperties().getTitle());
-
-        // delete precondition
-        deleteRecordCategory(category1.getId());
-        deleteRecordCategory(copyCategoryId);
-    }
-
-    /**
-     * Test covering RM-3060
-     * Check the disposition steps for a record can be executed
-     * When the record is linked to a folder with the same disposition schedule
-     * */
-    @Test(enabled = false) // temporary disabled, see ACS-6073
-    @AlfrescoTest (jira = "RM-3060")
-    public void sameDispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
-
-        // create a category with retention applied on records level
-        RecordCategory recordCategory = getRestAPIFactory().getFilePlansAPI(rmAdmin)
-            .createRootRecordCategory(RecordCategory.builder().name(FIRST_CATEGORY_RM_3060).build(),
-                RecordCategory.DEFAULT_FILE_PLAN_ALIAS);
-        dispositionScheduleService.createCategoryRetentionSchedule(FIRST_CATEGORY_RM_3060, true);
-        dispositionScheduleService.addCutOffAfterPeriodStep(FIRST_CATEGORY_RM_3060, "week|1", DATE_FILED);
-        dispositionScheduleService.addTransferAfterEventStep(
-            FIRST_CATEGORY_RM_3060, TRANSFER_LOCATION, RMEvents.CASE_CLOSED.getEventName());
-        dispositionScheduleService.addDestroyWithoutGhostingAfterPeriodStep(FIRST_CATEGORY_RM_3060, "week|1", CUT_OFF_DATE);
-
-        // make a copy of the category created
-        String categorySecondId = copyCategory(getAdminUser(), recordCategory.getId(), SECOND_CATEGORY_RM_3060);
-
-        // create a folder on the category firstCategoryRM3060 with a complete electronic record
-        RecordCategoryChild firstFolderRecordCategoryChild = createRecordFolder(recordCategory.getId(),
-            FIRST_FOLDER_RM_3060);
-        Record firstElectronicRecord = createElectronicRecord(firstFolderRecordCategoryChild.getId(),
-            ELECTRONIC_RECORD_RM_3060);
-
-        String elRecordFullName = recordsAPI.getRecordFullName(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), FIRST_FOLDER_RM_3060, ELECTRONIC_RECORD_RM_3060);
-        String elRecordNameNodeRef = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName, "/" + FIRST_CATEGORY_RM_3060 + "/" + FIRST_FOLDER_RM_3060);
-
-        recordsAPI.completeRecord(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), elRecordFullName);
-
-        // create a folder on the category secondCategoryRM3060 with a non electronic record
-        RecordCategoryChild secondFolderRecordCategoryChild = createRecordFolder(categorySecondId,
-            SECOND_FOLDER_RM_3060);
-        Record secondNonElectronicRecord = createNonElectronicRecord(secondFolderRecordCategoryChild.getId(),
-            NON_ELECTRONIC_RECORD_RM_3060);
-
-        // link the nonElectronicRecordRM3060 to firstFolderRM3060
-        List<String> recordLists = new ArrayList<>();
-        recordLists.add(NODE_REF_WORKSPACE_SPACES_STORE + secondNonElectronicRecord.getId());
-
-        linksAPI.linkRecord(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), HttpStatus.SC_OK, SECOND_CATEGORY_RM_3060 + "/" +
-                SECOND_FOLDER_RM_3060, recordLists);
-        String nonElRecordFullName = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            SECOND_FOLDER_RM_3060, secondNonElectronicRecord.getName());
-        String nonElRecordNameNodeRef = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), nonElRecordFullName, "/" + SECOND_CATEGORY_RM_3060
-                + "/" + SECOND_FOLDER_RM_3060);
-
-        // complete records and cut them off
-        recordsAPI.completeRecord(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), nonElRecordFullName);
-
-        // edit the disposition date
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),editDispositionDateJson(),nonElRecordNameNodeRef);
-
-        // cut off the record
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","cutoff"),nonElRecordNameNodeRef);
-
-        //check the record is cut off
-        AssertJUnit.assertTrue("The file " + NON_ELECTRONIC_RECORD_RM_3060 + " has not been successfully cut off.", getRestAPIFactory().getRecordsAPI().getRecord(secondNonElectronicRecord.getId()).getAspectNames().contains(CUT_OFF_ASPECT));
-
-        // link the electronic record to secondFolderRM3060
-        recordLists.clear();
-        recordLists.add(NODE_REF_WORKSPACE_SPACES_STORE + secondNonElectronicRecord.getId());
-        linksAPI.linkRecord(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), HttpStatus.SC_OK, SECOND_CATEGORY_RM_3060 + "/" +
-                SECOND_FOLDER_RM_3060, recordLists);
-
-        // edit the disposition date and cut off the record
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),editDispositionDateJson(),elRecordNameNodeRef);
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","cutoff"),elRecordNameNodeRef);
-
-        AssertJUnit.assertTrue("The file " + ELECTRONIC_RECORD_RM_3060 + " has not been successfully cut off.", getRestAPIFactory().getRecordsAPI().getRecord(firstElectronicRecord.getId()).getAspectNames().contains(CUT_OFF_ASPECT));
-
-        // open the record and complete the disposition schedule event
-        rmRolesAndActionsAPI.completeEvent(getAdminUser().getUsername(),
-            getAdminUser().getPassword(), elRecordFullName, RMEvents.CASE_CLOSED, Instant.now());
-        rmRolesAndActionsAPI.completeEvent(getAdminUser().getUsername(),
-            getAdminUser().getPassword(), nonElRecordFullName, RMEvents.CASE_CLOSED, Instant.now());
-
-        // transfer the files & complete transfers
-        HttpResponse nonElRecordNameHttpResponse = recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","transfer"),recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(), nonElRecordFullName, "/" + SECOND_CATEGORY_RM_3060
-                    + "/" + SECOND_FOLDER_RM_3060));
-
-        String nonElRecordNameTransferId = getTransferId(nonElRecordNameHttpResponse,nonElRecordNameNodeRef);
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","transferComplete"),nonElRecordNameTransferId);
-
-        HttpResponse elRecordNameHttpResponse = recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","transfer"),recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName, "/" + FIRST_CATEGORY_RM_3060
-                    + "/" + FIRST_FOLDER_RM_3060));
-
-        String elRecordNameTransferId = getTransferId(elRecordNameHttpResponse,elRecordNameNodeRef);
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","transferComplete"),elRecordNameTransferId);
-
-        AssertJUnit.assertTrue("The file " + ELECTRONIC_RECORD_RM_3060 + " has not been successfully transferred", getRestAPIFactory().getRecordsAPI().getRecord(firstElectronicRecord.getId()).getAspectNames().contains(TRANSFER_TYPE));
-        AssertJUnit.assertTrue("The file " + NON_ELECTRONIC_RECORD_RM_3060 + " has not been successfully transferred.", getRestAPIFactory().getRecordsAPI().getRecord(secondNonElectronicRecord.getId()).getAspectNames().contains(TRANSFER_TYPE));
-
-        // edit the disposition date for nonElectronicRecordRM3060 & electronicRecordRM3060
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),editDispositionDateJson(),nonElRecordNameNodeRef);
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),editDispositionDateJson(),elRecordNameNodeRef);
-
-        // destroy nonElectronicRecordRM3060 & electronicRecordRM3060 records
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","destroy"),nonElRecordNameNodeRef);
-        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","destroy"),elRecordNameNodeRef);
-
-        // check the file is not displayed
-       assertNull("The file " + NON_ELECTRONIC_RECORD_RM_3060 + " has not been successfully destroyed.", secondNonElectronicRecord.getContent());
-       assertNull("The file " + ELECTRONIC_RECORD_RM_3060 + " has not been successfully destroyed.", firstElectronicRecord.getContent());
-
-        // delete precondition
-        deleteRecordCategory(recordCategory.getId());
-        deleteRecordCategory(categorySecondId);
-    }
+//    @Ignore("ACS-5020")
+    //    @Test
+//    @AlfrescoTest(jira = "RM-1622")
+//    public void dispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
+//        STEP("Create record category");
+//        Category1 = createRootCategory(categoryRM3077);
+//
+//        //create retention schedule
+//        dispositionScheduleService.createCategoryRetentionSchedule(Category1.getName(), false);
+//
+//        // add cut off step
+//        dispositionScheduleService.addCutOffAfterPeriodStep(Category1.getName(), "day|2", CREATED_DATE);
+//
+//        //create a copy of the category recordsCategory
+//        String CopyCategoryId = copyCategory(getAdminUser(),Category1.getId(), copyCategoryRM3077);
+//
+//        // create folders in both categories
+//        CatFolder = createRecordFolder(Category1.getId(), folderRM3077);
+//        CopyCatFolder = createRecordFolder(CopyCategoryId, copyFolderRM3077);
+//
+//        // create record  files
+//        String electronicRecord = "RM-2801 electronic record";
+//        Record elRecord = createElectronicRecord(CatFolder.getId(), electronicRecord);
+//        String elRecordFullName = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
+//            getDataUser().usingAdmin().getAdminUser().getPassword(), CatFolder.getName(), electronicRecord);
+//
+//        String nonElectronicRecord = "RM-2801 non-electronic record";
+//        Record nonElRecord = createNonElectronicRecord(CatFolder.getId(), nonElectronicRecord);
+//        String nonElRecordFullName = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
+//            getDataUser().usingAdmin().getAdminUser().getPassword(), CatFolder.getName(), nonElectronicRecord);
+//
+//        // link the records to copy folder, then complete them
+//        List<String> recordLists = new ArrayList<>();
+//        recordLists.add(NODE_REF_WORKSPACE_SPACES_STORE + elRecord.getId());
+//        recordLists.add(NODE_REF_WORKSPACE_SPACES_STORE + nonElRecord.getId());
+//
+//        linksAPI.linkRecord(getDataUser().getAdminUser().getUsername(),
+//            getDataUser().getAdminUser().getPassword(), HttpStatus.SC_OK,copyCategoryRM3077 + "/" +
+//                copyFolderRM3077, recordLists);
+//        recordsAPI.completeRecord(rmAdmin.getUsername(), rmAdmin.getPassword(), elRecordFullName);
+//        recordsAPI.completeRecord(rmAdmin.getUsername(), rmAdmin.getPassword(), nonElRecordFullName);
+//
+//        // edit disposition date
+//        recordFoldersAPI.postFolderAction(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(),editDispositionDateJson(),CatFolder.getName());
+//
+//        // cut off the Folder
+//        recordFoldersAPI.postFolderAction(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(),new JSONObject().put("name","cutoff"),CatFolder.getName());
+//
+//        // Verify the Content
+//        Node electronicNode = getNode(elRecord.getId());
+//        assertTrue("The content of " + electronicRecord + " is available",
+//            StringUtils.isEmpty(electronicNode.getNodeContent().getResponse().getBody().asString()));
+//
+//        // verify the Properties
+//        AssertJUnit.assertNull("The properties are present even after cutting off the record.", elRecord.getProperties().getTitle());
+//
+//        // delete precondition
+//        deleteRecordCategory(Category1.getId());
+//        deleteRecordCategory(CopyCategoryId);
+//    }
+//    /**
+//     * Test covering RM-3060
+//     * Check the disposition steps for a record can be executed
+//     * When the record is linked to a folder with the same disposition schedule
+//     * */
+//    @Ignore("ACS-5020")
+////    @Test
+//    @AlfrescoTest (jira = "RM-3060")
+//    public void sameDispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
+//
+//        // create a category with retention applied on records level
+//        RecordCategory recordCategory = getRestAPIFactory().getFilePlansAPI(rmAdmin)
+//            .createRootRecordCategory(RecordCategory.builder().name(firstCategoryRM3060).build(),
+//                RecordCategory.DEFAULT_FILE_PLAN_ALIAS);
+//        dispositionScheduleService.createCategoryRetentionSchedule(firstCategoryRM3060, true);
+//        dispositionScheduleService.addCutOffAfterPeriodStep(firstCategoryRM3060, "week|1", DATE_FILED);
+//        dispositionScheduleService.addTransferAfterEventStep(firstCategoryRM3060, TRANSFER_LOCATION, RMEvents.CASE_CLOSED.getEventName());
+//        dispositionScheduleService.addDestroyWithoutGhostingAfterPeriodStep(firstCategoryRM3060, "week|1", CUT_OFF_DATE);
+//
+//        // make a copy of the category created
+//        String categorySecondId = copyCategory(getAdminUser(), recordCategory.getId(), secondCategoryRM3060);
+//
+//        // create a folder on the category firstCategoryRM3060 with a complete electronic record
+//        RecordCategoryChild firstFolderRecordCategoryChild = createRecordFolder(recordCategory.getId(),firstFolderRM3060);
+//        Record firstElectronicRecord = createElectronicRecord(firstFolderRecordCategoryChild.getId(),electronicRecordRM3060);
+//
+//        String elRecordFullName = recordsAPI.getRecordFullName(getDataUser().getAdminUser().getUsername(),
+//            getDataUser().getAdminUser().getPassword(),firstFolderRM3060, electronicRecordRM3060);
+//        String elRecordNameNodeRef = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
+//            getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName, "/" + firstCategoryRM3060 + "/" + firstFolderRM3060);
+//
+//        recordsAPI.completeRecord(getDataUser().getAdminUser().getUsername(),
+//            getDataUser().getAdminUser().getPassword(), elRecordFullName);
+//
+//        // create a folder on the category secondCategoryRM3060 with a non electronic record
+//        RecordCategoryChild secondFolderRecordCategoryChild = createRecordFolder(categorySecondId,secondFolderRM3060);
+//        Record secondNonElectronicRecord = createNonElectronicRecord(secondFolderRecordCategoryChild.getId(),nonElectronicRecordRM3060);
+//
+//        // link the nonElectronicRecordRM3060 to firstFolderRM3060
+//        List<String> recordLists = new ArrayList<>();
+//        recordLists.add(NODE_REF_WORKSPACE_SPACES_STORE + secondNonElectronicRecord.getId());
+//
+//        linksAPI.linkRecord(getDataUser().getAdminUser().getUsername(),
+//            getDataUser().getAdminUser().getPassword(), HttpStatus.SC_OK,secondCategoryRM3060 + "/" +
+//                secondFolderRM3060, recordLists);
+//        String nonElRecordFullName = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
+//            getDataUser().usingAdmin().getAdminUser().getPassword(), secondFolderRM3060, secondNonElectronicRecord.getName());
+//        String nonElRecordNameNodeRef = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
+//            getDataUser().usingAdmin().getAdminUser().getPassword(), nonElRecordFullName, "/" + secondCategoryRM3060 + "/" + secondFolderRM3060);
+//
+//        // complete records and cut them off
+//        recordsAPI.completeRecord(getDataUser().getAdminUser().getUsername(),
+//            getDataUser().getAdminUser().getPassword(), nonElRecordFullName);
+//
+//        // edit the disposition date
+//        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(),editDispositionDateJson(),nonElRecordNameNodeRef);
+//
+//        // cut off the record
+//        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(),new JSONObject().put("name","cutoff"),nonElRecordNameNodeRef);
+//
+//        //check the record is cut off
+//        AssertJUnit.assertTrue("The file " + nonElectronicRecordRM3060 + " has not been successfully cut off.", getRestAPIFactory().getRecordsAPI().getRecord(secondNonElectronicRecord.getId()).getAspectNames().contains(CUT_OFF_ASPECT));
+//
+//        // link the electronic record to secondFolderRM3060
+//        recordLists.clear();
+//        recordLists.add(NODE_REF_WORKSPACE_SPACES_STORE + secondNonElectronicRecord.getId());
+//        linksAPI.linkRecord(getDataUser().getAdminUser().getUsername(),
+//            getDataUser().getAdminUser().getPassword(), HttpStatus.SC_OK,secondCategoryRM3060 + "/" +
+//                secondFolderRM3060, recordLists);
+//
+//        // edit the disposition date and cut off the record
+//        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(),editDispositionDateJson(),elRecordNameNodeRef);
+//        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(),new JSONObject().put("name","cutoff"),elRecordNameNodeRef);
+//
+//        AssertJUnit.assertTrue("The file " + electronicRecordRM3060 + " has not been successfully cut off.", getRestAPIFactory().getRecordsAPI().getRecord(firstElectronicRecord.getId()).getAspectNames().contains(CUT_OFF_ASPECT));
+//
+//        // open the record and complete the disposition schedule event
+//        rmRolesAndActionsAPI.completeEvent(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(), elRecordFullName, RMEvents.CASE_CLOSED, Instant.now());
+//        rmRolesAndActionsAPI.completeEvent(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(), nonElRecordFullName, RMEvents.CASE_CLOSED, Instant.now());
+//
+//        // transfer the files & complete transfers
+//        HttpResponse nonElRecordNameHttpResponse = recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(),new JSONObject().put("name","transfer"),recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
+//                getDataUser().usingAdmin().getAdminUser().getPassword(), nonElRecordFullName, "/" + secondCategoryRM3060 + "/" + secondFolderRM3060));
+//
+//        String nonElRecordNameTransferId = getTransferId(nonElRecordNameHttpResponse,nonElRecordNameNodeRef);
+//        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(),new JSONObject().put("name","transferComplete"),nonElRecordNameTransferId);
+//
+//        HttpResponse elRecordNameHttpResponse = recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(),new JSONObject().put("name","transfer"),recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
+//                getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName, "/" + firstCategoryRM3060 + "/" + firstFolderRM3060));
+//
+//        String elRecordNameTransferId = getTransferId(elRecordNameHttpResponse,elRecordNameNodeRef);
+//        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(),new JSONObject().put("name","transferComplete"),elRecordNameTransferId);
+//
+//        AssertJUnit.assertTrue("The file " + electronicRecordRM3060 + " has not been successfully transferred", getRestAPIFactory().getRecordsAPI().getRecord(firstElectronicRecord.getId()).getAspectNames().contains(TRANSFER_TYPE));
+//        AssertJUnit.assertTrue("The file " + nonElectronicRecordRM3060 + " has not been successfully transferred.", getRestAPIFactory().getRecordsAPI().getRecord(secondNonElectronicRecord.getId()).getAspectNames().contains(TRANSFER_TYPE));
+//
+//        // edit the disposition date for nonElectronicRecordRM3060 & electronicRecordRM3060
+//        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(),editDispositionDateJson(),nonElRecordNameNodeRef);
+//        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(),editDispositionDateJson(),elRecordNameNodeRef);
+//
+//        // destroy nonElectronicRecordRM3060 & electronicRecordRM3060 records
+//        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(),new JSONObject().put("name","destroy"),nonElRecordNameNodeRef);
+//        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
+//            getAdminUser().getPassword(),new JSONObject().put("name","destroy"),elRecordNameNodeRef);
+//
+//        // check the file is not displayed
+//       assertNull("The file " + nonElectronicRecordRM3060 + " has not been successfully destroyed.", secondNonElectronicRecord.getContent());
+//       assertNull("The file " + electronicRecordRM3060 + " has not been successfully destroyed.", firstElectronicRecord.getContent());
+//
+//        // delete precondition
+//        deleteRecordCategory(recordCategory.getId());
+//        deleteRecordCategory(categorySecondId);
+//    }

    private String copyCategory(UserModel user, String categoryId, String copyName) {
        RepoTestModel repoTestModel = new RepoTestModel() {};
@@ -361,7 +354,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {

    private String getTransferId(HttpResponse httpResponse,String nodeRef) {
        HttpEntity entity = httpResponse.getEntity();
-        String responseString;
+        String responseString = null;
        try {
            responseString = EntityUtils.toString(entity, "UTF-8");
        } catch (IOException e) {
@@ -372,6 +365,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
            .getJSONObject("results")
            .get(nodeRef)
            .toString();
+
    }

    @Test
@@ -380,39 +374,35 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {

        // create a category with retention applied on records level
        RecordCategory catsameLevel1  = getRestAPIFactory().getFilePlansAPI(rmAdmin)
-                                                           .createRootRecordCategory(RecordCategory.builder().name(
-                                                                   FIRST_CATEGORY_RM_1622).build(),
+                                                           .createRootRecordCategory(RecordCategory.builder().name(firstCategoryRM1622).build(),
                                                               RecordCategory.DEFAULT_FILE_PLAN_ALIAS);
        RecordCategory catsameLevel2  = getRestAPIFactory().getFilePlansAPI(rmAdmin)
-                                                           .createRootRecordCategory(RecordCategory.builder().name(
-                                                                   SECOND_CATEGORY_RM_1622).build(),
+                                                           .createRootRecordCategory(RecordCategory.builder().name(secondCategoryRM1622).build(),
                                                               RecordCategory.DEFAULT_FILE_PLAN_ALIAS);

        // create retention schedule applied on records for category 1
-        dispositionScheduleService.createCategoryRetentionSchedule(FIRST_CATEGORY_RM_1622, true);
+        dispositionScheduleService.createCategoryRetentionSchedule(firstCategoryRM1622, true);

        // with retain immediately after record creation date and cut 1 day after record creation date
-        dispositionScheduleService.addCutOffAfterPeriodStep(FIRST_CATEGORY_RM_1622, "day|1", DATE_FILED);
+        dispositionScheduleService.addCutOffAfterPeriodStep(firstCategoryRM1622, "day|1", DATE_FILED);


        // create a folder on the category firstCategoryRM1622 with a complete electronic record
-        RecordCategoryChild firstFolderRecordCategoryChild = createRecordFolder(catsameLevel1.getId(),
-            FIRST_FOLDER_RM_1622);
-        Record firstElectronicRecord = createElectronicRecord(firstFolderRecordCategoryChild.getId(),
-            ELECTRONIC_RECORD_RM_1622);
+        RecordCategoryChild firstFolderRecordCategoryChild = createRecordFolder(catsameLevel1.getId(),firstFolderRM1622);
+        Record firstElectronicRecord = createElectronicRecord(firstFolderRecordCategoryChild.getId(),electronicRecordRM1622);

        String elRecordFullName = recordsAPI.getRecordFullName(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), FIRST_FOLDER_RM_1622, ELECTRONIC_RECORD_RM_1622);
-       recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName, "/" + FIRST_CATEGORY_RM_1622 + "/" + FIRST_FOLDER_RM_1622);
+            getDataUser().getAdminUser().getPassword(),firstFolderRM1622, electronicRecordRM1622);
+        String elRecordNameNodeRef = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
+            getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName, "/" + firstCategoryRM1622 + "/" + firstFolderRM1622);

        recordsAPI.completeRecord(getDataUser().getAdminUser().getUsername(),
            getDataUser().getAdminUser().getPassword(), elRecordFullName);

        // create a folder on the category secondCategoryRM1622 with a non electronic record
-        createRecordFolder(catsameLevel2.getId(), SECOND_FOLDER_RM_1622);
+        RecordCategoryChild secondFolderRecordCategoryChild = createRecordFolder(catsameLevel2.getId(),secondFolderRM1622);
        String elRecordNameNodeRefs = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName, "/" + FIRST_CATEGORY_RM_1622 + "/" + FIRST_FOLDER_RM_1622);
+            getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName, "/" + firstCategoryRM1622 + "/" + firstFolderRM1622);


        // link it to the folder in second category through the details page
@@ -420,12 +410,14 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
        recordLists.add(NODE_REF_WORKSPACE_SPACES_STORE + firstElectronicRecord.getId());

        linksAPI.linkRecord(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), HttpStatus.SC_OK, SECOND_CATEGORY_RM_1622 + "/" +
-                SECOND_FOLDER_RM_1622, recordLists);
+            getDataUser().getAdminUser().getPassword(), HttpStatus.SC_OK,secondCategoryRM1622 + "/" +
+                secondFolderRM1622, recordLists);

        // edit disposition date
        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
            getAdminUser().getPassword(),editDispositionDateJson(),elRecordNameNodeRefs);
+
+
    }

    @Test (dependsOnMethods = {"sameLevelDispositionScheduleStepsPeriodsCalculation" })
@@ -436,4 +428,4 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
        // Verify the status code
        assertStatusCode(NO_CONTENT);
    }
-}
+    }
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>23.1.1.13-SNAPSHOT</version>
+      <version>21.25-SNAPSHOT</version>
   </parent>

   <modules>
--- a/amps/ags/rm-community/rm-community-repo/.env
+++ b/amps/ags/rm-community/rm-community-repo/.env
@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.11
-POSTGRES_TAG=15.4
-ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
+SOLR6_TAG=2.0.7-A5
+POSTGRES_TAG=14.4
+ACTIVEMQ_TAG=5.17.6-jre17-rockylinux8
--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
@@ -39,7 +39,7 @@ cache.jsonConversionComponentCache.timeToLiveSeconds=0
 cache.jsonConversionComponentCache.maxIdleSeconds=0
 cache.jsonConversionComponentCache.backup-count=1
 cache.jsonConversionComponentCache.eviction-policy=NONE
-cache.jsonConversionComponentCache.merge-policy=com.hazelcast.spi.merge.PutIfAbsentMergePolicy
+cache.jsonConversionComponentCache.merge-policy=com.hazelcast.map.merge.PutIfAbsentMapMergePolicy
 cache.jsonConversionComponentCache.nearCache.maxSize=50
 cache.jsonConversionComponentCache.nearCache.maxIdleSeconds=0
 cache.jsonConversionComponentCache.nearCache.timeToLiveSeconds=0
--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/onCreate_supersedes.js
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/onCreate_supersedes.js
@@ -33,7 +33,7 @@ function main()
 {
   // Log debug message
   logger.log("Record " + node.name + " has been superseded.  Sending notification");
-
+   
   // Send notification
   rmService.sendSupersededNotification(node);
 }
--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/repository/version/rm-version.get.js
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/repository/version/rm-version.get.js
@@ -99,10 +99,10 @@ function main()
            {
               version = versionHistory[i];
               p = getPerson(version.creator);
-
+               
               recordNodeRef = version.getVersionProperty("recordNodeRef");
               isRecordedVersionDestroyed = version.getVersionProperty("RecordedVersionDestroyed");
-
+               
               versions[versions.length] =
               {
                  nodeRef: version.node.nodeRef.toString(),
--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.js
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.js
@@ -26,19 +26,19 @@
 */
 /**
 * Delete the rm constraint list
- */
+ */ 
 function main()
 {
   // Get the shortname
   var shortName = url.extension;
-
+   
   // Get the constraint
   var constraint = caveatConfig.getConstraint(shortName);
-
+   
   if (constraint != null)
   {
      caveatConfig.deleteConstraintList(shortName);
-
+      
      // Pass the constraint name to the template
      model.constraintName = shortName;
   }
--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.get.js
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.get.js
@@ -26,15 +26,15 @@
 */
 /**
 * Get the detail of the rm constraint
- */
+ */ 
 function main()
 {
   // Get the shortname
   var shortName = url.extension;
-
+   
   // Get the constraint
   var constraint = caveatConfig.getConstraint(shortName);
-
+   
   if (constraint != null)
   {
      // Pass the constraint detail to the template
--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.get.js
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.get.js
@@ -26,14 +26,14 @@
 */
 /**
 * List the names of the rm constraints
- */
+ */ 
 function main()
 {
   var wel = true;
   var withEmptyLists = args["withEmptyLists"];
   // Pass the information to the template
   if (withEmptyLists != null && withEmptyLists === 'false')
-   {
+   {		
 	  model.constraints = caveatConfig.constraintsWithoutEmptyList;
   }
   else
--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.get.js
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.get.js
@@ -26,15 +26,15 @@
 */
 /**
 * Get the detail of the rm constraint
- */
+ */ 
 function main()
 {
   var urlElements = url.extension.split("/");
   var shortName = urlElements[0];
-
+   
   // Get the constraint
   var constraint = caveatConfig.getConstraint(shortName);
-
+   
   if (constraint != null)
   {
      // Pass the constraint detail to the template
--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.json.js
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.json.js
@@ -26,33 +26,33 @@
 */
 /**
 * Update the details of a value in an rm constraint
- */
+ */ 
 function main()
 {
   var urlElements = url.extension.split("/");
   var shortName = urlElements[0];
-
+   
   var values = null;
-
+   
   if (json.has("values"))
   {
      values = json.getJSONArray("values");
   }
-
+   
   if (values == null)
   {
      status.setCode(status.STATUS_BAD_REQUEST, "Values missing");
      return;
   }
-
+  
   // Get the constraint
   var constraint = caveatConfig.getConstraint(shortName);
-
+   
   if (constraint != null)
   {
-      constraint.updateValues(values);
+      constraint.updateValues(values); 
      model.constraint = caveatConfig.getConstraint(shortName);
-      model.constraintName = shortName;
+      model.constraintName = shortName; 
   }
   else
   {
--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.js
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.js
@@ -26,13 +26,13 @@
 */
 /**
 * Delete the rm constraint list
- */
+ */ 
 function main()
 {
   var urlElements = url.extension.split("/");
   var shortName = urlElements[0];
   var authorityName = urlElements[1];
-
+   
   if (shortName == null)
   {
      status.setCode(status.STATUS_BAD_REQUEST, "shortName missing");
@@ -43,16 +43,16 @@ function main()
      status.setCode(status.STATUS_BAD_REQUEST, "value missing");
      return;
   }
-
+   
   // Get the constraint
   var constraint = caveatConfig.getConstraint(shortName);
-
+   
   if (constraint != null)
   {
      caveatConfig.deleteRMConstraintListValue(shortName, valueName);
-
+      
      var constraint = caveatConfig.getConstraint(shortName);
-
+      
      // Pass the constraint name to the template
      model.constraint = constraint;
   }
--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.js
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.js
@@ -26,28 +26,28 @@
 */
 /**
 * Get the detail of the rm constraint
- */
+ */ 
 function main()
 {
   var urlElements = url.extension.split("/");
   var shortName = decodeURIComponent(urlElements[0]);
   var valueName = decodeURIComponent(urlElements[2])
-
+   
   // Get the constraint
   var constraint = caveatConfig.getConstraint(shortName);
-
+   
   if (constraint != null)
   {
      // Pass the constraint detail to the template
      var value = constraint.getValue(valueName);
-
+      
      if(value == null)
      {
         // Return 404
         status.setCode(404, "Constraint List: " + shortName + " value: " + valueName + "does not exist");
         return;
      }
-
+      
      model.value = value;
      model.constraint = constraint;
   }
--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.get.js
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.get.js
@@ -114,7 +114,7 @@ function getRecordSeries(seriesNode)
 	// Create Record Series object
 	var recordSerie = {
      parentPath: "/",
-      name: seriesNode.name,
+      name: seriesNode.name,      
      identifier: seriesNode.properties["rma:identifier"],
      description: seriesNode.properties["description"]
   };
@@ -154,7 +154,7 @@ function getRecordCategory(categoryNode, parentPath)
      name: categoryNode.name,
      identifier: categoryNode.properties["rma:identifier"],
      vitalRecordIndicator: categoryNode.properties["vitalRecordIndicator"],
-      dispositionAuthority: categoryNode.properties["dispositionAuthority"],
+      dispositionAuthority: categoryNode.properties["dispositionAuthority"], 
      recordFolders: [],
      dispositionActions: []
   };
--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-savedsearches.get.js
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-savedsearches.get.js
@@ -36,12 +36,12 @@ function main()
      status.setCode(status.STATUS_NOT_FOUND, "Site not found: '" + siteId + "'");
      return null;
   }
-
+   
   var searchNode = siteNode.getContainer("Saved Searches");
   if (searchNode != null)
   {
      var kids, ssNode;
-
+      
      if (bPublic == null || bPublic == "true")
      {
         // public searches are in the root of the folder
@@ -56,7 +56,7 @@ function main()
            kids = userNode.children;
         }
      }
-
+      
      if (kids)
      {
         for (var i = 0, ii = kids.length; i < ii; i++)
@@ -73,7 +73,7 @@ function main()
         }
      }
   }
-
+   
   model.savedSearches = savedSearches;
 }

--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-transfer.get.js
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-transfer.get.js
@@ -40,7 +40,7 @@ function main()
      status.setCode(status.STATUS_BAD_REQUEST, "nodeRef: '" + nodeRef + "' is not of type 'rma:transfer'");
      return null;
   }
-
+   
   model.transfer = transfer;
 }

--- a/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/search/live-search.lib.js
+++ b/amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/search/live-search.lib.js
@@ -33,7 +33,7 @@

 /**
 * Live Search Component
- *
+ * 
 * Takes the following object as Input:
 *    params
 *    {
@@ -41,7 +41,7 @@
 *       term: search terms
 *       maxResults: maximum results to return
 *    };
- *
+ * 
 * Outputs:
 *  items - Array of objects containing the search results
 */
@@ -53,7 +53,7 @@ const SURF_CONFIG_QNAMEPATH = "/cm:surf-config/";
 /**
 * Returns site information data structure.
 * { shortName: siteId, title: title }
- *
+ * 
 * Caches the data to avoid repeatedly querying the repository.
 */
 var siteDataCache = {};
@@ -134,13 +134,13 @@ function getDocumentItem(container, node) {
         }
      }
   }
-
+   
   return item;
 }

 /**
 * Splits the qname path to a node.
- *
+ * 
 * Returns container meta object containing the following properties:
 *    siteId
 *    containerId
@@ -151,7 +151,7 @@ function splitQNamePath(node) {
         siteId: null,
         containerId: null
       };
-
+   
   if (path.match("^"+SITES_SPACE_QNAME_PATH) == SITES_SPACE_QNAME_PATH)
   {
      var tmp = path.substring(SITES_SPACE_QNAME_PATH.length),
@@ -167,13 +167,13 @@ function splitQNamePath(node) {
            // strip container id from the path
            var containerId = tmp.substring(0, pos);
            containerId = containerId.substring(containerId.indexOf(":") + 1);
-
+            
            container.siteId = siteId;
            container.containerId = containerId;
         }
      }
   }
-
+   
   return container;
 }

@@ -197,36 +197,36 @@ function liveSearch(params) {

 /**
 * Return Document Search results with the given search terms.
- *
+ * 
 * "AND" is the default operator unless configured otherwise, OR, AND and NOT are also supported -
 * as is any other valid fts-alfresco elements such as "quoted terms" and (bracket terms) and also
 * propname:propvalue syntax.
- *
+ * 
 * @param params  Object containing search parameters - see API description above
 */
 function getDocResults(params) {
   // ensure a TYPE is specified
   var ftsQuery = params.term + ' AND +TYPE:"cm:content"';
-
+   
   // site constraint
   if (params.siteId !== null)
   {
      // use SITE syntax to restrict to specific site
      ftsQuery += ' AND SITE:"' + params.siteId + '"';
   }
-
+   
   // root node - generally used for overridden Repository root in Share
   if (params.rootNode !== null)
   {
      ftsQuery = 'PATH:"' + rootNode.qnamePath + '//*" AND (' + ftsQuery + ')';
   }
-
+   
   // main query construction
   ftsQuery = '(' + ftsQuery + ') AND -TYPE:"cm:thumbnail" AND -TYPE:"cm:failedThumbnail" AND -TYPE:"cm:rating" AND -TYPE:"fm:post" AND -ASPECT:"sys:hidden" AND -ASPECT:"rma:savedSearch" AND -cm:creator:system';
-
+   
   if (logger.isLoggingEnabled())
      logger.log("LiveQuery:\r\n" + ftsQuery);
-
+   
   // get default fts operator from the config
   //
   // TODO: common search lib - for both live and standard e.g. to get values like this...
@@ -237,7 +237,7 @@ function getDocResults(params) {
   {
      operator = cf.toString();
   }
-
+   
   // perform fts-alfresco language query
   var queryDef = {
      query: ftsQuery,
@@ -254,10 +254,10 @@ function getDocResults(params) {
   var rs = search.queryResultSet(queryDef);
       nodes = rs.nodes,
       results = [];
-
+   
   if (logger.isLoggingEnabled())
      logger.log("Processing resultset of length: " + nodes.length);
-
+   
   for (var i=0, item; i<nodes.length && i<params.maxResults; i++)
   {
      // For each node we extract the site/container qname path and then
@@ -279,13 +279,13 @@ function getDocResults(params) {
         }
      }
   }
-
+   
   return buildResults(results, params, rs.meta.hasMore);
 }

 /**
 * Return Site Search results with the given search terms.
- *
+ * 
 * @param params  Object containing search parameters - see API description above
 */
 function getSiteResults(params) {
@@ -297,7 +297,7 @@ function getSiteResults(params) {

 /**
 * Return People Search results with the given search terms.
- *
+ * 
 * @param params  Object containing search parameters - see API description above
 */
 function getPeopleResults(params) {
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -8,7 +8,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>23.1.1.13-SNAPSHOT</version>
+      <version>21.25-SNAPSHOT</version>
   </parent>

   <properties>
@@ -60,12 +60,9 @@
         <scope>test</scope>
      </dependency>
      <dependency>
-         <groupId>jakarta.servlet</groupId>
-         <artifactId>jakarta.servlet-api</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>jakarta.mail</groupId>
-         <artifactId>jakarta.mail-api</artifactId>
+         <groupId>javax.servlet</groupId>
+         <artifactId>javax.servlet-api</artifactId>
+         <scope>provided</scope>
      </dependency>
      <dependency>
         <groupId>org.alfresco.surf</groupId>
@@ -105,8 +102,9 @@
         <artifactId>swagger-parser</artifactId>
         <scope>test</scope>
      </dependency>
+      <!-- https://mvnrepository.com/artifact/com.github.fge/json-schema-validator -->
      <dependency>
-         <groupId>com.networknt</groupId>
+         <groupId>com.github.fge</groupId>
         <artifactId>json-schema-validator</artifactId>
         <scope>test</scope>
      </dependency>
@@ -416,7 +414,9 @@
                  <configuration>
                     <images>
                        <image>
-                           <name>postgres:15.4</name>
+                           <!-- TODO upgrade this old postgres version -->
+                           <name>postgres:9.4.12</name>
+                           <!--<name>postgres:13.3</name>-->
                           <run>
                              <ports>
                                 <port>${postgresql.tests.port}:${postgresql.port}</port>
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java
@@ -39,12 +39,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;

-import jakarta.mail.MessagingException;
-import jakarta.mail.Multipart;
-import jakarta.mail.Part;
-import jakarta.mail.internet.ContentType;
-import jakarta.mail.internet.MimeMessage;
-import jakarta.mail.internet.MimeUtility;
+import javax.mail.MessagingException;
+import javax.mail.Multipart;
+import javax.mail.Part;
+import javax.mail.internet.ContentType;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeUtility;

 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
@@ -52,7 +52,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import jakarta.transaction.SystemException;
+import javax.transaction.SystemException;

 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java
@@ -61,7 +61,6 @@ public class RFC822MetadataExtracter extends org.alfresco.repo.content.metadata.
    public void setNodeService(NodeService nodeService)
    {
        this.nodeService = nodeService;
-        super.setNodeService(nodeService);
    }

    /**
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AbstractRmWebScript.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AbstractRmWebScript.java
@@ -29,7 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.script;

 import static org.alfresco.util.WebScriptUtils.getTemplateVars;

-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;

 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java
@@ -27,7 +27,7 @@

 package org.alfresco.module.org_alfresco_module_rm.script;

-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java
@@ -30,7 +30,7 @@ package org.alfresco.module.org_alfresco_module_rm.script;
 import java.util.HashMap;
 import java.util.Map;

-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;

 import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionAbstractBase.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionAbstractBase.java
@@ -34,7 +34,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;

 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionActionDefinition;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;

-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;

 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipDelete.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipDelete.java
@@ -33,7 +33,7 @@ import static org.alfresco.util.WebScriptUtils.getTemplateVars;
 import java.util.HashMap;
 import java.util.Map;

-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;

 import org.alfresco.module.org_alfresco_module_rm.relationship.RelationshipService;
 import org.alfresco.service.cmr.repository.NodeRef;
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java
@@ -27,7 +27,7 @@

 package org.alfresco.module.org_alfresco_module_rm.script;

-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java
@@ -32,7 +32,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;

-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;

 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java
@@ -32,7 +32,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;

-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;

 import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
 import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java
@@ -25,7 +25,7 @@
 * #L%
 */
 /*
- * Copyright (C) 2005 - 2024 Alfresco Software Limited.
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
 *
 * This file is part of Alfresco
 *
@@ -44,7 +44,7 @@
 */
 package org.alfresco.repo.web.scripts.roles;

-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
--- a/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/schedule/UpdateRecordScheduleGet.java
+++ b/amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/schedule/UpdateRecordScheduleGet.java
@@ -25,7 +25,7 @@
 * #L%
 */
 /*
- * Copyright (C) 2005 - 2024 Alfresco Software Limited.
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
 *
 * This file is part of Alfresco
 *
@@ -54,7 +54,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;

 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
--- a/amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties
+++ b/amps/ags/rm-community/rm-community-repo/test/resources/alfresco/version.properties
@@ -3,8 +3,8 @@
 #

 # Version label
-version.major=23
-version.minor=1
+version.major=7
+version.minor=4
 version.revision=1
 version.label=

--- a/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseYamlUnitTest.java
+++ b/amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseYamlUnitTest.java
@@ -45,10 +45,12 @@ import java.util.Set;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import com.networknt.schema.JsonSchema;
-import com.networknt.schema.JsonSchemaFactory;
-import com.networknt.schema.SpecVersion.VersionFlag;
-import com.networknt.schema.ValidationMessage;
+import com.github.fge.jackson.JsonLoader;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingMessage;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.main.JsonSchema;
+import com.github.fge.jsonschema.main.JsonSchemaFactory;

 import io.swagger.models.Swagger;
 import io.swagger.parser.SwaggerParser;
@@ -64,8 +66,8 @@ import org.apache.commons.io.filefilter.WildcardFileFilter;
 */
 public class BaseYamlUnitTest
 {
-    private static final String SWAGGER_2_SCHEMA_LOCATION = "/rest/schema.json";
-    private static final String OPEN_API_SPECIFICATION = "2.0";
+    private static String SWAGGER_2_SCHEMA_LOCATION = "/rest/schema.json";
+    private static String OPEN_API_SPECIFICATION = "2.0";

    /**
     * Helper method to obtain path names for all yaml files found on the given path
@@ -84,11 +86,11 @@ public class BaseYamlUnitTest
    /**
     * Helper method to validate that all given yaml files are valid readable Swagger format
     */
-    protected void validateYamlFiles(final Set<String> yamlFileNames) throws ValidationException, IOException
+    protected void validateYamlFiles(final Set<String> yamlFileNames) throws ProcessingException, IOException
    {
        assertFalse("Expected at least 1 yaml file to validate", yamlFileNames.isEmpty());

-        final JsonSchema swaggerSchema = getSwaggerSchema();
+        final JsonSchema swaggerSchema = getSwaggerSchema(SWAGGER_2_SCHEMA_LOCATION);
        assertNotNull("Failed to obtain the Swagger schema", swaggerSchema);
        
        for (String yamlFilePath : yamlFileNames)
@@ -104,11 +106,11 @@ public class BaseYamlUnitTest
                assertEquals("Failed to obtain Swagger version from yaml file " + yamlFilePath, 
                        swagger.getSwagger(), OPEN_API_SPECIFICATION);
            }
-            catch (ValidationException ex)
+            catch (ProcessingException ex)
            {
                // ensure the yaml filename is included in the message
                String context = String.format(yamlFilePath + ": %n" + ex.getMessage());
-                throw new ValidationException(context) ;
+                throw new ProcessingException(context) ;
            }
        }
    }
@@ -116,15 +118,16 @@ public class BaseYamlUnitTest
    /**
     * Helper method to read in the Swagger JSON schema file
     */
-    private JsonSchema getSwaggerSchema() throws IOException
+    private JsonSchema getSwaggerSchema(final String schemaLocation) throws IOException, ProcessingException
    {
        JsonSchema swaggerSchema = null;
-        final InputStream in = this.getClass().getResourceAsStream(SWAGGER_2_SCHEMA_LOCATION);
+        final InputStream in = this.getClass().getResourceAsStream(schemaLocation);
        if (in != null)
        {
            final String swaggerSchemaAsString = IOUtils.toString(in);
-            final JsonSchemaFactory factory = JsonSchemaFactory.getInstance(VersionFlag.V4);
-            swaggerSchema = factory.getSchema(swaggerSchemaAsString);
+            final JsonNode schemaNode = JsonLoader.fromString(swaggerSchemaAsString);
+            final JsonSchemaFactory factory = JsonSchemaFactory.byDefault();
+            swaggerSchema = factory.getJsonSchema(schemaNode);
        }
        return swaggerSchema;
    }
@@ -132,7 +135,7 @@ public class BaseYamlUnitTest
    /**
     * Helper method to validate Yaml file against JSON schema
     */
-    private boolean validateYamlFile(final String yamlFilePath, final JsonSchema jsonSchema) throws IOException, ValidationException
+    private boolean validateYamlFile(final String yamlFilePath, final JsonSchema jsonSchema) throws IOException, ProcessingException
    {
        // Get yaml file as a string
        final String yaml = new String(Files.readAllBytes(Paths.get(yamlFilePath)));
@@ -149,22 +152,19 @@ public class BaseYamlUnitTest
    /**
     * Helper method to validate JSON string against JSON schema
     */
-    private boolean validateJSON(final String jsonData, final JsonSchema schema) throws IOException, ValidationException
+    private boolean validateJSON(final String jsonData, final JsonSchema schema) throws IOException, ProcessingException
    {
-        final JsonNode dataNode = new ObjectMapper().readTree(jsonData);
-
-        final Iterator<ValidationMessage> errors = schema.validate(dataNode).iterator();
-        if (!errors.hasNext()) return true;
-
-        final ValidationMessage errorMessage = errors.next();
-        throw new ValidationException(errorMessage.toString());
-    }
-
-    private static class ValidationException extends Exception
-    {
-        public ValidationException(String message)
+        final JsonNode dataNode = JsonLoader.fromString(jsonData);
+        final ProcessingReport report = schema.validate(dataNode);
+        boolean isOk = report.isSuccess();
+        if (!isOk)
        {
-            super(message);
+            Iterator<ProcessingMessage> messages = report.iterator();
+            if (messages.hasNext())
+            {
+                throw new ProcessingException(messages.next().toString());
+            }
        }
+        return isOk;
    }
 }
--- a/amps/ags/rm-community/rm-community-repo/unit-test/resources/rest/schema.json
+++ b/amps/ags/rm-community/rm-community-repo/unit-test/resources/rest/schema.json
@@ -1,7 +1,7 @@
 {
  "title": "A JSON Schema for Swagger 2.0 API.",
-  "id": "http://swagger.io/v2/schema.json#",
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "id": "#",
+  "$schema": "#",
  "type": "object",
  "required": [
    "swagger",
@@ -203,7 +203,7 @@
      "additionalProperties": {
        "$ref": "#/definitions/response"
      },
-      "description": "One or more JSON representations for responses"
+      "description": "One or more JSON representations for parameters"
    },
    "externalDocs": {
      "type": "object",
--- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-        <version>23.1.1.13-SNAPSHOT</version>
+        <version>21.25-SNAPSHOT</version>
    </parent>

    <build>
@@ -36,40 +36,24 @@
         <id>start-api-explorer</id>
         <build>
            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.cargo</groupId>
-                    <artifactId>cargo-maven3-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>run-war</id>
-                            <phase>verify</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                    <configuration>
-                        <container>
-                            <containerId>tomcat9x</containerId>
-                            <type>embedded</type>
-                            <log>target/cargo.log</log>
-                        </container>
-                        <configuration>
-                            <properties>
-                                <cargo.servlet.port>8085</cargo.servlet.port>
-                            </properties>
-                        </configuration>
-                        <deployables>
-                            <deployable>
-                                <type>war</type>
-                                <properties>
-                                    <context>/api-explorer</context>
-                                </properties>
-                                <pingURL>http://localhost:8085/api-explorer</pingURL>
-                            </deployable>
-                        </deployables>
-                    </configuration>
-                </plugin>
+               <plugin>
+                  <groupId>org.apache.tomcat.maven</groupId>
+                  <artifactId>tomcat7-maven-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>run-war</id>
+                        <goals>
+                           <goal>run-war</goal>
+                        </goals>
+                        <phase>verify</phase>
+                     </execution>
+                  </executions>
+                  <configuration>
+                     <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
+                     <path>/api-explorer</path>
+                     <port>8085</port>
+                  </configuration>
+               </plugin>
            </plugins>
         </build>
      </profile>
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.1.13-SNAPSHOT</version>
+        <version>21.25-SNAPSHOT</version>
    </parent>

    <modules>
--- a/amps/share-services/pom.xml
+++ b/amps/share-services/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>23.1.1.13-SNAPSHOT</version>
+        <version>21.25-SNAPSHOT</version>
    </parent>

    <properties>
@@ -128,8 +128,26 @@
            <scope>test</scope>
        </dependency>
        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- SHA-2432 -->
+        <dependency>
+            <groupId>org.apache.taglibs</groupId>
+            <artifactId>taglibs-standard-spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.taglibs</groupId>
+            <artifactId>taglibs-standard-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.taglibs</groupId>
+            <artifactId>taglibs-standard-jstlel</artifactId>
+            <scope>provided</scope>
        </dependency>
    </dependencies>

--- a/amps/share-services/src/main/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java
+++ b/amps/share-services/src/main/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 - 2023 Alfresco Software Limited.
+ * Copyright 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 the paid license agreement will prevail.
@@ -27,7 +27,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;

 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.repo.web.scripts.admin.NodeBrowserPost;
--- a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js
+++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js
@@ -23,10 +23,6 @@ function runAction(p_params)
      if (p_params.destNode.hasAspect("cm:lockable") && !p_params.destNode.hasAspect("trx:transferred"))
      {
         p_params.destNode.unlock();
-         if(p_params.destNode.hasAspect("gd2:editingInGoogle"))
-         {
-             p_params.destNode.removeAspect("gd2:editingInGoogle");
-         }
      }

      var resultId = originalDoc.name,
--- a/amps/share-services/src/test/java/org/alfresco/repo/web/scripts/wiki/WikiRestApiTest.java
+++ b/amps/share-services/src/test/java/org/alfresco/repo/web/scripts/wiki/WikiRestApiTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2023 Alfresco Software Limited.
+ * Copyright 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 the paid license agreement will prevail.
@@ -24,7 +24,7 @@ import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

-import jakarta.transaction.UserTransaction;
+import javax.transaction.UserTransaction;

 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.node.archive.NodeArchiveService;
--- a/amps/share-services/src/test/java/org/alfresco/slingshot/documentlibrary/FolderTemplateTest.java
+++ b/amps/share-services/src/test/java/org/alfresco/slingshot/documentlibrary/FolderTemplateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2023 Alfresco Software Limited.
+ * Copyright 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 the paid license agreement will prevail.
@@ -24,7 +24,7 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;

-import jakarta.transaction.UserTransaction;
+import javax.transaction.UserTransaction;

 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.model.Repository;
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo</artifactId>
-      <version>23.1.1.13-SNAPSHOT</version>
+      <version>21.25-SNAPSHOT</version>
   </parent>

   <dependencies>
@@ -111,8 +111,9 @@

      <!-- provided dependencies -->
      <dependency>
-         <groupId>jakarta.servlet</groupId>
-         <artifactId>jakarta.servlet-api</artifactId>
+         <groupId>javax.servlet</groupId>
+         <artifactId>javax.servlet-api</artifactId>
+         <scope>provided</scope>
      </dependency>

      <!-- Test only dependencies, as popped up while running mvn test -->
--- a/core/src/main/java/org/alfresco/encryption/DefaultEncryptionUtils.java
+++ b/core/src/main/java/org/alfresco/encryption/DefaultEncryptionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2023 Alfresco Software Limited.
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
 *
 * This file is part of Alfresco
 *
@@ -26,8 +26,8 @@ import java.net.UnknownHostException;
 import java.security.AlgorithmParameters;
 import java.util.Arrays;

-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;

 import org.alfresco.encryption.MACUtils.MACInput;
 import org.alfresco.error.AlfrescoRuntimeException;
--- a/core/src/main/java/org/alfresco/encryption/EncryptionUtils.java
+++ b/core/src/main/java/org/alfresco/encryption/EncryptionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2023 Alfresco Software Limited.
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
 *
 * This file is part of Alfresco
 *
@@ -21,8 +21,8 @@ package org.alfresco.encryption;
 import java.io.IOException;
 import java.security.AlgorithmParameters;

-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;

 import org.apache.commons.httpclient.HttpMethod;

--- a/core/src/main/java/org/alfresco/util/transaction/SpringAwareUserTransaction.java
+++ b/core/src/main/java/org/alfresco/util/transaction/SpringAwareUserTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2023 Alfresco Software Limited.
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
 *
 * This file is part of Alfresco
 *
@@ -23,13 +23,13 @@ import static java.util.Collections.emptyList;
 import java.lang.reflect.Method;
 import java.util.Collection;

-import jakarta.transaction.HeuristicMixedException;
-import jakarta.transaction.HeuristicRollbackException;
-import jakarta.transaction.NotSupportedException;
-import jakarta.transaction.RollbackException;
-import jakarta.transaction.Status;
-import jakarta.transaction.SystemException;
-import jakarta.transaction.UserTransaction;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.Status;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;

 import org.alfresco.error.StackTraceUtil;
 import org.alfresco.util.GUID;
--- a/core/src/main/java/org/alfresco/util/transaction/TransactionListener.java
+++ b/core/src/main/java/org/alfresco/util/transaction/TransactionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2023 Alfresco Software Limited.
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
 *
 * This file is part of Alfresco
 *
@@ -53,7 +53,7 @@ public interface TransactionListener
     * on the state of the transaction.
     * <p>
     * Although all transaction resources are still available, this method should
-     * be used only for cleaning up resources after a commit has occurred.
+     * be used only for cleaning up resources after a commit has occured.
     */
    void afterCommit();

@@ -64,7 +64,7 @@ public interface TransactionListener
     * on the state of the transaction.
     * <p>
     * Although all transaction resources are still available, this method should
-     * be used only for cleaning up resources after a rollback has occurred.
+     * be used only for cleaning up resources after a rollback has occured.
     */
    void afterRollback();
 }
--- a/core/src/main/java/org/alfresco/web/scripts/servlet/StaticAssetCacheFilter.java
+++ b/core/src/main/java/org/alfresco/web/scripts/servlet/StaticAssetCacheFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 - 2023 Alfresco Software Limited.
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
 *
 * This file is part of Alfresco
 *
@@ -20,13 +20,13 @@ package org.alfresco.web.scripts.servlet;

 import java.io.IOException;

-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;

 /**
 * Simple servlet filter to add a 'Cache-Control' HTTP header to a response.
@@ -48,7 +48,7 @@ public class StaticAssetCacheFilter implements Filter
    
    
    /* (non-Javadoc)
-     * @see jakarta.servlet.Filter#init(jakarta.servlet.FilterConfig)
+     * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
     */
    public void init(FilterConfig config) throws ServletException
    {
@@ -60,7 +60,7 @@ public class StaticAssetCacheFilter implements Filter
    }
    
    /* (non-Javadoc)
-     * @see jakarta.servlet.Filter#doFilter(jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse, jakarta.servlet.FilterChain)
+     * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
     */
    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException,
            ServletException
@@ -70,7 +70,7 @@ public class StaticAssetCacheFilter implements Filter
    }
    
    /* (non-Javadoc)
-     * @see jakarta.servlet.Filter#destroy()
+     * @see javax.servlet.Filter#destroy()
     */
    public void destroy()
    {
--- a/core/src/main/java/org/alfresco/web/scripts/servlet/X509ServletFilterBase.java
+++ b/core/src/main/java/org/alfresco/web/scripts/servlet/X509ServletFilterBase.java
@@ -1,5 +1,5 @@
 /*
-* Copyright (C) 2005 - 2023 Alfresco Software Limited.
+* Copyright (C) 2005-2013 Alfresco Software Limited.
 *
 * This file is part of Alfresco
 *
@@ -21,9 +21,9 @@ package org.alfresco.web.scripts.servlet;

 import javax.management.*;
 import javax.security.auth.x500.X500Principal;
-import jakarta.servlet.*;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.security.cert.X509Certificate;
 import java.util.Set;
@@ -74,6 +74,8 @@ public abstract class X509ServletFilterBase implements Filter
                logger.debug("Initializing X509ServletFilter");
            }

+            this.handleClientAuth();
+
            this.enforce = checkEnforce(config.getServletContext());

            if(logger.isDebugEnabled())
@@ -83,8 +85,6 @@ public abstract class X509ServletFilterBase implements Filter

            if (this.enforce)
            {
-                this.handleClientAuth();
-
                /*
                * We are enforcing so get the cert-contains string.
                */
@@ -134,7 +134,7 @@ public abstract class X509ServletFilterBase implements Filter
                logger.debug("Enforcing X509 request");
            }

-            X509Certificate[] certs = (X509Certificate[])httpRequest.getAttribute("jakarta.servlet.request.X509Certificate");
+            X509Certificate[] certs = (X509Certificate[])httpRequest.getAttribute("javax.servlet.request.X509Certificate");
            if(validCert(certs))
            {

--- a/core/src/test/java/org/alfresco/util/transaction/SpringAwareUserTransactionTest.java
+++ b/core/src/test/java/org/alfresco/util/transaction/SpringAwareUserTransactionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2023 Alfresco Software Limited.
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
 *
 * This file is part of Alfresco
 *
@@ -21,9 +21,9 @@ package org.alfresco.util.transaction;
 import java.util.NoSuchElementException;
 import java.util.Objects;

-import jakarta.transaction.RollbackException;
-import jakarta.transaction.Status;
-import jakarta.transaction.UserTransaction;
+import javax.transaction.RollbackException;
+import javax.transaction.Status;
+import javax.transaction.UserTransaction;

 import junit.framework.TestCase;

--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.1.13-SNAPSHOT</version>
+        <version>21.25-SNAPSHOT</version>
    </parent>

    <properties>
@@ -90,8 +90,9 @@
            | see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Scope
            -->
        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
        </dependency>

        <!-- Jakarta... -->
@@ -99,6 +100,7 @@
            <groupId>jakarta.activation</groupId>
            <artifactId>jakarta.activation-api</artifactId>
        </dependency>
+        <!-- REPO-5047 - Replaces com.sun.activation:javax.activation -->
        <dependency>
            <groupId>com.sun.activation</groupId>
            <artifactId>jakarta.activation</artifactId>
@@ -117,7 +119,7 @@
        <dependency>
            <groupId>org.jibx</groupId>
            <artifactId>jibx-run</artifactId>
-            <version>1.4.2</version>
+            <version>1.3.3</version>
        </dependency>
        <dependency> 
            <groupId>com.fasterxml.jackson.core</groupId> 
@@ -132,7 +134,7 @@
        <dependency>
            <groupId>com.fasterxml.woodstox</groupId>
            <artifactId>woodstox-core</artifactId>
-            <version>6.5.1</version>
+            <version>6.4.0</version>
        </dependency>

        <!-- the cxf libs were updated, see dependencyManagement section -->
@@ -140,11 +142,53 @@
            <groupId>org.apache.chemistry.opencmis</groupId>
            <artifactId>chemistry-opencmis-commons-impl</artifactId>
            <version>${dependency.opencmis.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.sun.xml.messaging.saaj</groupId>
+                    <artifactId>saaj-impl</artifactId>
+                </exclusion>
+                <!-- Duplicates classes from com.fasterxml.woodstox:woodstox-core -->
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>woodstox-core-asl</artifactId>
+                </exclusion>
+                <!-- [ACS-544] Excluded as conflicts with JDK9+ as it includes javax.transaction -->
+                <exclusion>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jta_1.1_spec</artifactId>
+                </exclusion>
+             </exclusions>
        </dependency>
        <dependency>
            <groupId>org.apache.chemistry.opencmis</groupId>
            <artifactId>chemistry-opencmis-server-bindings</artifactId>
            <version>${dependency.opencmis.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-lang</groupId>
+                    <artifactId>commons-lang3</artifactId>
+                </exclusion>
+                <!-- Duplicates classes from jakarta.jws:jakarta.jws-api -->
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+                </exclusion>
+                <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jta_1.1_spec</artifactId>
+                </exclusion>
+                <!-- Duplicates classes from jakarta.annotation:jakarta.annotation-api -->
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
+                <!-- Duplicates classes from com.sun.activation:jakarta.activation -->
+                <exclusion>
+                    <groupId>com.sun.activation</groupId>
+                    <artifactId>javax.activation</artifactId>
+                </exclusion>
+            </exclusions>
        </dependency>
        <!-- This is now deployed at:
            | http://artifacts.alfresco.com/nexus/content/repositories/thirdparty/org/acegisecurity/acegi-security/0.8.2_patched/
@@ -197,10 +241,6 @@
                    <groupId>org.bouncycastle</groupId>
                    <artifactId>bcprov-jdk15on</artifactId>
                </exclusion>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcmail-jdk15on</artifactId>
-                </exclusion>
                <exclusion>
                    <groupId>asm</groupId>
                    <artifactId>asm</artifactId>
@@ -224,10 +264,7 @@
                </exclusion>
            </exclusions>
        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcmail-jdk15to18</artifactId>
-        </dependency>
+
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
--- a/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneConjunction.java
+++ b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneConjunction.java
@@ -58,9 +58,10 @@ public class LuceneConjunction<Q, S, E extends Throwable> extends BaseConjunctio
    public Q addComponent(Set<String> selectors, Map<String, Argument> functionArgs, QueryBuilderContext<Q, S, E> luceneContext, FunctionEvaluationContext functionContext)
            throws E
    {
+       
        QueryParserExpressionAdaptor<Q, E> expressionAdaptor = luceneContext.getLuceneQueryParserAdaptor().getExpressionAdaptor();
        boolean must = false;
-        boolean mustNot = false;
+        boolean must_not = false;
        for (Constraint constraint : getConstraints())
        {
            if (constraint instanceof LuceneQueryBuilderComponent)
@@ -83,20 +84,23 @@ public class LuceneConjunction<Q, S, E extends Throwable> extends BaseConjunctio
                        break;
                    case EXCLUDE:
                        expressionAdaptor.addExcluded(constraintQuery, constraint.getBoost());
-                        mustNot = true;
+                        must_not = true;
                        break;
                    }
+                    
                }
            }
            else
            {
                throw new UnsupportedOperationException();
            }
-        }
-        if(!must && mustNot)
-        {
-            expressionAdaptor.addRequired(luceneContext.getLuceneQueryParserAdaptor().getMatchAllNodesQuery());
+            if(!must &&  must_not)
+            {
+                expressionAdaptor.addRequired(luceneContext.getLuceneQueryParserAdaptor().getMatchAllNodesQuery());
+            }
        }
        return expressionAdaptor.getQuery();
+
    }
+
 }
--- a/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQuery.java
+++ b/data-model/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQuery.java
@@ -40,10 +40,12 @@ import org.alfresco.repo.search.impl.querymodel.PropertyArgument;
 import org.alfresco.repo.search.impl.querymodel.Selector;
 import org.alfresco.repo.search.impl.querymodel.Source;
 import org.alfresco.repo.search.impl.querymodel.impl.BaseQuery;
+import org.alfresco.repo.search.impl.querymodel.impl.SimpleConstraint;
 import org.alfresco.repo.search.impl.querymodel.impl.functions.PropertyAccessor;
 import org.alfresco.repo.search.impl.querymodel.impl.functions.Score;
 import org.alfresco.service.cmr.search.SearchParameters.SortDefinition;
 import org.alfresco.service.cmr.search.SearchParameters.SortDefinition.SortType;
+import org.alfresco.util.Pair;

 /**
 * @author andyh
@@ -70,8 +72,10 @@ public class LuceneQuery<Q, S, E extends Throwable> extends BaseQuery implements
        QueryParserExpressionAdaptor<Q, E> expressionBuilder = luceneContext.getLuceneQueryParserAdaptor().getExpressionAdaptor();

        boolean must = false;
-        boolean mustNot = false;
+        boolean must_not = false;

+        ArrayList<Pair<Constraint, Q>> queriestoConjoin = new ArrayList<>();
+        
        if (selectors != null)
        {
            for (String selector : selectors)
@@ -82,6 +86,7 @@ public class LuceneQuery<Q, S, E extends Throwable> extends BaseQuery implements
                    @SuppressWarnings("unchecked")
                    LuceneQueryBuilderComponent<Q, S, E> luceneQueryBuilderComponent = (LuceneQueryBuilderComponent<Q, S, E>) current;
                    Q selectorQuery = luceneQueryBuilderComponent.addComponent(selectors, null, luceneContext, functionContext);
+                    queriestoConjoin.add(new Pair<Constraint, Q>(new SimpleConstraint(org.alfresco.repo.search.impl.querymodel.Constraint.Occur.MANDATORY), selectorQuery));
                    if (selectorQuery != null)
                    {
                        expressionBuilder.addRequired(selectorQuery);
@@ -103,7 +108,8 @@ public class LuceneQuery<Q, S, E extends Throwable> extends BaseQuery implements
                @SuppressWarnings("unchecked")
                LuceneQueryBuilderComponent<Q, S, E> luceneQueryBuilderComponent = (LuceneQueryBuilderComponent<Q, S, E>) constraint;
                Q constraintQuery = luceneQueryBuilderComponent.addComponent(selectors, null, luceneContext, functionContext);
-
+                queriestoConjoin.add(new Pair<Constraint, Q>(constraint, constraintQuery));
+                
                if (constraintQuery != null)
                {
                    switch (constraint.getOccur())
@@ -118,7 +124,7 @@ public class LuceneQuery<Q, S, E extends Throwable> extends BaseQuery implements
                        break;
                    case EXCLUDE:
                        expressionBuilder.addExcluded(constraintQuery, constraint.getBoost());
-                        mustNot = true;
+                        must_not = true;
                        break;
                    }
                }
@@ -129,12 +135,13 @@ public class LuceneQuery<Q, S, E extends Throwable> extends BaseQuery implements
            }
        }

-        if (!must && mustNot)
+        if (!must && must_not)
        {
            expressionBuilder.addRequired(luceneContext.getLuceneQueryParserAdaptor().getMatchAllNodesQuery());
        }

        return expressionBuilder.getQuery();
+
    }

    /*
@@ -158,10 +165,10 @@ public class LuceneQuery<Q, S, E extends Throwable> extends BaseQuery implements
    {
        if ((getOrderings() == null) || (getOrderings().size() == 0))
        {
-            return Collections.emptyList();
+            return Collections.<SortDefinition>emptyList();
        }

-        List<SortDefinition> definitions = new ArrayList<>(getOrderings().size());
+        ArrayList<SortDefinition> definitions = new ArrayList<SortDefinition>(getOrderings().size());

        for (Ordering ordering : getOrderings())
        {
--- a/data-model/src/main/java/org/alfresco/service/cmr/repository/DirectAccessUrl.java
+++ b/data-model/src/main/java/org/alfresco/service/cmr/repository/DirectAccessUrl.java
@@ -39,7 +39,6 @@ public class DirectAccessUrl implements Serializable
    private String contentUrl;
    private Date expiryTime;
    private boolean attachment;
-    private String fileName;

    public String getContentUrl()
    {
@@ -71,28 +70,18 @@ public class DirectAccessUrl implements Serializable
        this.attachment = attachment;
    }

-    public String getFileName()
-    {
-        return fileName;
-    }
-
-    public void setFileName(String fileName)
-    {
-        this.fileName = fileName;
-    }
-
    @Override public boolean equals(Object obj)
    {
        if (this == obj) return true;
        if (obj == null || getClass() != obj.getClass()) return false;

        DirectAccessUrl that = (DirectAccessUrl) obj;
-        return Objects.equals(fileName, that.fileName) && attachment == that.attachment && Objects.equals(contentUrl,
+        return attachment == that.attachment && Objects.equals(contentUrl,
                that.contentUrl) && Objects.equals(expiryTime, that.expiryTime);
    }

    @Override public int hashCode()
    {
-        return Objects.hash(contentUrl, expiryTime, attachment, fileName);
+        return Objects.hash(contentUrl, expiryTime, attachment);
    }
 }
--- a/data-model/src/main/java/org/alfresco/util/WebApplicationContextLoader.java
+++ b/data-model/src/main/java/org/alfresco/util/WebApplicationContextLoader.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Data model classes
 * %%
- * Copyright (C) 2005 - 2023 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 
@@ -27,7 +27,7 @@ package org.alfresco.util;

 import java.io.IOException;

-import jakarta.servlet.ServletContext;
+import javax.servlet.ServletContext;

 import org.apache.chemistry.opencmis.commons.server.CmisServiceFactory;
 import org.apache.chemistry.opencmis.server.impl.CmisRepositoryContextListener;
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.1.13-SNAPSHOT</version>
+        <version>21.25-SNAPSHOT</version>
    </parent>

    <dependencies>
@@ -20,16 +20,6 @@
            <groupId>de.schlichtherle.truezip</groupId>
            <artifactId>truezip-driver-zip</artifactId>
            <version>${dependency.truezip.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15to18</artifactId>
        </dependency>
        <dependency>
            <groupId>de.schlichtherle.truezip</groupId>
@@ -41,11 +31,6 @@
            <artifactId>maven-artifact</artifactId>
            <version>${dependency.maven-artifact.version}</version>
        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
        <dependency>
            <groupId>org.mockito</groupId>
            <artifactId>mockito-core</artifactId>
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.1.13-SNAPSHOT</version>
+        <version>21.25-SNAPSHOT</version>
    </parent>
 </project>
--- a/packaging/distribution/src/main/resources/licenses/notice.txt
+++ b/packaging/distribution/src/main/resources/licenses/notice.txt
@@ -208,6 +208,10 @@ Hibernate   http://www.hibernate.org/
 jid3lib http://javamusictag.sourceforge.net/
 TinyMCE http://www.tinymce.com/

+                
+=== LGPL 3.0 ===
+Gytheio https://github.com/Alfresco/gytheio
+

 === MIT License ===
 Bouncy Castle   http://www.bouncycastle.org/ 
--- a/packaging/docker-alfresco/Dockerfile
+++ b/packaging/docker-alfresco/Dockerfile
@@ -1,6 +1,8 @@
+ARG JRE_VERSION=17
+
 # Fetch image based on Tomcat 9.0, Java 17 and Rocky Linux 8
 # More infos about this image: https://github.com/Alfresco/alfresco-docker-base-tomcat
-FROM alfresco/alfresco-base-tomcat:tomcat10-jre17-rockylinux8-202306291245
+FROM alfresco/alfresco-base-tomcat:tomcat9-jre${JRE_VERSION}-rockylinux8-202303081618

 # Set default docker_context.
 ARG resource_path=target
@@ -98,4 +100,4 @@ EXPOSE 10001
 # For remote debug
 EXPOSE 8000

-USER ${IMAGEUSERNAME}
+USER ${IMAGEUSERNAME}
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.1.13-SNAPSHOT</version>
+        <version>21.25-SNAPSHOT</version>
    </parent>

    <properties>
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
-        <version>23.1.1.13-SNAPSHOT</version>
+        <version>21.25-SNAPSHOT</version>
    </parent>

    <modules>
--- a/packaging/tests/environment/.env
+++ b/packaging/tests/environment/.env
@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.11
-POSTGRES_TAG=15.4
-ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
+SOLR6_TAG=2.0.7-A5
+POSTGRES_TAG=14.4
+ACTIVEMQ_TAG=5.17.6-jre17-rockylinux8
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.1.13-SNAPSHOT</version>
+        <version>21.25-SNAPSHOT</version>
    </parent>

    <modules>
--- a/packaging/tests/scripts/start-compose.sh
+++ b/packaging/tests/scripts/start-compose.sh
@@ -27,8 +27,8 @@ fi
 # The second parameter can be used to avoid doing a clean up if we are doing a restart test.
 if [ "$CLEAN_UP" != "no-clean-up" ]
 then
-  docker compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") kill
-  docker compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") rm -f
+  docker-compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") kill
+  docker-compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") rm -f

  export GENERATED_IMAGES=$(docker images | grep '^environment_' | awk '{ print $3 }')
  if [ -n "$GENERATED_IMAGES" ]
@@ -43,7 +43,7 @@ export TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-tra
 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 ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d
+docker-compose ${DOCKER_COMPOSES} --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d

 if [ $? -eq 0 ]
 then
--- a/packaging/tests/scripts/stop-compose.sh
+++ b/packaging/tests/scripts/stop-compose.sh
@@ -10,8 +10,8 @@ fi

 echo "Killing ACS stack in ${DOCKER_COMPOSE_PATH}"

-docker compose --file ${DOCKER_COMPOSE_PATH} ps
+docker-compose --file ${DOCKER_COMPOSE_PATH} ps
 # logs for debug
-docker compose --file ${DOCKER_COMPOSE_PATH} logs --no-color -t alfresco
-docker compose --file ${DOCKER_COMPOSE_PATH} kill
-docker compose --file ${DOCKER_COMPOSE_PATH} rm -fv
+docker-compose --file ${DOCKER_COMPOSE_PATH} logs --no-color -t alfresco
+docker-compose --file ${DOCKER_COMPOSE_PATH} kill
+docker-compose --file ${DOCKER_COMPOSE_PATH} rm -fv
--- a/packaging/tests/scripts/wait-for-alfresco-start.sh
+++ b/packaging/tests/scripts/wait-for-alfresco-start.sh
@@ -37,7 +37,7 @@ else
   echo "Alfresco Could not start in time."
   echo "All started containers:"	
   docker ps -a	
-   ALFCONTAINER=`docker ps -a | grep '\-alfresco' | awk '{ print $1 }'`
+   ALFCONTAINER=`docker ps -a | grep _alfresco | awk '{ print $1 }'`
   echo "Last 200 lines from alfresco.log on container $ALFCONTAINER:"
   docker logs --tail=200 $ALFCONTAINER
   exit 1
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.1.13-SNAPSHOT</version>
+        <version>21.25-SNAPSHOT</version>
    </parent>

    <organization>
@@ -16,11 +16,12 @@
    </organization>

    <properties>
-        <maven.build.sourceVersion>17</maven.build.sourceVersion>
+        <maven.build.sourceVersion>11</maven.build.sourceVersion>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <chemistry-opencmis-commons-api>1.1.0</chemistry-opencmis-commons-api>
        <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
        <maven-release.version>2.5.3</maven-release.version>
-        <java.version>17</java.version>
+        <java.version>11</java.version>
        <suiteXmlFile>${project.basedir}/src/test/resources/cmis-suite.xml</suiteXmlFile>
        <cmis.binding />
        <cmis.basePath />
@@ -57,6 +58,12 @@
    </profiles>

    <dependencies>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jackson2-provider</artifactId>
+            <version>4.7.1.Final</version>
+        </dependency>
+
        <!-- alfresco tester settings -->
        <dependency>
            <groupId>org.alfresco.tas</groupId>
@@ -68,6 +75,13 @@
                </exclusion>
            </exclusions>
        </dependency>
+
+        <!-- open cmis settings -->
+        <dependency>
+            <groupId>org.apache.chemistry.opencmis</groupId>
+            <artifactId>chemistry-opencmis-commons-api</artifactId>
+            <version>${chemistry-opencmis-commons-api}</version>
+        </dependency>
    </dependencies>

    <build>
--- a/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/CmisUtil.java
+++ b/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/dsl/CmisUtil.java
@@ -280,26 +280,16 @@ public class CmisUtil

    protected boolean isPrivateWorkingCopy()
    {
-        final Document document;
+        boolean result;
        try
        {
-            document = getPWCDocument();
+            result = getPWCDocument().isVersionSeriesPrivateWorkingCopy();
        }
        catch (CmisVersioningException cmisVersioningException)
        {
-            return false;
+            result = false;
        }
-
-        if (Boolean.FALSE.equals(document.isVersionable())) return false;
-        if (Boolean.FALSE.equals(document.isVersionSeriesCheckedOut())) return false;
-
-        final Boolean isPWC = document.isPrivateWorkingCopy();
-        if (isPWC != null) return isPWC;
-
-        final String vsCoId = document.getVersionSeriesCheckedOutId();
-        if (vsCoId == null) return false;
-
-        return vsCoId.equals(document.getId());
+        return result;
    }

    /**
--- a/packaging/tests/tas-email/pom.xml
+++ b/packaging/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.1.13-SNAPSHOT</version>
+        <version>21.25-SNAPSHOT</version>
    </parent>

    <developers>
@@ -31,11 +31,6 @@
            <artifactId>email</artifactId>
            <scope>test</scope>
        </dependency>
-        <dependency>
-            <groupId>jakarta.mail</groupId>
-            <artifactId>jakarta.mail-api</artifactId>
-            <scope>test</scope>
-        </dependency>
    </dependencies>

    <build>
--- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCheckFolderTests.java
+++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCheckFolderTests.java
@@ -11,8 +11,8 @@ import org.alfresco.utility.testrail.annotation.TestRail;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;

-import jakarta.mail.FolderNotFoundException;
-import jakarta.mail.MessagingException;
+import javax.mail.FolderNotFoundException;
+import javax.mail.MessagingException;

 public class ImapCheckFolderTests extends EmailTest
 {
--- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyFolderTests.java
+++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyFolderTests.java
@@ -10,8 +10,8 @@ import org.alfresco.utility.testrail.annotation.TestRail;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;

-import jakarta.mail.FolderNotFoundException;
-import jakarta.mail.MessagingException;
+import javax.mail.FolderNotFoundException;
+import javax.mail.MessagingException;

 public class ImapCopyFolderTests extends EmailTest
 {
--- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyMessagesTests.java
+++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCopyMessagesTests.java
@@ -1,6 +1,6 @@
 package org.alfresco.email.imap;

-import jakarta.mail.MessagingException;
+import javax.mail.MessagingException;

 import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.email.EmailTest;
--- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCreateFolderTests.java
+++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapCreateFolderTests.java
@@ -12,7 +12,7 @@ import org.alfresco.utility.testrail.annotation.TestRail;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;

-import jakarta.mail.FolderNotFoundException;
+import javax.mail.FolderNotFoundException;

 /**
 * Tests for Create Folder action using IMAP client
--- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteFolderTests.java
+++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteFolderTests.java
@@ -10,7 +10,7 @@ import org.alfresco.utility.testrail.annotation.TestRail;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;

-import jakarta.mail.FolderNotFoundException;
+import javax.mail.FolderNotFoundException;

 public class ImapDeleteFolderTests extends EmailTest
 {
--- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteMessagesTests.java
+++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapDeleteMessagesTests.java
@@ -9,7 +9,7 @@ import org.alfresco.utility.testrail.annotation.TestRail;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;

-import jakarta.mail.MessagingException;
+import javax.mail.MessagingException;

 public class ImapDeleteMessagesTests extends EmailTest
 {
--- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMessageFlagsTests.java
+++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMessageFlagsTests.java
@@ -8,7 +8,7 @@ import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
 import org.testng.annotations.Test;

-import jakarta.mail.Flags;
+import javax.mail.Flags;

 public class ImapMessageFlagsTests extends EmailTest
 {
--- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMoveFolderTests.java
+++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapMoveFolderTests.java
@@ -1,6 +1,6 @@
 package org.alfresco.email.imap;

-import jakarta.mail.FolderNotFoundException;
+import javax.mail.FolderNotFoundException;

 import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.email.EmailTest;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tom Page	31b7add3b8	Add precommit for secret scanning, formatting and license header checking. * Add precommit for secret scanning, formatting and license header checking. * Turn off bash debug logging. * Skip precommit checks that apply to all files. There are too many violations to run against all files. (cherry picked from commit `b00e11cb6f`)	2024-10-07 14:32:26 +01:00
alfresco-build	e0d9884ba7	[maven-release-plugin][skip ci] prepare for next development iteration	2024-03-26 15:38:34 +00:00
alfresco-build	2e4b0fddba	[maven-release-plugin][skip ci] prepare release 21.24	2024-03-26 15:38:31 +00:00
Kacper Magdziarz	d793380c41	[ACS-7324] Propagate ATS and AIS to 7.4.1 (#2544 )	2024-03-26 15:41:09 +01:00
alfresco-build	bd43c753c5	[maven-release-plugin][skip ci] prepare for next development iteration	2024-02-27 22:27:23 +00:00
alfresco-build	004c2105ed	[maven-release-plugin][skip ci] prepare release 21.23	2024-02-27 22:27:19 +00:00
Tiago Salvado	9cf4c801da	[MNT-24072] Retain users/groups (who are already exist and are part of AUTH.ALF zone) so parent associations can be created (#2414 ) (#2477 ) * [MNT-24072] Retain existent users and groups so parent associations can be created * [MNT-24072] Using person/authority 'exists' methods instead * [MNT-24072] Added code to rezone users/groups (who already exist and are part of AUTH.ALF zone) that have parent associations to create * [MNT-24072] PMD scan changes * [MNT-24072] Added a validation to prevent an authority from being added to zones where already is (cherry picked from commit `71b69529c6`)	2024-02-27 20:55:20 +00:00
alfresco-build	98d11e580e	[maven-release-plugin][skip ci] prepare for next development iteration	2024-02-07 15:19:56 +00:00
alfresco-build	2b07306bf3	[maven-release-plugin][skip ci] prepare release 21.22	2024-02-07 15:19:53 +00:00
Eva Vasques	8ff519ddaa	MNT-24094 - error message logged in the logs when a webscript fails is not helpful as it should indicate what webscript triggers the error (#2421 ) (#2437 ) * Add WebScriptRequest to the methods that call the render exception so we can log more info on the request when an error occurs. * Add request uri, user ans status code to the logging * Always log on exception but only show stack trace on debug or on internal server exception (cherry picked from commit `dbd7ce1f48`)	2024-02-07 14:43:24 +00:00
alfresco-build	5e0ca063d3	[maven-release-plugin][skip ci] prepare for next development iteration	2024-02-06 18:33:34 +00:00
alfresco-build	82ac034cab	[maven-release-plugin][skip ci] prepare release 21.21	2024-02-06 18:33:32 +00:00
Eva Vasques	0c9d9e469d	Update AGS license headers (#2435 ) * Update AGS license headers 2024	2024-02-06 17:58:08 +00:00
alfresco-build	4e1a507103	[maven-release-plugin][skip ci] prepare for next development iteration	2023-11-16 15:13:11 +00:00
alfresco-build	15be292f16	[maven-release-plugin][skip ci] prepare release 21.20	2023-11-16 15:13:09 +00:00
Domenico Sibilio	d23720eb9c	ACS-6192 Bump org.json:json to 20231013 (#2314 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-11-16 15:38:53 +01:00
alfresco-build	b29bc8a124	[maven-release-plugin][skip ci] prepare for next development iteration	2023-11-16 12:03:43 +00:00
alfresco-build	ef36697a73	[maven-release-plugin][skip ci] prepare release 21.19	2023-11-16 12:03:40 +00:00
Domenico Sibilio	09e0433de9	MNT-24063 Bump ActiveMQ to 5.17.6 (#2306 )	2023-11-16 11:36:15 +01:00
alfresco-build	7395f9505e	[maven-release-plugin][skip ci] prepare for next development iteration	2023-10-16 07:47:59 +00:00
alfresco-build	4acb390386	[maven-release-plugin][skip ci] prepare release 21.18	2023-10-16 07:47:57 +00:00
pzurek	9240aee588	ACS-6121 MNT-24007 Use issuer URI from the IdP - Java 11 Compatibility	2023-10-16 09:01:42 +02:00
Piotr Żurek	0ebe7b2910	ACS-6121 MNT-24007 Use issuer URI from the IdP (#2250 ) (cherry picked from commit `582fc8ec2d`)	2023-10-16 08:50:54 +02:00
alfresco-build	cd2b9b183d	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-12 11:51:03 +00:00
alfresco-build	525a9dea0b	[maven-release-plugin][skip ci] prepare release 21.17	2023-09-12 11:50:59 +00:00
MohinishSah	987895e4f0	Update AOS and Google drive version for 7.4.1	2023-09-12 16:35:49 +05:30
alfresco-build	1e9d005f7f	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-07 17:15:44 +00:00
alfresco-build	ce518bdb76	[maven-release-plugin][skip ci] prepare release 21.16	2023-09-07 17:15:41 +00:00
Piotr Żurek	588b421f34	MNT-23950 Use Java11 compatible gdrive and aos (#2186 )	2023-09-07 18:29:44 +02:00
Piotr Żurek	2a38bd0c7d	MNT-23950 Cleanup after review (#2185 )	2023-09-07 16:08:51 +02:00
Piotr Żurek	95e88cb8ed	MNT-23950 make sure java11 compatibility is preserved (#2184 )	2023-09-07 15:15:55 +02:00
alfresco-build	e9d90d94f2	[maven-release-plugin][skip ci] prepare for next development iteration	2023-09-05 11:49:32 +00:00
alfresco-build	5799c0943c	[maven-release-plugin][skip ci] prepare release 21.15	2023-09-05 11:49:29 +00:00
Piotr Żurek	9defe1c2ed	MNT-23950 Use Java11 compatible webscripts (#2179 )	2023-09-05 12:58:54 +02:00
mpichura	10f2894503	Create HotFix branch for 7.4.1	2023-08-09 13:19:04 +02:00
alfresco-build	604369fd2a	[maven-release-plugin][skip ci] prepare release 21.14	2023-08-07 22:05:37 +00:00
mstrankowski	647e17e4a0	[skip tests] bring back old properties and skip tests	2023-08-08 00:02:09 +02:00
alfresco-build	397d6fdaee	[maven-release-plugin][skip ci] prepare for next development iteration	2023-08-07 18:37:25 +00:00
alfresco-build	35052404fe	[maven-release-plugin][skip ci] prepare release 21.13	2023-08-07 18:37:22 +00:00
Marcin Strankowski	6ba66513f2	There was no override of properties related to HttpClientConfig, whic… (#2120 ) * There was no override of properties related to HttpClientConfig, which meant that if a property wasn't present in global-properties files, it wouldn't be registered and couldn't be provided through command line. I've amended that here	2023-08-07 19:43:38 +02:00
alfresco-build	e5886e2104	[maven-release-plugin][skip ci] prepare for next development iteration	2023-08-07 11:14:18 +00:00
alfresco-build	5ad1d9752c	[maven-release-plugin][skip ci] prepare release 21.12	2023-08-07 11:14:15 +00:00
Marcin Strankowski	67deb82f06	MNT-23878: By default there was no timeout set for HttpClients, we've… (#2118 ) * MNT-23878: By default there was no timeout set for HttpClients, we've wrongly directed ourselfes with the values of currently existing mTLS (Solr/Elasticsearch) for Transform that used default http clients with infinite timeouts	2023-08-07 09:49:10 +02:00
alfresco-build	a067b1dba5	[maven-release-plugin][skip ci] prepare for next development iteration	2023-08-01 10:29:03 +00:00
alfresco-build	55f9c9d46d	[maven-release-plugin][skip ci] prepare release 21.11	2023-08-01 10:28:59 +00:00
Maciej Pichura	f070ed46a7	ACS-5698: Update api-explorer version	2023-08-01 11:41:58 +02:00
alfresco-build	c9636c84a2	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-28 15:03:25 +00:00
alfresco-build	4e764a3106	[maven-release-plugin][skip ci] prepare release 21.10	2023-07-28 15:03:22 +00:00
Tom Page	bbb668b446	[force 7.4.1-A2] ACS-5696 Release 7.4.1-A2.	2023-07-28 15:56:59 +01:00
alfresco-build	c9b9a9b239	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-28 12:55:37 +00:00
alfresco-build	01fb7f45a3	[maven-release-plugin][skip ci] prepare release 21.9	2023-07-28 12:55:33 +00:00
Tom Page	41c4b34d8d	ACS-5698 Allow specifying version when performing force release. (#2089 ) (cherry picked from commit `0b6b405c5f`)	2023-07-26 15:53:01 +01:00
alfresco-build	36bf081b59	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-26 13:16:58 +00:00
alfresco-build	2a5892de78	[maven-release-plugin][skip ci] prepare release 21.8	2023-07-26 13:16:55 +00:00
Tom Page	d302606318	Merge pull request #2085 from Alfresco/feature/MNT-23763_ImagePreviewWebscript (#2088 ) MNT-23763 Fix image preview webscript for use with ES. (cherry picked from commit `fcf3e005e4`)	2023-07-26 13:27:21 +01:00
alfresco-build	7ebad61406	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-07 16:23:49 +00:00
alfresco-build	587087389e	[maven-release-plugin][skip ci] prepare release 21.7	2023-07-07 16:23:47 +00:00
evasques	57c3605d63	ACS-5487 - Track Total Hits on ES (#2041 ) (#2049 ) SearchParameters - added trackTotalHits (int) attribute SearchRequest - Added trackTotalHitsLimit (int) to the Limits attribute and mapped it to the SearchParameters Changed the SearchRequest model in TAS to include a new RestRequestLimitsModel that has the new trackTotalHitsLimit attribute SearchMapperTests to test the changes in the SearchParameters (cherry picked from commit `a1faf97fc5`)	2023-07-07 16:38:05 +01:00
alfresco-build	2cb318a18e	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-03 14:11:08 +00:00
alfresco-build	bd7af1f39c	[maven-release-plugin][skip ci] prepare release 21.6	2023-07-03 14:10:59 +00:00
tiagosalvado10	7885c6a78b	MNT-23451 filterQuery for facet Null (#1764 ) (#2033 ) After MNT-23276, a "Null" value was introduced but the facetQuery does not reflect how to query nodes with that facet (cherry picked from commit `d46ae1634f`) Co-authored-by: Nicolas Barithel <nicolas.barithel@hyland.com>	2023-07-03 14:22:43 +01:00
alfresco-build	d42e9ef993	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-29 15:54:37 +00:00
alfresco-build	197590eef4	[maven-release-plugin][skip ci] prepare release 21.5	2023-06-29 15:54:33 +00:00
tiagosalvado10	102f59cde1	[MNT-23748] Bump surf webscripts (#2026 ) * [MNT-23748] Bump surf-webscripts to 8.44 (#2023) (cherry picked from commit `51fe0275df`)	2023-06-29 14:26:27 +01:00
alfresco-build	529699b5e1	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-28 23:54:50 +00:00
alfresco-build	96456ec719	[maven-release-plugin][skip ci] prepare release 21.4	2023-06-28 23:54:47 +00:00
tiagosalvado10	71bbb579e6	[MNT-23642] Add error messages (#2019 ) (#2024 ) (cherry picked from commit `689e6a23fa`)	2023-06-29 00:08:56 +01:00
alfresco-build	51dcf28756	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-21 10:25:52 +00:00
alfresco-build	1639a17451	[maven-release-plugin][skip ci] prepare release 21.3	2023-06-21 10:25:49 +00:00
rrajoria	585e6042cb	Fix/MNT-23612 Fix to allow only valid task status. (#1954 ) * Update WorkflowServiceImpl.java * Update WorkflowServiceImpl.java (cherry picked from commit `4c256ab546`)	2023-06-21 14:16:59 +05:30
alfresco-build	8364211384	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-20 07:05:59 +00:00
alfresco-build	f68d304d57	[maven-release-plugin][skip ci] prepare release 21.2	2023-06-20 07:05:55 +00:00
rrajoria	b55e1114e6	MNT-23724: Fix for Downloading a folder as zip with correct Name Cherrypicked from master	2023-06-20 11:14:17 +05:30
alfresco-build	0e23ba37c6	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-30 23:52:54 +00:00
alfresco-build	38a4d378d9	[maven-release-plugin][skip ci] prepare release 21.1	2023-05-30 23:52:51 +00:00
tiagosalvado10	65a562cd73	[MNT-23665] Removed search controls count limit (#1936 ) (#1968 ) (cherry picked from commit `07c7342032`)	2023-05-30 21:42:47 +01:00
kmagdziarz	8eab098317	Create ServicePack branch release/7.4.N	2023-05-05 12:39:50 +02:00