Addressed review comments

2025-09-10 14:11:58 +00:00 · 2023-03-01 11:21:24 +05:30 · 2023-02-28 20:07:34 +05:30 · 2023-02-28 17:16:54 +05:30 · 2023-02-27 20:51:22 +05:30 · 2023-02-27 20:00:29 +05:30
675 changed files with 15455 additions and 20498 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,110 @@ updates:
    - "> 1.0.0"
  - dependency-name: org.freemarker:freemarker
    versions:
-    - "> 2.3.31-alfresco-patched"
+    - "> 2.3.20-alfresco-patched-20200421"
+  - dependency-name: org.keycloak:keycloak-adapter-core
+    versions:
+    - "> 12.0.2"
+  - dependency-name: org.keycloak:keycloak-adapter-spi
+    versions:
+    - "> 12.0.2"
+  - dependency-name: org.keycloak:keycloak-authz-client
+    versions:
+    - "> 12.0.2"
+  - dependency-name: org.keycloak:keycloak-common
+    versions:
+    - "> 12.0.2"
+  - dependency-name: org.keycloak:keycloak-core
+    versions:
+    - "> 12.0.2"
+  - dependency-name: org.keycloak:keycloak-servlet-adapter-spi
+    versions:
+    - "> 12.0.2"
+  - 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
@@ -23,7 +23,6 @@ env:
  MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
  QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
  QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
-  CI_WORKSPACE: ${{ github.workspace }}
  TAS_ENVIRONMENT: ./packaging/tests/environment
  TAS_SCRIPTS: ../alfresco-community-repo/packaging/tests/scripts

@@ -33,14 +32,11 @@ jobs:
    runs-on: ubuntu-latest
    if: >
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
+      - 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: "Prepare maven cache and check compilation"
@@ -55,74 +51,38 @@ jobs:
    if: >
      ((github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) && github.event_name != 'pull_request') &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
+      - 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@v1.35.2
+      - 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"
+        
+  all_unit_tests_suite:
+    name: "Core, Data-Model, Repository - AllUnitTestsSuite - Build and test"
    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 repo]') &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
      !contains(github.event.head_commit.message, '[force]')
-    steps:
-      - uses: Alfresco/ya-pmd-scan@v2.0.5
-
-  core_datamodel_tests:
-    name: "Core, Data-Model - Build and test"
-    runs-on: ubuntu-latest
-    needs: [prepare]
-    if: >
-      !contains(github.event.head_commit.message, '[skip repo]') &&
-      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
+      - 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"
-        run: mvn -B test -pl core,data-model -am -DfailIfNoTests=false
-      - name: "Clean Maven cache"
-        run: bash ./scripts/ci/cleanup_cache.sh
-
-  all_unit_tests_suite:
-    name: "Repository - AllUnitTestsSuite - Build and test"
-    runs-on: ubuntu-latest
-    needs: [prepare]
-    if: >
-      !contains(github.event.head_commit.message, '[skip repo]') &&
-      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
-    steps:
-      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
-      - name: "Init"
-        run: bash ./scripts/ci/init.sh
-      - name: "Run tests"
-        run: mvn -B test -pl repository,mmt  -am -Dtest=AllUnitTestsSuite,AllMmtUnitTestSuite -DfailIfNoTests=false
+        run: |
+          mvn -B test -pl core,data-model -am -DfailIfNoTests=false
+          mvn -B test -pl "repository,mmt" -am "-Dtest=AllUnitTestsSuite,AllMmtUnitTestSuite" -DfailIfNoTests=false
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -133,7 +93,7 @@ jobs:
    if: >
      !contains(github.event.head_commit.message, '[skip repo]') &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    strategy:
      fail-fast: false
      matrix:
@@ -152,11 +112,8 @@ jobs:
      REQUIRES_INSTALLED_ARTIFACTS: true
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
+      - 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: |
@@ -181,18 +138,15 @@ jobs:
      !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')
+      !contains(github.event.head_commit.message, '[force]')
    strategy:
      fail-fast: false
      matrix:
-        version: ["10.2.18", "10.4", "10.5"]
+        version: ['10.2.18', '10.4', '10.5']
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
+      - 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
@@ -214,14 +168,11 @@ jobs:
      contains(github.event.head_commit.message, '[latest db]') ||
      contains(github.event.head_commit.message, '[db]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
+      - 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"
@@ -243,14 +194,11 @@ jobs:
      contains(github.event.head_commit.message, '[latest db]') ||
      contains(github.event.head_commit.message, '[db]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
+      - 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"
@@ -262,8 +210,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: >
@@ -271,55 +219,24 @@ jobs:
      !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')
+      !contains(github.event.head_commit.message, '[force]')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
+      - 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"
+      - 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@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
-      - 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: >
@@ -327,20 +244,17 @@ jobs:
      contains(github.event.head_commit.message, '[latest db]') ||
      contains(github.event.head_commit.message, '[db]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
+      - 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"
+      - 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"
@@ -353,14 +267,11 @@ jobs:
    if: >
      !contains(github.event.head_commit.message, '[skip repo]') &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
+      - 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"
@@ -377,7 +288,7 @@ jobs:
    if: >
      !contains(github.event.head_commit.message, '[skip repo]') &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    strategy:
      fail-fast: false
      matrix:
@@ -401,34 +312,15 @@ jobs:
            compose-profile: with-transform-core-aio
          - testSuite: SearchTestSuite
            compose-profile: default
-            mvn-options: "-Dindex.subsystem.name=solr6"
-          - testSuite: MTLSTestSuite
-            compose-profile: with-mtls-transform-core-aio
-            mtls: true
-            disabledHostnameVerification: false
-            mvn-options: "-Dencryption.ssl.keystore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.keystore -Dencryption.ssl.truststore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.truststore"
+            mvn-options: '-Dindex.subsystem.name=solr6'
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
+      - 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"
        run: echo "TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)" >> $GITHUB_ENV
-      - name: "Generate Keystores and Truststores for Mutual TLS configuration"
-        if: ${{ matrix.mtls }}
-        run: |
-          git clone -b "master" --depth=1 "https://${{ secrets.BOT_GITHUB_USERNAME }}:${{ secrets.BOT_GITHUB_TOKEN }}@github.com/Alfresco/alfresco-ssl-generator.git"
-          if ${{ matrix.disabledHostnameVerification }} ; then
-            bash ${{ env.CI_WORKSPACE }}/alfresco-ssl-generator/scripts/ci/generate_keystores_wrong_hostnames.sh
-            echo "HOSTNAME_VERIFICATION_DISABLED=true" >> "$GITHUB_ENV"
-          else
-            bash ${{ env.CI_WORKSPACE }}/alfresco-ssl-generator/scripts/ci/generate_keystores.sh
-            echo "HOSTNAME_VERIFICATION_DISABLED=false" >> "$GITHUB_ENV"
-          fi
      - name: "Set up the environment"
        run: |
          if [ -e ./scripts/ci/tests/${{ matrix.testSuite }}-setup.sh ]; then
@@ -449,7 +341,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tas]')) ||
      contains(github.event.head_commit.message, '[tas]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    strategy:
      fail-fast: false
      matrix:
@@ -482,11 +374,8 @@ jobs:
      REQUIRES_LOCAL_IMAGES: true
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
+      - 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: |
@@ -519,17 +408,14 @@ jobs:
    if: >
      !contains(github.event.head_commit.message, '[skip repo]') &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
+      - 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"
+      - 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
@@ -545,7 +431,7 @@ jobs:
      !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')
+      !contains(github.event.head_commit.message, '[force]')
    strategy:
      fail-fast: false
      matrix:
@@ -554,11 +440,8 @@ jobs:
      REQUIRES_INSTALLED_ARTIFACTS: true
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
+      - 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: |
@@ -579,7 +462,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip ags]')) ||
      contains(github.event.head_commit.message, '[ags on MySQL]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    strategy:
      fail-fast: false
      matrix:
@@ -588,11 +471,8 @@ jobs:
      REQUIRES_INSTALLED_ARTIFACTS: true
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
+      - 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: |
@@ -613,16 +493,13 @@ jobs:
      !contains(github.event.head_commit.message, '[skip ags]') && !contains(github.event.head_commit.message, '[skip tas]')) ||
      (contains(github.event.head_commit.message, '[ags]') && contains(github.event.head_commit.message, '[tas]'))) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    env:
      REQUIRES_LOCAL_IMAGES: true
    steps:
      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
+      - 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: |
@@ -653,30 +530,3 @@ jobs:
          aws s3 cp --acl private ./amps/ags/rm-automation/rm-automation-community-rest-api/target/reports/rm-automation-community-rest-api.log s3://ags-travis-artifacts/community/${{ github.run_number }}/AGS-Community-Rest-API-Tests/rm-automation-community-rest-api.log
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh
-
-  ags_start_api_explorer:
-    name: "Test Tomcat deployment of api explorer"
-    runs-on: ubuntu-latest
-    needs: [prepare]
-    if: >
-      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) &&
-      !contains(github.event.head_commit.message, '[skip ags]')) ||
-      contains(github.event.head_commit.message, '[ags]')) &&
-      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
-    steps:
-      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
-        with:
-          build-cache: "true"
-      - 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
@@ -34,12 +34,11 @@ jobs:
      - uses: actions/checkout@v3
        with:
          persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2      
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
+      - 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@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.33.0
        with:
          username: ${{ env.GIT_USERNAME }}
          email: ${{ env.GIT_EMAIL }}
@@ -63,12 +62,11 @@ jobs:
      - uses: actions/checkout@v3
        with:
          persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2      
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
+      - 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@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.33.0
        with:
          username: ${{ env.GIT_USERNAME }}
          email: ${{ env.GIT_EMAIL }}
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,12 +3,14 @@ Thanks for your interest in contributing to this project!

 The following is a set of guidelines for contributing to this library. Most of them will make the life of the reviewer easier and therefore decrease the time required for the patch be included in the next version.

-Because this project forms a part of Alfresco Content Services, the guidelines are hosted in the [Alfresco Social Community](https://hub.alfresco.com/t5/alfresco-content-services-ecm/ct-p/ECM-software) where they can be referenced from multiple projects.
+Because this project forms a part of Alfresco Content Services, the guidelines are hosted in the [Alfresco Social Community](http://community.alfresco.com/community/ecm) where they can be referenced from multiple projects.
+
+Read an [overview on how this project is goverened](https://community.alfresco.com/docs/DOC-6385-project-overview-repository).

 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/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.0.256-SNAPSHOT</version>
+      <version>20.90-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.0.256-SNAPSHOT</version>
+      <version>20.90-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.0.256-SNAPSHOT</version>
+      <version>20.90-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
@@ -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/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
@@ -64,9 +64,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 +83,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 +119,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,35 +135,35 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
     * <p>
     * <p/> TestRail Test C775<p/>
     **/
-    @Test(enabled = false) // temporary disabled, see ACS-6073
+    @Test
    @AlfrescoTest(jira = "RM-1622")
    public void dispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
        STEP("Create record category");
-        RecordCategory category1 = createRootCategory(CATEGORY_RM_3077);
+        Category1 = createRootCategory(categoryRM3077);

        //create retention schedule
-        dispositionScheduleService.createCategoryRetentionSchedule(category1.getName(), false);
+        dispositionScheduleService.createCategoryRetentionSchedule(Category1.getName(), false);

        // add cut off step
-        dispositionScheduleService.addCutOffAfterPeriodStep(category1.getName(), "day|2", CREATED_DATE);
+        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);
+        String CopyCategoryId = copyCategory(getAdminUser(),Category1.getId(), copyCategoryRM3077);

        // create folders in both categories
-        RecordCategoryChild catFolder = createRecordFolder(category1.getId(), FOLDER_RM_3077);
-        createRecordFolder(copyCategoryId, COPY_FOLDER_RM_3077);
+        CatFolder = createRecordFolder(Category1.getId(), folderRM3077);
+        CopyCatFolder = createRecordFolder(CopyCategoryId, copyFolderRM3077);

        // create record  files
        String electronicRecord = "RM-2801 electronic record";
-        Record elRecord = createElectronicRecord(catFolder.getId(), electronicRecord);
+        Record elRecord = createElectronicRecord(CatFolder.getId(), electronicRecord);
        String elRecordFullName = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), catFolder.getName(), electronicRecord);
+            getDataUser().usingAdmin().getAdminUser().getPassword(), CatFolder.getName(), electronicRecord);

        String nonElectronicRecord = "RM-2801 non-electronic record";
-        Record nonElRecord = createNonElectronicRecord(catFolder.getId(), nonElectronicRecord);
+        Record nonElRecord = createNonElectronicRecord(CatFolder.getId(), nonElectronicRecord);
        String nonElRecordFullName = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), catFolder.getName(), nonElectronicRecord);
+            getDataUser().usingAdmin().getAdminUser().getPassword(), CatFolder.getName(), nonElectronicRecord);

        // link the records to copy folder, then complete them
        List<String> recordLists = new ArrayList<>();
@@ -171,18 +171,18 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
        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);
+            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());
+            getAdminUser().getPassword(),editDispositionDateJson(),CatFolder.getName());

        // cut off the Folder
        recordFoldersAPI.postFolderAction(getAdminUser().getUsername(),
-            getAdminUser().getPassword(),new JSONObject().put("name","cutoff"), catFolder.getName());
+            getAdminUser().getPassword(),new JSONObject().put("name","cutoff"),CatFolder.getName());

        // Verify the Content
        Node electronicNode = getNode(elRecord.getId());
@@ -193,65 +193,57 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
        AssertJUnit.assertNull("The properties are present even after cutting off the record.", elRecord.getProperties().getTitle());

        // delete precondition
-        deleteRecordCategory(category1.getId());
-        deleteRecordCategory(copyCategoryId);
+        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
+    @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(FIRST_CATEGORY_RM_3060).build(),
+            .createRootRecordCategory(RecordCategory.builder().name(firstCategoryRM3060).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);
+        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(), SECOND_CATEGORY_RM_3060);
+        String categorySecondId = copyCategory(getAdminUser(), recordCategory.getId(), secondCategoryRM3060);

        // 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);
+        RecordCategoryChild firstFolderRecordCategoryChild = createRecordFolder(recordCategory.getId(),firstFolderRM3060);
+        Record firstElectronicRecord = createElectronicRecord(firstFolderRecordCategoryChild.getId(),electronicRecordRM3060);

        String elRecordFullName = recordsAPI.getRecordFullName(getDataUser().getAdminUser().getUsername(),
-            getDataUser().getAdminUser().getPassword(), FIRST_FOLDER_RM_3060, ELECTRONIC_RECORD_RM_3060);
+            getDataUser().getAdminUser().getPassword(),firstFolderRM3060, electronicRecordRM3060);
        String elRecordNameNodeRef = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), elRecordFullName, "/" + FIRST_CATEGORY_RM_3060 + "/" + FIRST_FOLDER_RM_3060);
+            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,
-            SECOND_FOLDER_RM_3060);
-        Record secondNonElectronicRecord = createNonElectronicRecord(secondFolderRecordCategoryChild.getId(),
-            NON_ELECTRONIC_RECORD_RM_3060);
+        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, SECOND_CATEGORY_RM_3060 + "/" +
-                SECOND_FOLDER_RM_3060, recordLists);
+            getDataUser().getAdminUser().getPassword(), HttpStatus.SC_OK,secondCategoryRM3060 + "/" +
+                secondFolderRM3060, recordLists);
        String nonElRecordFullName = recordsAPI.getRecordFullName(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            SECOND_FOLDER_RM_3060, secondNonElectronicRecord.getName());
+            getDataUser().usingAdmin().getAdminUser().getPassword(), secondFolderRM3060, secondNonElectronicRecord.getName());
        String nonElRecordNameNodeRef = recordsAPI.getRecordNodeRef(getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(), nonElRecordFullName, "/" + SECOND_CATEGORY_RM_3060
-                + "/" + SECOND_FOLDER_RM_3060);
+            getDataUser().usingAdmin().getAdminUser().getPassword(), nonElRecordFullName, "/" + secondCategoryRM3060 + "/" + secondFolderRM3060);

        // complete records and cut them off
        recordsAPI.completeRecord(getDataUser().getAdminUser().getUsername(),
@@ -266,14 +258,14 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
            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));
+        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, SECOND_CATEGORY_RM_3060 + "/" +
-                SECOND_FOLDER_RM_3060, recordLists);
+            getDataUser().getAdminUser().getPassword(), HttpStatus.SC_OK,secondCategoryRM3060 + "/" +
+                secondFolderRM3060, recordLists);

        // edit the disposition date and cut off the record
        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
@@ -281,7 +273,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
        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));
+        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(),
@@ -292,8 +284,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
        // 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));
+                getDataUser().usingAdmin().getAdminUser().getPassword(), nonElRecordFullName, "/" + secondCategoryRM3060 + "/" + secondFolderRM3060));

        String nonElRecordNameTransferId = getTransferId(nonElRecordNameHttpResponse,nonElRecordNameNodeRef);
        recordFoldersAPI.postRecordAction(getAdminUser().getUsername(),
@@ -301,15 +292,14 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {

        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));
+                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 " + 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));
+        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(),
@@ -324,14 +314,13 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
            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());
+       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() {};
        repoTestModel.setNodeRef(categoryId);
@@ -361,7 +350,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 +361,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
            .getJSONObject("results")
            .get(nodeRef)
            .toString();
+
    }

    @Test
@@ -380,39 +370,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 +406,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 +424,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.0.256-SNAPSHOT</version>
+      <version>20.90-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.8.1
-POSTGRES_TAG=15.4
-ACTIVEMQ_TAG=5.18.2-jre17-rockylinux8
+SOLR6_TAG=2.0.7-A2
+POSTGRES_TAG=14.4
+ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8
--- a/amps/ags/rm-community/rm-community-repo/Dockerfile
+++ b/amps/ags/rm-community/rm-community-repo/Dockerfile
@@ -1,4 +1,3 @@
-ARG BASE_IMAGE
 # BUILD STAGE AGS
 FROM debian:11-slim AS AGSBUILDER

@@ -13,7 +12,7 @@ RUN unzip -q /build/gs-api-explorer-*.war -d /build/gs-api-explorer && \
    chmod -R g-w,o= /build

 # ACTUAL IMAGE
-FROM ${BASE_IMAGE}
+FROM alfresco/alfresco-community-repo-base:${image.tag}

 # Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
 # The access will be fixed after all operations are done.
--- 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/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -8,15 +8,13 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>23.1.0.256-SNAPSHOT</version>
+      <version>20.90-SNAPSHOT</version>
   </parent>

   <properties>
      <app.amp.client.war.folder>${project.build.directory}/${project.build.finalName}-war</app.amp.client.war.folder>

      <image.name>alfresco/alfresco-governance-repository-community-base</image.name>
-      <base.image>alfresco/alfresco-community-repo-base</base.image>
-      <scripts.directory>${project.parent.parent.parent.parent.basedir}/scripts</scripts.directory>
   </properties>

   <dependencies>
@@ -60,12 +58,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 +100,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 +412,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>
@@ -436,7 +434,7 @@
                           </run>
                        </image>
                        <image>
-                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre17-rockylinux8</name>
+                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre11-rockylinux8</name>
                           <run>
                              <ports>
                                 <port>${activemq.port1}:${activemq.port1}</port>
@@ -507,7 +505,7 @@
                           </run>
                        </image>
                        <image>
-                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre17-rockylinux8</name>
+                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}-jre11-rockylinux8</name>
                           <run>
                              <ports>
                                 <port>${activemq.port1}:${activemq.port1}</port>
@@ -539,43 +537,9 @@
         </build>
      </profile>

-      <profile>
-         <id>build-docker-images</id>
-         <!-- builds "image:latest" locally -->
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>io.fabric8</groupId>
-                  <artifactId>docker-maven-plugin</artifactId>
-                  <configuration>
-                     <images>
-                        <image>
-                           <name>${image.name}:${image.tag}</name>
-                           <build>
-                              <args>
-                                 <BASE_IMAGE>${base.image}:${image.tag}</BASE_IMAGE>
-                              </args>
-                              <contextDir>${project.basedir}</contextDir>
-                           </build>
-                        </image>
-                     </images>
-                  </configuration>
-                  <executions>
-                     <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                           <goal>build</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-
       <profile>
-          <id>build-multiarch-docker-images</id>
+          <id>build-docker-images</id>
+          <!-- builds "image:latest" locally -->
          <build>
             <plugins>
                <plugin>
@@ -584,56 +548,20 @@
                   <configuration>
                      <images>
                         <image>
-                            <name>${local.registry}/${image.name}:${image.tag}</name>
-                            <build>
-                               <buildx>
-                                  <platforms>
-                                     <platform>linux/amd64</platform>
-                                     <platform>linux/arm64</platform>
-                                  </platforms>
-                                  <builderName>${builder.name}</builderName>
-                               </buildx>
-                               <contextDir>${project.basedir}</contextDir>
-                               <args>
-                                  <BASE_IMAGE>${local.registry}/${base.image}:${image.tag}</BASE_IMAGE>
-                               </args>
-                            </build>
+                            <name>${image.name}:${image.tag}</name>
                         </image>
                      </images>
                   </configuration>
                   <executions>
                      <execution>
-                         <id>build-push-image</id>
+                         <id>build-image</id>
                         <phase>package</phase>
                         <goals>
                            <goal>build</goal>
-                            <goal>push</goal>
                         </goals>
                      </execution>
                   </executions>
                </plugin>
-                <plugin>
-                   <artifactId>exec-maven-plugin</artifactId>
-                   <groupId>org.codehaus.mojo</groupId>
-                   <executions>
-                      <execution>
-                         <id>prepare-buildx</id>
-                         <phase>generate-sources</phase>
-                         <goals>
-                            <goal>exec</goal>
-                         </goals>
-                         <configuration>
-                            <executable>${scripts.directory}/prepare_buildx.sh</executable>
-                            <arguments>
-                               <argument>${builder.name}</argument>
-                               <argument>${image.registry}</argument>
-                               <argument>${image.name}</argument>
-                               <argument>${image.tag}</argument>
-                            </arguments>
-                         </configuration>
-                      </execution>
-                   </executions>
-                </plugin>
             </plugins>
          </build>
       </profile>
@@ -650,37 +578,12 @@
                      <images>
                         <image>
                            <!-- Quay image -->
-                            <name>${image.registry}/${image.name}:${image.tag}</name>
-                            <build>
-                               <buildx>
-                                  <platforms>
-                                     <platform>linux/amd64</platform>
-                                     <platform>linux/arm64</platform>
-                                  </platforms>
-                                  <builderName>${builder.name}</builderName>
-                               </buildx>
-                               <args>
-                                  <BASE_IMAGE>${local.registry}/${base.image}:${image.tag}</BASE_IMAGE>
-                               </args>
-                               <contextDir>${project.basedir}</contextDir>
-                            </build>
+                            <name>${image.name}:${image.tag}</name>
+                            <registry>${image.registry}</registry>
                         </image>
                         <image>
                            <!-- DockerHub image -->
                            <name>${image.name}:${image.tag}</name>
-                            <build>
-                               <buildx>
-                                  <platforms>
-                                     <platform>linux/amd64</platform>
-                                     <platform>linux/arm64</platform>
-                                  </platforms>
-                                  <builderName>${builder.name}</builderName>
-                               </buildx>
-                               <args>
-                                  <BASE_IMAGE>${local.registry}/${base.image}:${image.tag}</BASE_IMAGE>
-                               </args>
-                               <contextDir>${project.basedir}</contextDir>
-                            </build>
                         </image>
                      </images>
                   </configuration>
@@ -695,28 +598,6 @@
                      </execution>
                   </executions>
                </plugin>
-                 <plugin>
-                     <artifactId>exec-maven-plugin</artifactId>
-                     <groupId>org.codehaus.mojo</groupId>
-                     <executions>
-                        <execution>
-                            <id>prepare-buildx</id>
-                            <phase>generate-sources</phase>
-                            <goals>
-                               <goal>exec</goal>
-                            </goals>
-                            <configuration>
-                               <executable>${scripts.directory}/prepare_buildx.sh</executable>
-                               <arguments>
-                                  <argument>${builder.name}</argument>
-                                  <argument>${image.registry}</argument>
-                                  <argument>${image.name}</argument>
-                                  <argument>${image.tag}</argument>
-                               </arguments>
-                            </configuration>
-                        </execution>
-                     </executions>
-                 </plugin>
             </plugins>
          </build>
       </profile>
--- 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 - 2023 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 - 2023 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=0
 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.0.256-SNAPSHOT</version>
+        <version>20.90-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/ags/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml
+++ b/amps/ags/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml
@@ -38,7 +38,9 @@ tags:
    description: Retrieve and manage unfiled records containers
  - name: unfiled-record-folders
    description: Retrieve and manage unfiled record folders
-
+  - name: events
+    description: Retrieve and manage retention events
+    
 paths:
  ## GS sites
  '/gs-sites':
@@ -2092,8 +2094,172 @@ paths:
          description: Unexpected error
          schema:
            $ref: '#/definitions/Error'
+  '/events':
+    get:
+      tags:
+        - events
+      summary: List all available retention events
+      description: |
+        Gets the list of events that can be used by retention steps
+      operationId: getAllEvents
+      produces:
+        - application/json
+      parameters:
+        - $ref: '#/parameters/skipCountParam'
+        - $ref: '#/parameters/maxItemsParam'
+      responses:
+        '200':
+          description: Successful response
+          schema:
+            $ref: '#/definitions/EventPaging'
+        '400':
+          description: |
+            Invalid parameter: value of **maxItems** or **skipCount** is invalid
+        '401':
+          description: Authentication failed
+        default:
+          description: Unexpected error
+          schema:
+            $ref: '#/definitions/Error'

+    post:
+      tags:
+        - events
+      summary: Create a new retention event
+      description: |
+        Creates a new event that can be used by retention schedules.
+      operationId: createEvent
+      parameters:
+        - in: body
+          name: eventBodyCreate
+          description: The new event.
+          required: true
+          schema:
+            $ref: '#/definitions/EventBody'
+      consumes:
+        - application/json
+      produces:
+        - application/json
+      responses:
+        '201':
+          description: Successful response
+          schema:
+            $ref: '#/definitions/EventEntry'
+        '400':
+          description: |
+            Invalid parameter: **name** or **type** is invalid
+        '401':
+          description: Authentication failed
+        '403':
+          description: Current user does not have permission to create event
+        '409':
+          description: Cannot create event. An event with the name **name** already exists
+        default:
+          description: Unexpected error
+          schema:
+            $ref: '#/definitions/Error'
+  
+  '/events/{eventId}':
+    get:
+      tags:
+        - events
+      summary: Return event for given eventId
+      description: |
+        Gets information about the retention event with id **eventId**.
+      operationId: getEvent
+      produces:
+        - application/json
+      parameters:
+        - $ref: '#/parameters/eventIdParam'
+      responses:
+        '200':
+          description: Successful response
+          schema:
+            $ref: '#/definitions/EventEntry'
+        '400':
+          description: |
+            Invalid parameter: **eventId** is invalid    
+        '401':
+          description: Authentication failed
+        '404':
+          description: "**eventId** does not exist"
+        default:
+          description: Unexpected error
+          schema:
+            $ref: '#/definitions/Error'
+    put:
+      tags:
+        - events
+      summary: Update event for given eventId
+      operationId: updateEvent
+      description: |
+        Updates retention event with id **eventId**.
+      produces:
+        - application/json
+      parameters:
+        - $ref: '#/parameters/eventIdParam'
+        - in: body
+          name: eventBodyUpdate
+          description: The event information to update.
+          required: true
+          schema:
+            $ref: '#/definitions/EventBody'
+      responses:
+        '200':
+          description: Successful response
+          schema:
+            $ref: '#/definitions/EventEntry'
+        '400':
+          description: |
+            Invalid parameter: The update request is invalid or **eventId** is not a valid format or **eventBodyUpdate** is invalid
+        '401':
+          description: Authentication failed
+        '403':
+          description: Current user does not have permission to update events
+        '404':
+          description: "**eventId** does not exist"
+        '409':
+          description: Cannot update event. An event with the name **name** already exists
+        default:
+          description: Unexpected error
+          schema:
+            $ref: '#/definitions/Error'
+  
+  '/event-types':
+    get:
+      tags:
+        - events
+      summary: List all the retention event types
+      description: |
+        Gets a list of all the retention event types.
+      operationId: getAllEventTypes
+      produces:
+        - application/json
+      parameters:
+        - $ref: '#/parameters/skipCountParam'
+        - $ref: '#/parameters/maxItemsParam'
+      responses:
+        '200':
+          description: Successful response
+          schema:
+            $ref: '#/definitions/EventTypePaging'
+        '400':
+          description: |
+            Invalid parameter: value of **maxItems** or **skipCount** is invalid
+        '401':
+          description: Authentication failed
+        default:
+          description: Unexpected error
+          schema:
+            $ref: '#/definitions/Error'          
 parameters:
+  ## event
+  eventIdParam:
+    name: eventId
+    in: path
+    description: The identifier of an event.
+    required: true
+    type: string
  ## File plans
  filePlanEntryIncludeParam:
    name: include
@@ -3761,4 +3927,92 @@ definitions:
          - SiteConsumer
          - SiteCollaborator
          - SiteContributor
-          - SiteManager
+          - SiteManager
+  EventPaging:
+    type: object
+    properties:
+      list:
+        type: object
+        properties:
+          pagination:
+            $ref: '#/definitions/Pagination'
+          entries:
+            type: array
+            items:
+              $ref: '#/definitions/EventEntry'
+  EventEntry:
+    type: object
+    required:
+      - entry
+    properties:
+      entry:
+        $ref: '#/definitions/Event'
+  Event:
+    type: object
+    required:
+      - id
+      - name
+      - type
+    properties:
+      id:
+        type: string
+        description: this is the id of the event
+      name:
+        type: string
+        description: This is the unique display label of the event
+      type:
+        type: string
+        description: this is event type
+  EventBody:
+    type: object
+    required:
+      - name
+    properties:
+      name:
+        type: string
+        description: This is the unique display label of the event
+      type:
+        type: string
+        description: this is event type
+        default: Simple
+  EventTypePaging:
+    type: object
+    properties:
+      list:
+        type: object
+        properties:
+          pagination:
+            $ref: '#/definitions/Pagination'
+          entries:
+            type: array
+            items:
+              $ref: '#/definitions/EventTypeEntry'
+  EventTypeEntry:
+    type: object
+    required:
+      - entry
+    properties:
+      entry:
+        $ref: '#/definitions/EventType'
+  EventType:
+    type: object
+    required:
+      - id
+      - name
+    properties:
+      id:
+        type: string
+        description: this is the event type id
+      name:
+        type: string
+        description: this is event type name
+      isAutomatic:
+        type: boolean
+        description: Whether events of this type need completing manually or can be completed automatically
+        default: true
+      associationName:
+        type: string
+        description: The association used to determine whether automatic events of this type are complete
+      actionOnAssociatedNode:
+        type: string
+        description: If an association name is set for this event type then it is possible to require an action to be completed on the associated node
--- 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.0.256-SNAPSHOT</version>
+        <version>20.90-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.0.256-SNAPSHOT</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <properties>
@@ -121,6 +121,12 @@
            <version>${dependency.webscripts.version}</version>
            <classifier>tests</classifier>
            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
+            </exclusions>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
@@ -128,8 +134,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/bootstrap/team-sample-sites/swsdp/Contents.acp
+++ b/amps/share-services/src/main/resources/alfresco/bootstrap/team-sample-sites/swsdp/Contents.acp
--- a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/collaboration/tagQuery.get.js
+++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/collaboration/tagQuery.get.js
@@ -48,7 +48,7 @@ function tagQuery()
   }
   query += "ASPECT:\"{http://www.alfresco.org/model/content/1.0}taggable\"";
   //MNT-2118 Share inconsistencies when displaying locked files with tags
-   query += " AND -ASPECT:\"{http://www.alfresco.org/model/content/1.0}workingcopy\"";
+   query += " -ASPECT:\"{http://www.alfresco.org/model/content/1.0}workingcopy\"";

   // MNT-20091 check to prevent cm:taggable with NULL
   query += " AND ISNOTNULL:\"{http://www.alfresco.org/model/content/1.0}taggable\"";
@@ -60,7 +60,7 @@ function tagQuery()
         query: query,
         language: "lucene",
         page: {
-            // query minimum rows because all useful info will come with facets
+            // query minimum rows because all usefull info will come with facets 
            maxItems: 1,
            skipCount: 0
         },
--- 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/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/categorynode.get.js
+++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/categorynode.get.js
@@ -24,7 +24,7 @@ function getCategoryNode()
      else
      {
         var queryPath = "/" + catAspect + "/" + encodePath(path);
-         categoryResults = search.luceneSearch("+PATH:\"" + queryPath + "/*\" AND -PATH:\"" + queryPath + "/member\"");
+         categoryResults = search.luceneSearch("+PATH:\"" + queryPath + "/*\" -PATH:\"" + queryPath + "/member\"");
      }
      
      // make each result an object and indicate it is selectable in the UI
@@ -71,4 +71,4 @@ function encodePath(path)
 function sortByName(a, b)
 {
   return (b.node.name.toLowerCase() > a.node.name.toLowerCase() ? -1 : 1);
-}
+}
--- a/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/images.get.js
+++ b/amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/images.get.js
@@ -29,7 +29,7 @@ function main()
   {
      query = "+PATH:\"" + parsedArgs.pathNode.qnamePath + "//*\" ";
   }
-   query += "AND +TYPE:\"cm:content\" AND +@cm\\:content.mimetype:\"image/*\"";
+   query += "+TYPE:\"cm:content\" +@cm\\:content.mimetype:image/*";
   
   // Sort the list before trimming to page chunks 
   assets = search.query(
@@ -52,4 +52,4 @@ function main()
 /**
 * Images List Component: images
 */
-model.images = main();
+model.images = main();
--- 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.0.256-SNAPSHOT</version>
+      <version>20.90-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 -->
@@ -136,10 +137,6 @@
         <artifactId>commons-dbcp2</artifactId>
         <scope>test</scope>
      </dependency>
-      <dependency>
-         <groupId>org.apache.httpcomponents</groupId>
-         <artifactId>httpclient</artifactId>
-      </dependency>
   </dependencies>

   <build>
--- 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/httpclient/HttpClient4Factory.java
+++ b/core/src/main/java/org/alfresco/httpclient/HttpClient4Factory.java
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2023 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.alfresco.httpclient;
-
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.client.StandardHttpRequestRetryHandler;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-
-
-public class HttpClient4Factory
-{
-    protected static final String TLS_PROTOCOL = "TLS";
-    protected static final String HTTPS_PROTOCOL = "https";
-    protected static final String HTTP_TARGET_HOST = "http.target_host";
-    protected static final String TLS_V_1_2 = "TLSv1.2";
-    protected static final String TLS_V_1_3 = "TLSv1.3";
-
-    private static SSLContext createSSLContext(HttpClientConfig config)
-    {
-        KeyManager[] keyManagers = config.getKeyStore().createKeyManagers();
-        TrustManager[] trustManagers = config.getTrustStore().createTrustManagers();
-
-        try
-        {
-            SSLContext sslcontext = SSLContext.getInstance(TLS_PROTOCOL);
-            sslcontext.init(keyManagers, trustManagers, null);
-            return sslcontext;
-        }
-        catch(Throwable e)
-        {
-            throw new AlfrescoRuntimeException("Unable to create SSL context", e);
-        }
-    }
-
-    public static CloseableHttpClient createHttpClient(HttpClientConfig config)
-    {
-        return createHttpClient(config, null);
-    }
-
-    public static CloseableHttpClient createHttpClient(HttpClientConfig config, HttpClientConnectionManager connectionManager)
-    {
-        HttpClientBuilder clientBuilder = HttpClients.custom();
-
-        if(config.isMTLSEnabled())
-        {
-            clientBuilder.addInterceptorFirst((HttpRequestInterceptor) (request, context) -> {
-                if (!((HttpHost) context.getAttribute(HTTP_TARGET_HOST)).getSchemeName().equals(HTTPS_PROTOCOL))
-                {
-                    String msg = "mTLS is enabled but provided URL does not use a secured protocol";
-                    throw new HttpClientException(msg);
-                }
-            });
-            clientBuilder.setSSLSocketFactory(getSslConnectionSocketFactory(config));
-        }
-
-        if (connectionManager != null)
-        {
-            clientBuilder.setConnectionManager(connectionManager);
-        }
-        else
-        {
-            //Setting a connectionManager overrides these properties
-            config.getMaxTotalConnections().ifPresent(v -> clientBuilder.setMaxConnTotal(v));
-            config.getMaxHostConnections().ifPresent(v -> clientBuilder.setMaxConnPerRoute(v));
-        }
-
-        RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
-        config.getConnectionTimeout().ifPresent(v -> requestConfigBuilder.setConnectTimeout(v));
-        config.getConnectionRequestTimeout().ifPresent(v -> requestConfigBuilder.setConnectionRequestTimeout(v));
-        config.getSocketTimeout().ifPresent(v -> requestConfigBuilder.setSocketTimeout(v));
-
-        RequestConfig requestConfig = requestConfigBuilder.build();
-
-        clientBuilder.setDefaultRequestConfig(requestConfig);
-
-        clientBuilder.setRetryHandler(new StandardHttpRequestRetryHandler(5, false));
-
-        return clientBuilder.build();
-    }
-
-    private static SSLConnectionSocketFactory getSslConnectionSocketFactory(HttpClientConfig config)
-    {
-        return new SSLConnectionSocketFactory(
-                createSSLContext(config),
-                new String[] { TLS_V_1_2, TLS_V_1_3 },
-                null,
-                config.isHostnameVerificationDisabled() ? new NoopHostnameVerifier() : SSLConnectionSocketFactory.getDefaultHostnameVerifier());
-    }
-
-    public static PoolingHttpClientConnectionManager createPoolingConnectionManager(HttpClientConfig config)
-    {
-        PoolingHttpClientConnectionManager poolingHttpClientConnectionManager;
-        if(config.isMTLSEnabled())
-        {
-            poolingHttpClientConnectionManager = new PoolingHttpClientConnectionManager(
-                    RegistryBuilder.<ConnectionSocketFactory>create()
-                   .register("https", getSslConnectionSocketFactory(config))
-                   .build());
-        }
-        else
-        {
-            poolingHttpClientConnectionManager = new PoolingHttpClientConnectionManager(
-                    RegistryBuilder.<ConnectionSocketFactory>create()
-                   .register("http", PlainConnectionSocketFactory.getSocketFactory())
-                   .build());
-        }
-        config.getMaxTotalConnections().ifPresent(v -> poolingHttpClientConnectionManager.setMaxTotal(v));
-        config.getMaxHostConnections().ifPresent(v -> poolingHttpClientConnectionManager.setDefaultMaxPerRoute(v));
-
-        return poolingHttpClientConnectionManager;
-    }
-}
--- a/core/src/main/java/org/alfresco/httpclient/HttpClientConfig.java
+++ b/core/src/main/java/org/alfresco/httpclient/HttpClientConfig.java
@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2023 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.alfresco.httpclient;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.stream.Collectors;
-
-import org.alfresco.encryption.AlfrescoKeyStore;
-import org.alfresco.encryption.AlfrescoKeyStoreImpl;
-import org.alfresco.encryption.KeyResourceLoader;
-import org.alfresco.encryption.ssl.SSLEncryptionParameters;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-public class HttpClientConfig
-{
-    private static final String HTTPCLIENT_CONFIG = "httpclient.config.";
-
-    protected static final Log LOGGER = LogFactory.getLog(HttpClientConfig.class);
-
-    private Properties properties;
-    private String serviceName;
-
-    private SSLEncryptionParameters sslEncryptionParameters;
-    private KeyResourceLoader keyResourceLoader;
-
-    private AlfrescoKeyStore keyStore;
-    private AlfrescoKeyStore trustStore;
-
-    private Map<String, String> config;
-
-    public void setProperties(Properties properties)
-    {
-        this.properties = properties;
-    }
-
-    public void setServiceName(String serviceName)
-    {
-        this.serviceName = serviceName;
-    }
-
-    public void setSslEncryptionParameters(SSLEncryptionParameters sslEncryptionParameters)
-    {
-        this.sslEncryptionParameters = sslEncryptionParameters;
-    }
-
-    public void setKeyResourceLoader(KeyResourceLoader keyResourceLoader)
-    {
-        this.keyResourceLoader = keyResourceLoader;
-    }
-
-    public AlfrescoKeyStore getKeyStore()
-    {
-        return keyStore;
-    }
-
-    public AlfrescoKeyStore getTrustStore()
-    {
-        return trustStore;
-    }
-
-    public void init()
-    {
-        this.keyStore = new AlfrescoKeyStoreImpl(sslEncryptionParameters.getKeyStoreParameters(),  keyResourceLoader);
-        this.trustStore = new AlfrescoKeyStoreImpl(sslEncryptionParameters.getTrustStoreParameters(), keyResourceLoader);
-
-        config = retrieveConfig();
-        checkUnsupportedProperties(config);
-    }
-
-    /**
-     * Method used for retrieving HttpClient config from Global Properties
-     * that can also have values provided/overridden through System Properties
-     *
-     * @return map of properties
-     */
-    private Map<String, String> retrieveConfig()
-    {
-        Map<String, String> resultProperties = getHttpClientPropertiesForService(properties);
-        Map<String, String> systemProperties = getHttpClientPropertiesForService(System.getProperties());
-
-        systemProperties.forEach((k, v) -> resultProperties.put(k, v)); //Override/Add to Global Properties results with values from System Properties
-
-        return resultProperties;
-    }
-
-    private Map<String, String> getHttpClientPropertiesForService(Properties properties) {
-        return properties.keySet().stream()
-                .filter(key -> key instanceof String)
-                .map(Object::toString)
-                .filter(key -> key.startsWith(HTTPCLIENT_CONFIG + serviceName))
-                .collect(Collectors.toMap(
-                        key -> key.replace(HTTPCLIENT_CONFIG + serviceName + ".", ""),
-                        key -> properties.getProperty(key, null)));
-    }
-
-    private void checkUnsupportedProperties(Map<String, String> config)
-    {
-        config.keySet().stream()
-              .filter(propertyName -> !HttpClientPropertiesEnum.isPropertyNameSupported(propertyName))
-              .forEach(propertyName -> LOGGER.warn(String.format("For service [%s], an unsupported property [%s] is set", serviceName, propertyName)));
-    }
-
-    private Optional<Integer> getIntegerProperty(HttpClientPropertiesEnum property)
-    {
-        Optional<String> optionalProperty = extractValueFromConfig(property);
-
-        return optionalProperty.isPresent() ? Optional.of(Integer.parseInt(optionalProperty.get())) : Optional.empty();
-    }
-
-    private Optional<Boolean> getBooleanProperty(HttpClientPropertiesEnum property)
-    {
-        Optional<String> optionalProperty = extractValueFromConfig(property);
-
-        return optionalProperty.isPresent() ? Optional.of(Boolean.parseBoolean(optionalProperty.get())) : Optional.empty();
-    }
-
-    private Optional<String> extractValueFromConfig(HttpClientPropertiesEnum property)
-    {
-        return Optional.ofNullable(config.get(property.name));
-    }
-
-    public Optional<Integer> getConnectionTimeout()
-    {
-        return getIntegerProperty(HttpClientPropertiesEnum.CONNECTION_REQUEST_TIMEOUT);
-    }
-
-    public Optional<Integer> getSocketTimeout()
-    {
-        return getIntegerProperty(HttpClientPropertiesEnum.SOCKET_TIMEOUT);
-    }
-
-    public Optional<Integer> getConnectionRequestTimeout()
-    {
-        return getIntegerProperty(HttpClientPropertiesEnum.CONNECTION_REQUEST_TIMEOUT);
-    }
-
-    public Optional<Integer> getMaxTotalConnections()
-    {
-        return getIntegerProperty(HttpClientPropertiesEnum.MAX_TOTAL_CONNECTIONS);
-    }
-
-    public Optional<Integer> getMaxHostConnections()
-    {
-        return getIntegerProperty(HttpClientPropertiesEnum.MAX_HOST_CONNECTIONS);
-    }
-
-    public boolean isMTLSEnabled()
-    {
-        return getBooleanProperty(HttpClientPropertiesEnum.MTLS_ENABLED).orElse(Boolean.FALSE);
-    }
-
-    public boolean isHostnameVerificationDisabled()
-    {
-        return getBooleanProperty(HttpClientPropertiesEnum.HOSTNAME_VERIFICATION_DISABLED).orElse(Boolean.FALSE);
-    }
-
-    private enum HttpClientPropertiesEnum
-    {
-        CONNECTION_TIMEOUT("connectionTimeout"),
-        SOCKET_TIMEOUT("socketTimeout"),
-        CONNECTION_REQUEST_TIMEOUT("connectionRequestTimeout"),
-        MAX_TOTAL_CONNECTIONS("maxTotalConnections"),
-        MAX_HOST_CONNECTIONS("maxHostConnections"),
-        HOSTNAME_VERIFICATION_DISABLED("hostnameVerificationDisabled"),
-        MTLS_ENABLED("mTLSEnabled");
-
-        private final String name;
-
-        HttpClientPropertiesEnum(String propertyName)
-        {
-            this.name = propertyName;
-        }
-
-        private static final List<String> supportedProperties = new ArrayList<>();
-
-        static {
-            for (HttpClientPropertiesEnum property : HttpClientPropertiesEnum.values()) {
-                supportedProperties.add(property.name);
-            }
-        }
-
-        public static boolean isPropertyNameSupported(String propertyName) {
-            return supportedProperties.contains(propertyName);
-        }
-    }
-}
--- a/core/src/main/java/org/alfresco/httpclient/HttpClientException.java
+++ b/core/src/main/java/org/alfresco/httpclient/HttpClientException.java
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2023 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.alfresco.httpclient;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-
-public class HttpClientException extends AlfrescoRuntimeException
-{
-    public HttpClientException(String msgId)
-    {
-        super(msgId);
-    }
-}
--- a/core/src/main/java/org/alfresco/query/ListBackedPagingResults.java
+++ b/core/src/main/java/org/alfresco/query/ListBackedPagingResults.java
@@ -45,13 +45,6 @@ public class ListBackedPagingResults<R> implements PagingResults<R>
        size = list.size();
        hasMore = false;
    }
-
-    public ListBackedPagingResults(List<R> list, boolean hasMore)
-    {
-        this(list);
-        this.hasMore = hasMore;
-    }
-
    public ListBackedPagingResults(List<R> list, PagingRequest paging)
    {
        // Excerpt
--- 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.0.256-SNAPSHOT</version>
+        <version>20.90-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/service/cmr/search/SearchParameters.java
+++ b/data-model/src/main/java/org/alfresco/service/cmr/search/SearchParameters.java
@@ -201,11 +201,6 @@ public class SearchParameters implements BasicSearchParameters

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

 }
--- 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.0.256-SNAPSHOT</version>
+        <version>20.90-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.0.256-SNAPSHOT</version>
+        <version>20.90-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,6 @@
 # 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-jre17-rockylinux8-202209261711

 # Set default docker_context.
 ARG resource_path=target
@@ -65,7 +65,7 @@ RUN sed -i -e "s_appender.rolling.fileName\=alfresco.log_appender.rolling.fileNa
 RUN yum install -y fontconfig-2.13.1-4.el8 \
                   dejavu-fonts-common-2.35-7.el8 \
                   fontpackages-filesystem-1.44-22.el8 \
-                   freetype-2.9.1-9.el8 \
+                   freetype-2.9.1-4.el8_3.1 \
                   libpng-1.6.34-5.el8 \
                   dejavu-sans-fonts-2.35-7.el8 && \
    yum clean all
@@ -98,4 +98,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,12 +7,11 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.1.0.256-SNAPSHOT</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <properties>
        <image.name>alfresco/alfresco-community-repo-base</image.name>
-        <scripts.directory>${project.parent.parent.basedir}/scripts</scripts.directory>
    </properties>

    <build>
@@ -157,67 +156,6 @@
            </build>
        </profile>

-        <profile>
-            <id>build-multiarch-docker-images</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.fabric8</groupId>
-                        <artifactId>docker-maven-plugin</artifactId>
-                        <configuration>
-                            <images>
-                                <image>
-                                    <name>${local.registry}/${image.name}:${image.tag}</name>
-                                    <build>
-                                        <buildx>
-                                            <platforms>
-                                                <platform>linux/amd64</platform>
-                                                <platform>linux/arm64</platform>
-                                            </platforms>
-                                            <builderName>${builder.name}</builderName>
-                                        </buildx>
-                                        <contextDir>${project.basedir}</contextDir>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>build-push-image</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>build</goal>
-                                    <goal>push</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <executions>
-                            <execution>
-                                <id>prepare-buildx</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>${scripts.directory}/prepare_buildx.sh</executable>
-                                    <arguments>
-                                        <argument>${builder.name}</argument>
-                                        <argument>${image.registry}</argument>
-                                        <argument>${image.name}</argument>
-                                        <argument>${image.tag}</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
        <profile>
            <id>push-docker-images</id>
            <!-- publishes "image:latest" on Quay & DockerHub -->
@@ -230,29 +168,12 @@
                            <images>
                                <!-- Quay image -->
                                <image>
-                                    <name>${image.registry}/${image.name}:${image.tag}</name>
-                                    <build>
-                                        <buildx>
-                                            <platforms>
-                                                <platform>linux/amd64</platform>
-                                                <platform>linux/arm64</platform>
-                                            </platforms>
-                                        </buildx>
-                                        <contextDir>${project.basedir}</contextDir>
-                                    </build>
+                                    <name>${image.name}:${image.tag}</name>
+                                    <registry>${image.registry}</registry>
                                </image>
                                <!-- DockerHub image -->
                                <image>
                                    <name>${image.name}:${image.tag}</name>
-                                    <build>
-                                        <buildx>
-                                            <platforms>
-                                                <platform>linux/amd64</platform>
-                                                <platform>linux/arm64</platform>
-                                            </platforms>
-                                        </buildx>
-                                        <contextDir>${project.basedir}</contextDir>
-                                    </build>
                                </image>
                            </images>
                        </configuration>
--- 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.0.256-SNAPSHOT</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <modules>
--- a/packaging/tests/environment/.env
+++ b/packaging/tests/environment/.env
@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.8.1
-POSTGRES_TAG=15.4
-ACTIVEMQ_TAG=5.18.2-jre17-rockylinux8
+SOLR6_TAG=2.0.7-A2
+POSTGRES_TAG=14.4
+ACTIVEMQ_TAG=5.17.1-jre11-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.0.256-SNAPSHOT</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <modules>
--- 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.0.256-SNAPSHOT</version>
+        <version>20.90-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/AuthParameterProviderFactory.java
+++ b/packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/AuthParameterProviderFactory.java
@@ -4,6 +4,8 @@ import org.alfresco.utility.data.AisToken;
 import org.alfresco.utility.data.auth.DataAIS;
 import org.alfresco.utility.model.UserModel;
 import org.apache.chemistry.opencmis.commons.SessionParameter;
+import org.keycloak.authorization.client.util.HttpResponseException;
+import org.keycloak.representations.AccessTokenResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

@@ -84,9 +86,9 @@ public class AuthParameterProviderFactory
            parameters.put(SessionParameter.OAUTH_REFRESH_TOKEN, aisToken.getRefreshToken());
            parameters.put(SessionParameter.OAUTH_EXPIRATION_TIMESTAMP, String.valueOf(System.currentTimeMillis()
                    + (aisToken.getExpiresIn() * 1000))); // getExpiresIn is in seconds
-            parameters.put(SessionParameter.OAUTH_TOKEN_ENDPOINT, cmisProperties.aisProperty().getAuthServerUrl()
+            parameters.put(SessionParameter.OAUTH_TOKEN_ENDPOINT, cmisProperties.aisProperty().getAdapterConfig().getAuthServerUrl()
                    + "/realms/alfresco/protocol/openid-connect/token");
-            parameters.put(SessionParameter.OAUTH_CLIENT_ID, cmisProperties.aisProperty().getResource());
+            parameters.put(SessionParameter.OAUTH_CLIENT_ID, cmisProperties.aisProperty().getAdapterConfig().getResource());
            return parameters;
        }

@@ -108,10 +110,10 @@ public class AuthParameterProviderFactory
                // Attempt to get an access token for userModel from AIS
                aisToken = dataAIS.perform().getAccessToken(userModel);
            }
-            catch (AssertionError e)
+            catch (HttpResponseException e)
            {
                // Trying to authenticate with invalid user credentials so return an invalid access token
-                if (e.getMessage().contains("invalid_grant"))
+                if (e.getStatusCode() == 401)
                {
                    STEP(String.format("%s Invalid user credentials were provided %s:%s. Using invalid token for reqest.",
                            STEP_PREFIX, userModel.getUsername(), userModel.getPassword()));
--- 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.0.256-SNAPSHOT</version>
+        <version>20.90-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/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapReadMessagesTests.java
+++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapReadMessagesTests.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.Flags;
-import jakarta.mail.MessagingException;
+import javax.mail.Flags;
+import javax.mail.MessagingException;
 import java.io.IOException;

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

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

 import org.alfresco.email.EmailTest;
 import org.alfresco.utility.constants.UserRole;
--- a/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapSitesTests.java
+++ b/packaging/tests/tas-email/src/test/java/org/alfresco/email/imap/ImapSitesTests.java
@@ -8,8 +8,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 ImapSitesTests extends EmailTest
 {
--- a/packaging/tests/tas-integration/pom.xml
+++ b/packaging/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.256-SNAPSHOT</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <developers>
@@ -95,6 +95,7 @@
        <dependency>
            <groupId>com.jayway.jsonpath</groupId>
            <artifactId>json-path</artifactId>
+            <version>${dependency.jakarta-json-path.version}</version>
        </dependency>
    </dependencies>

--- a/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationCoreTests.java
+++ b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationCoreTests.java
@@ -2,7 +2,7 @@ package org.alfresco.tas.integration;

 import static org.alfresco.utility.report.log.Step.STEP;

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

 import org.alfresco.rest.model.RestCommentModel;
 import org.alfresco.rest.model.RestDeploymentModel;
--- a/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests.java
+++ b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationFullTests.java
@@ -7,9 +7,9 @@ import static org.hamcrest.Matchers.equalTo;
 import io.restassured.RestAssured;
 import java.io.File;

-import jakarta.json.JsonObject;
-import jakarta.mail.Flags;
-import jakarta.mail.MessagingException;
+import javax.json.JsonObject;
+import javax.mail.Flags;
+import javax.mail.MessagingException;

 import org.alfresco.dataprep.CMISUtil;
 import org.alfresco.dataprep.SiteService.Visibility;
--- a/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationSanityTests.java
+++ b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationSanityTests.java
@@ -5,7 +5,7 @@ import static org.alfresco.utility.report.log.Step.STEP;
 import java.util.ArrayList;
 import java.util.List;

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

 import org.alfresco.rest.model.RestCommentModel;
 import org.alfresco.rest.model.RestErrorModel;
--- a/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithAosTests.java
+++ b/packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithAosTests.java
@@ -7,7 +7,7 @@ import io.restassured.http.ContentType;
 import java.util.HashMap;
 import java.util.Map;

-import jakarta.json.JsonObject;
+import javax.json.JsonObject;

 import org.alfresco.rest.core.JsonBodyGenerator;
 import org.alfresco.rest.core.RestRequest;
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -8,18 +8,20 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.1.0.256-SNAPSHOT</version>
+        <version>20.90-SNAPSHOT</version>
    </parent>

    <properties>
        <suiteXmlFile>${project.basedir}/src/test/resources/restapi-suite.xml</suiteXmlFile>
-        <maven.build.sourceVersion>17</maven.build.sourceVersion>
+        <maven.build.sourceVersion>11</maven.build.sourceVersion>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <rest.api.explorer.branch>master</rest.api.explorer.branch>
        <httpclient-osgi-version>4.5.6</httpclient-osgi-version>
-        <commons-lang3.version>3.13.0</commons-lang3.version>
-        <scribejava-apis.version>8.3.3</scribejava-apis.version>
-        <java.version>17</java.version>
+        <org.glassfish.version>1.1.4</org.glassfish.version>
+        <commons-lang3.version>3.12.0</commons-lang3.version>
+        <scribejava-apis.version>8.3.1</scribejava-apis.version>
+        <license-maven-plugin.version>2.0.1.alfresco-2</license-maven-plugin.version>
+        <java.version>11</java.version>
    </properties>

    <profiles>
@@ -44,9 +46,13 @@
    </profiles>

    <dependencies>
+        <!-- fix the info log messages related to Could not instantiate TestExecutionListener 
+            [org.springframework.test.context.web.ServletTestExecutionListener -->
        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
        </dependency>

        <!-- alfresco tester settings -->
@@ -79,13 +85,6 @@
            <version>${commons-lang3.version}</version>
        </dependency>

-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${dependency.awaitility.version}</version>
-            <scope>test</scope>
-        </dependency>
-
        <!-- REST ASSURED -->
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
@@ -137,6 +136,13 @@
            <artifactId>jackson-databind</artifactId>
        </dependency>

+        <!-- https://mvnrepository.com/artifact/org.glassfish/javax.json -->
+        <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.json</artifactId>
+            <version>${org.glassfish.version}</version>
+        </dependency>
+
        <!-- swagger parser -->
        <dependency>
            <groupId>io.swagger</groupId>
@@ -159,14 +165,14 @@
        <dependency>
            <groupId>org.codehaus.groovy</groupId>
            <artifactId>groovy</artifactId>
-            <version>3.0.19</version>
+            <version>3.0.12</version>
        </dependency>

        <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-json-->
        <dependency>
            <groupId>org.codehaus.groovy</groupId>
            <artifactId>groovy-json</artifactId>
-            <version>3.0.19</version>
+            <version>3.0.12</version>
        </dependency>

       <dependency>
@@ -176,8 +182,9 @@
       </dependency>

        <dependency>
-            <groupId>org.eclipse.parsson</groupId>
-            <artifactId>parsson</artifactId>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.json</artifactId>
+            <scope>test</scope>
        </dependency>
    </dependencies>

--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/JsonBodyGenerator.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/JsonBodyGenerator.java
@@ -25,11 +25,11 @@
 */
 package org.alfresco.rest.core;

-import jakarta.json.Json;
-import jakarta.json.JsonArrayBuilder;
-import jakarta.json.JsonBuilderFactory;
-import jakarta.json.JsonObject;
-import jakarta.json.JsonObjectBuilder;
+import javax.json.Json;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonBuilderFactory;
+import javax.json.JsonObject;
+import javax.json.JsonObjectBuilder;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestAisAuthentication.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestAisAuthentication.java
@@ -30,6 +30,7 @@ import static org.alfresco.utility.report.log.Step.STEP;
 import org.alfresco.utility.data.AisToken;
 import org.alfresco.utility.data.auth.DataAIS;
 import org.alfresco.utility.model.UserModel;
+import org.keycloak.authorization.client.util.HttpResponseException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

@@ -85,11 +86,12 @@ public class RestAisAuthentication
            // Attempt to get an access token for userModel from AIS
            aisToken = dataAIS.perform().getAccessToken(userModel);
        }
-        catch (AssertionError e)
+        catch (HttpResponseException e)
        {
            // Trying to authenticate with invalid user credentials or disabled
            // user so return an invalid access token
-            if (e.getMessage().contains("invalid_grant"))
+            String httpResponse = new String(e.getBytes());
+            if (e.getStatusCode() == 401 || httpResponse.contains(USER_DISABLED_MSG))
            {
                STEP(String.format("%s User disabled or invalid user credentials were provided %s:%s. Using invalid token for request.", STEP_PREFIX,
                        userModel.getUsername(), userModel.getPassword()));
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java
@@ -2,7 +2,7 @@
 * #%L
 * alfresco-tas-restapi
 * %%
- * Copyright (C) 2005 - 2023 Alfresco Software Limited
+ * Copyright (C) 2005 - 2022 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software. 
 * If the software was purchased under a paid Alfresco license, the terms of 
@@ -86,7 +86,6 @@ import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.testng.Assert;
@@ -631,42 +630,36 @@ public class RestWrapper extends DSLWrapper<RestWrapper>

        STEP(restRequest.toString());

-        final Response returnedResponse;
-        HttpMethod httpMethod = restRequest.getHttpMethod();
-        if (HttpMethod.GET.equals(httpMethod))
+        Response returnedResponse;
+        switch (restRequest.getHttpMethod())
        {
-            returnedResponse = onRequest().get(restRequest.getPath(), restRequest.getPathParams()).andReturn();
-        }
-        else if (HttpMethod.DELETE.equals(httpMethod))
-        {
-            returnedResponse = onRequest().delete(restRequest.getPath(), restRequest.getPathParams()).andReturn();
-        }
-        else if (HttpMethod.HEAD.equals(httpMethod))
-        {
-            returnedResponse = onRequest().head(restRequest.getPath(), restRequest.getPathParams()).andReturn();
-        }
-        else if (HttpMethod.OPTIONS.equals(httpMethod))
-        {
-            returnedResponse = onRequest().options(restRequest.getPath(), restRequest.getPathParams()).andReturn();
-        }
-        else if (HttpMethod.POST.equals(httpMethod))
-        {
-            returnedResponse = onRequest().body(restRequest.getBody())
-                                          .post(restRequest.getPath(), restRequest.getPathParams()).andReturn();
-        }
-        else if (HttpMethod.PUT.equals(httpMethod))
-        {
-            returnedResponse = onRequest().body(restRequest.getBody())
-                                          .contentType(ContentType.JSON.withCharset(restRequest.getContentType()))
-                                          .put(restRequest.getPath(), restRequest.getPathParams()).andReturn();
-        }
-        else if (HttpMethod.TRACE.equals(httpMethod))
-        {
-            returnedResponse = onRequest().get(restRequest.getPath(), restRequest.getPathParams()).andReturn();
-        }
-        else
-        {
-            returnedResponse = onRequest().get(restRequest.getPath(), restRequest.getPathParams()).andReturn();
+            case GET:
+                returnedResponse = onRequest().get(restRequest.getPath(), restRequest.getPathParams()).andReturn();
+                break;
+            case DELETE:
+                returnedResponse = onRequest().delete(restRequest.getPath(), restRequest.getPathParams()).andReturn();
+                break;
+            case HEAD:
+                returnedResponse = onRequest().head(restRequest.getPath(), restRequest.getPathParams()).andReturn();
+                break;
+            case OPTIONS:
+                returnedResponse = onRequest().options(restRequest.getPath(), restRequest.getPathParams()).andReturn();
+                break;
+            case POST:
+                returnedResponse = onRequest().body(restRequest.getBody())
+                        .post(restRequest.getPath(), restRequest.getPathParams()).andReturn();
+                break;
+            case PUT:
+                returnedResponse = onRequest().body(restRequest.getBody())
+                        .contentType(ContentType.JSON.withCharset(restRequest.getContentType()))
+                        .put(restRequest.getPath(), restRequest.getPathParams()).andReturn();
+                break;
+            case TRACE:
+                returnedResponse = onRequest().get(restRequest.getPath(), restRequest.getPathParams()).andReturn();
+                break;
+            default:
+                returnedResponse = onRequest().get(restRequest.getPath(), restRequest.getPathParams()).andReturn();
+                break;
        }

        logResponseInformation(restRequest, returnedResponse);
@@ -687,22 +680,17 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
        }
        else
        {
-            if (returnedResponse.asString().isEmpty())
-            {
-                LOG.info("On {} {}, received the following response \n{}", restRequest.getHttpMethod(), restRequest.getPath(),
-                        returnedResponse.getStatusCode());
-            }
-            else if (returnedResponse.getContentType().contains("image/png"))
+            if (returnedResponse.getContentType().contains("image/png"))
            {
                LOG.info("On {} {}, received the response with an image and headers: \n{}", restRequest.getHttpMethod(), restRequest.getPath(),
-                        returnedResponse.getHeaders().toString());
+                    returnedResponse.getHeaders().toString());
            }
-            else if (returnedResponse.getContentType().contains("application/json"))
+            else if (returnedResponse.getContentType().contains("application/json") && !returnedResponse.asString().isEmpty())
            {
                LOG.info("On {} {}, received the following response \n{}", restRequest.getHttpMethod(), restRequest.getPath(),
-                        Utility.prettyPrintJsonString(returnedResponse.asString()));
+                    Utility.prettyPrintJsonString(returnedResponse.asString()));
            }
-            else if (returnedResponse.getContentType().contains("application/xml"))
+            else if (returnedResponse.getContentType().contains("application/xml") && !returnedResponse.asString().isEmpty())
            {
                String response = parseXML(returnedResponse);
                LOG.info("On {} {}, received the following response \n{}", restRequest.getHttpMethod(), restRequest.getPath(), response);
@@ -710,7 +698,7 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
            else
            {
                LOG.info("On {} {}, received the following response \n{}", restRequest.getHttpMethod(), restRequest.getPath(),
-                        ToStringBuilder.reflectionToString(returnedResponse.asString(), ToStringStyle.MULTI_LINE_STYLE));
+                    ToStringBuilder.reflectionToString(returnedResponse.asString(), ToStringStyle.MULTI_LINE_STYLE));
            }
        }
    }
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/assertion/ModelsCollectionAssertion.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/assertion/ModelsCollectionAssertion.java
@@ -30,10 +30,7 @@ import static org.alfresco.utility.report.log.Step.STEP;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;

 import org.alfresco.rest.core.IRestModelsCollection;
 import org.alfresco.utility.exception.TestConfigurationException;
@@ -120,7 +117,7 @@ public class ModelsCollectionAssertion<C>
    return (C) modelCollection;
  }

-  @SuppressWarnings("unchecked")
+    @SuppressWarnings("unchecked")
  public C entriesListDoesNotContain(String key, String value)
  {
    boolean exist = false;
@@ -146,53 +143,6 @@ public class ModelsCollectionAssertion<C>
    return (C) modelCollection;
  }

-  public C entrySetContains(String key, String... expectedValues)
-  {
-    return entrySetContains(key, Arrays.stream(expectedValues).collect(Collectors.toSet()));
-  }
-
-  @SuppressWarnings("unchecked")
-  public C entrySetContains(String key, Collection<String> expectedValues)
-  {
-    Collection<String> actualValues = ((List<Model>) modelCollection.getEntries()).stream()
-        .map(model -> extractValueAsString(model, key))
-        .collect(Collectors.toSet());
-
-    Assert.assertTrue(actualValues.containsAll(expectedValues), String.format("Entry with key: \"%s\" is expected to contain values: %s, but actual values are: %s",
-        key, expectedValues, actualValues));
-
-    return (C) modelCollection;
-  }
-
-  @SuppressWarnings("unchecked")
-  public C entrySetMatches(String key, Collection<String> expectedValues)
-  {
-    Collection<String> actualValues = ((List<Model>) modelCollection.getEntries()).stream()
-        .map(model -> extractValueAsString(model, key))
-        .collect(Collectors.toSet());
-
-    Assert.assertEqualsNoOrder(actualValues, expectedValues, String.format("Entry with key: \"%s\" is expected to match values: %s, but actual values are: %s",
-        key, expectedValues, actualValues));
-
-    return (C) modelCollection;
-  }
-
-  private String extractValueAsString(Model model, String key)
-  {
-    String fieldValue;
-    Object modelObject = loadModel(model);
-    try {
-      ObjectMapper mapper = new ObjectMapper();
-      String jsonInString = mapper.writeValueAsString(modelObject);
-      fieldValue = JsonPath.with(jsonInString).get(key);
-    } catch (Exception e) {
-      throw new TestConfigurationException(String.format(
-          "You try to assert field [%s] that doesn't exist in class: [%s]. Exception: %s, Please check your code!",
-          key, getClass().getCanonicalName(), e.getMessage()));
-    }
-    return fieldValue;
-  }
-
  @SuppressWarnings("unchecked")
  public C entriesListDoesNotContain(String key)
  {
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestCategoryModel.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestCategoryModel.java
@@ -52,11 +52,6 @@ This must be unique within the parent category.
    */
    private long count;

-    /**
-     The path to this category.
-     */
-    private String path;
-
    public String getId()
    {
        return this.id;
@@ -107,14 +102,6 @@ This must be unique within the parent category.
        this.count = count;
    }

-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
    @Override
    public boolean equals(Object o)
    {
@@ -139,7 +126,6 @@ This must be unique within the parent category.
                ", parentId='" + parentId + '\'' +
                ", hasChildren=" + hasChildren +
                ", count=" + count +
-                ", path=" + path +
                '}';
    }

--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestErrorModel.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestErrorModel.java
@@ -60,7 +60,7 @@ public class RestErrorModel
    public static String INVALID_MAXITEMS = "Invalid paging parameter maxItems:%s";
    public static String INVALID_SKIPCOUNT = "Invalid paging parameter skipCount:%s";
    public static String INVALID_TAG = "Tag name must not contain %s char sequence";
-    public static String BLANK_TAG = "New tag cannot be blank";
+    public static String EMPTY_TAG = "New tag cannot be null";
    public static String UNKNOWN_ROLE = "Unknown role '%s'";
    public static String ALREADY_Site_MEMBER = "%s is already a member of site %s";
    public static String ALREADY_INVITED = "%s is already invited to site %s";
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
suneet.gupta	e737daa801	Addressed review comments	2023-03-01 11:21:24 +05:30
suneet.gupta	640a1120fd	Addressed review comments	2023-02-28 20:07:34 +05:30
suneet.gupta	803cea84e3	Addressed review comments	2023-02-28 17:16:54 +05:30
suneet.gupta	db2da8338a	Merge branch 'master' of github.com:Alfresco/alfresco-community-repo into ACS-4636_TagCreationCountIssue	2023-02-27 20:51:22 +05:30
suneet.gupta	bb5e4d42ac	Addressed review comments	2023-02-27 20:00:29 +05:30
atkumar	dbe0d75764	Addressed review comments.	2023-02-27 19:09:42 +05:30
pjoshi31	093bee9ace	reverting getTags	2023-02-23 17:12:27 +05:30
pjoshi31	e1974e6b26	Setted count on create endpoint	2023-02-23 16:51:57 +05:30