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

* ACS-8298 Bump bouncycastle, commons-lang3, commons-io, commons-compress, xmlbeans, tika, poi

* ACS-8298 Bump commons-compress to 1.26.2

* ACS-8298 Add commons-compress to tas-restapi

* ACS-8298 Exclude commons-lang3

* ACS-8298 Remove exclusion

.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"

.github/workflows/ci.yml

@@ -23,12 +23,8 @@ 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
-  AUTH0_CLIENT_ID: ${{ secrets.AUTH0_OIDC_ADMIN_CLIENT_ID }}
-  AUTH0_CLIENT_SECRET: ${{ secrets.AUTH0_OIDC_CLIENT_SECRET }}
-  AUTH0_ADMIN_PASSWORD: ${{ secrets.AUTH0_OIDC_ADMIN_PASSWORD }}
 
 jobs:
   prepare:
@@ -36,117 +32,38 @@ 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@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - id: changed-files
-        uses: Alfresco/alfresco-build-tools/.github/actions/github-list-changes@v6.1.0
-        with:
-          write-list-to-env: true
-      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v6.1.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - name: "Prepare maven cache and check compilation"
+      - name: "Prepare environment"
         run: bash ./scripts/ci/prepare.sh
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
 
-  veracode_sca:
+  veracode:
     name: "Source Clear Scan (SCA)"
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
-      (github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request') &&
+      ((github.ref_name == 'master' || contains(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@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v7.0.0
-        continue-on-error: true
+      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v1.30.0
         with:
           srcclr-api-token: ${{ secrets.SRCCLR_API_TOKEN }}
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
-
-  veracode_sast:
-    name: "Pipeline SAST Scan"
-    runs-on: ubuntu-latest
-    needs: [prepare]
-    if: >
-      (github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request') &&
-      github.actor != 'dependabot[bot]' &&
-      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
-    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/github-download-file@v7.0.0
-        with:
-          token: ${{ secrets.BOT_GITHUB_TOKEN }}
-          repository: "Alfresco/veracode-baseline-archive"
-          file-path: "alfresco-community-repo/alfresco-community-repo-baseline.json"
-          target: "baseline.json"
-      - name: "Build"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: |
-          bash ./scripts/ci/init.sh
-          bash ./scripts/ci/build.sh
-      - name: "Run SAST Scan"
-        uses: veracode/Veracode-pipeline-scan-action@v1.0.16
-        with:
-          vid: ${{ secrets.VERACODE_API_ID }}
-          vkey: ${{ secrets.VERACODE_API_KEY }}
-          file: "packaging/war/target/alfresco.war"
-          fail_build: true
-          project_name: alfresco-community-repo
-          issue_details: true
-          veracode_policy_name: Alfresco Default
-          summary_output: true
-          summary_output_file: results.json
-          summary_display: true
-          baseline_file: baseline.json
-      - name: Upload scan result
-        if: success() || failure()
-        run: zip readable_output.zip results.json
-      - name: Upload Artifact
-        if: success() || failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Veracode Pipeline-Scan Results (Human Readable)
-          path: readable_output.zip
-      - name: "Clean Maven cache"
-        run: bash ./scripts/ci/cleanup_cache.sh
-
-  pmd_scan:
-    name: "PMD Scan"
-    runs-on: ubuntu-latest
-    needs: [prepare]
-    if: >
-      github.event_name == 'pull_request' &&
-      !contains(github.event.head_commit.message, '[skip pmd]') &&
-      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
-    steps:
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
-      - uses: Alfresco/ya-pmd-scan@v4.0.0
-        with:
-          classpath-build-command: "mvn test-compile -ntp -Pags -pl \"-:alfresco-community-repo-docker\""
-
+        
   all_unit_tests_suite:
     name: "Core, Data-Model, Repository - AllUnitTestsSuite - Build and test"
     runs-on: ubuntu-latest
@@ -154,12 +71,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@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run tests"
@@ -176,7 +92,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:
@@ -194,10 +110,9 @@ jobs:
     env:
       REQUIRES_INSTALLED_ARTIFACTS: true
     steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -217,21 +132,20 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
-      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
+      (((github.ref_name == 'master' || contains(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')
+      !contains(github.event.head_commit.message, '[force]')
     strategy:
       fail-fast: false
       matrix:
         version: ['10.2.18', '10.4', '10.5']
     steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: Run MariaDB ${{ matrix.version }} database
@@ -248,17 +162,16 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
-      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request') &&
+      (((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request') &&
       !contains(github.event.head_commit.message, '[skip db]')) ||
       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@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run MariaDB 10.6 database"
@@ -275,17 +188,16 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
-      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request') &&
+      (((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request') &&
       !contains(github.event.head_commit.message, '[skip db]')) ||
       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@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run MySQL 8 database"
@@ -297,60 +209,33 @@ 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: >
-      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) && github.event_name != 'pull_request' &&
+      (((github.ref_name == 'master' || contains(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')
+      !contains(github.event.head_commit.message, '[force]')
     steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.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@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
-      - name: "Init"
-        run: bash ./scripts/ci/init.sh
-      - name: "Run PostgreSQL 14.9 database"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
-        env:
-          POSTGRES_VERSION: 14.9
-      - name: "Run tests"
-        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
-      - name: "Clean Maven cache"
-        run: bash ./scripts/ci/cleanup_cache.sh
-
-  repository_postgresql_15_4_tests:
-    name: "Repository - PostgreSQL 15.4 tests"
+  repository_postgresql_14_4_tests:
+    name: "Repository - PostgreSQL 14.4 tests"
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
@@ -358,18 +243,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@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.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"
@@ -382,12 +266,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@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run ActiveMQ"
@@ -398,13 +281,13 @@ jobs:
         run: bash ./scripts/ci/cleanup_cache.sh
 
   repository_app_context_test_suites:
-    name: Repository - ${{ matrix.testSuite }} ${{ matrix.idp }}
+    name: Repository - ${{ matrix.testSuite }}
     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')
+      !contains(github.event.head_commit.message, '[force]')
     strategy:
       fail-fast: false
       matrix:
@@ -419,12 +302,7 @@ jobs:
             compose-profile: with-transform-core-aio
           - testSuite: AppContext05TestSuite
             compose-profile: with-sso
-            mvn-options: '-Didentity-service.auth-server-url=http://${HOST_IP}:8999/auth -Dauthentication.chain=identity-service1:identity-service,alfrescoNtlm1:alfrescoNtlm'
-            idp: Keycloak
-          - testSuite: AppContext05TestSuite
-            compose-profile: default
-            mvn-options: '-Didentity-service.auth-server-url=https://dev-ps-alfresco.auth0.com/ -Dauthentication.chain=identity-service1:identity-service,alfrescoNtlm1:alfrescoNtlm -Didentity-service.audience=http://localhost:3000 -Didentity-service.resource=${AUTH0_CLIENT_ID} -Didentity-service.credentials.secret=${AUTH0_CLIENT_SECRET} -Didentity-service.public-client=false -Didentity-service.realm= -Didentity-service.client-id.validation.disabled=false -Dadmin.user=admin@alfresco.com -Dadmin.password=${AUTH0_ADMIN_PASSWORD} -Dauth0.enabled=true -Dauth0.admin.password=${AUTH0_ADMIN_PASSWORD} -Didentity-service.principal-attribute=nickname'
-            idp: Auth0
+            mvn-options: '"-Didentity-service.auth-server-url=http://localhost:8999/auth"'
           - testSuite: AppContext06TestSuite
             compose-profile: with-transform-core-aio
           - testSuite: AppContextExtraTestSuite
@@ -434,33 +312,14 @@ jobs:
           - 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'
     steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.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: "Set the host IP"
-        run: echo "HOST_IP=$(hostname  -I | cut -f1 -d' ')" >> $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: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
       - name: "Run tests"
@@ -473,11 +332,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
-      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) &&
+      (((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request') &&
       !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:
@@ -509,10 +368,9 @@ jobs:
     env:
       REQUIRES_LOCAL_IMAGES: true
     steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -529,9 +387,6 @@ jobs:
         id: tests
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: mvn -B verify -f packaging/tests/${{ matrix.pom-dir }}/pom.xml -Pall-tas-tests,${{ matrix.test-profile }} -Denvironment=default -DrunBugs=false
-      - name: "Print output after success"
-        if: ${{ always() && steps.tests.outcome == 'success' }}
-        run: ${TAS_SCRIPTS}/output_tests_run.sh "packaging/tests/${{ matrix.pom-dir }}"
       - name: "Print output after failure"
         if: ${{ always() && steps.tests.outcome == 'failure' }}
         run: ${TAS_SCRIPTS}/output_logs_for_failures.sh "packaging/tests/${{ matrix.pom-dir }}"
@@ -545,15 +400,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@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.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
@@ -565,11 +419,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
-      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) &&
+      (((github.ref_name == 'master' || contains(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')
+      !contains(github.event.head_commit.message, '[force]')
     strategy:
       fail-fast: false
       matrix:
@@ -577,10 +431,9 @@ jobs:
     env:
       REQUIRES_INSTALLED_ARTIFACTS: true
     steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -597,11 +450,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
-      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) &&
+      (((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request') &&
       !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:
@@ -609,10 +462,9 @@ jobs:
     env:
       REQUIRES_INSTALLED_ARTIFACTS: true
     steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -629,18 +481,17 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
-      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) &&
+      (((github.ref_name == 'master' || contains(github.ref_name, 'release/') || github.event_name == 'pull_request') &&
       !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@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -657,7 +508,7 @@ jobs:
         run: mvn -B test -pl :alfresco-governance-services-automation-community-rest-api -Dskip.automationtests=false -Pags -Pall-tas-tests
       - name: "Configure AWS credentials"
         if: ${{ always() }}
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.AGS_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AGS_AWS_SECRET_ACCESS_KEY }}
@@ -670,29 +521,4 @@ jobs:
           aws s3 cp --acl private solr.log s3://ags-travis-artifacts/community/${{ github.run_number }}/AGS-Community-Rest-API-Tests/solr.log
           aws s3 cp --acl private ./amps/ags/rm-automation/rm-automation-community-rest-api/target/reports/rm-automation-community-rest-api.log s3://ags-travis-artifacts/community/${{ github.run_number }}/AGS-Community-Rest-API-Tests/rm-automation-community-rest-api.log
       - name: "Clean Maven cache"
-        run: bash ./scripts/ci/cleanup_cache.sh
-
-  ags_start_api_explorer:
-    name: "Test Tomcat deployment of api explorer"
-    runs-on: ubuntu-latest
-    needs: [ prepare ]
-    if: >
-      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) &&
-      !contains(github.event.head_commit.message, '[skip ags]')) ||
-      contains(github.event.head_commit.message, '[ags]')) &&
-      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
-    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
-      - name: "Build"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: |
-          bash ./scripts/ci/init.sh
-          bash ./scripts/ci/build.sh
-      - name: "Test Tomcat deployment"
-        run: |
-          mvn verify -Pags,start-api-explorer -DskipTests &
-          ${{ env.TAS_SCRIPTS }}/wait-for-alfresco-start.sh "http://localhost:8085/api-explorer"
+        run: bash ./scripts/ci/cleanup_cache.sh

.github/workflows/master_release.yml

@@ -27,19 +27,16 @@ jobs:
     runs-on: ubuntu-latest
     needs: [run_ci]
     if: >
-      !(failure() || cancelled()) &&
+      !failure() &&
       !contains(github.event.head_commit.message, '[no release]') &&
       github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0      
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.30.0
         with:
           username: ${{ env.GIT_USERNAME }}
           email: ${{ env.GIT_EMAIL }}
@@ -56,19 +53,16 @@ jobs:
     runs-on: ubuntu-latest
     needs: [push_to_nexus]
     if: >
-      !(failure() || cancelled()) &&
+      !failure() &&
       !contains(github.event.head_commit.message, '[no downstream]') &&
       github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0      
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.30.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.30.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.30.0
         with:
           username: ${{ env.GIT_USERNAME }}
           email: ${{ env.GIT_EMAIL }}
@@ -78,4 +72,4 @@ jobs:
         env:
           COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
       - name: "Clean Maven cache"
-        run: bash ./scripts/ci/cleanup_cache.sh
+        run: bash ./scripts/ci/cleanup_cache.sh

.gitignore

@@ -39,9 +39,6 @@ dependency-reduced-pom.xml
 
 hs_err_pid*
 
-# Development
-repository/scripts/hazelcast-init/alfresco-hazelcast-config.xml
-
 # Alfresco runtime
 alf_data
 

.pre-commit-config.yaml

@@ -1,14 +0,0 @@
-repos:
-  - repo: https://github.com/Yelp/detect-secrets
-    rev: v1.5.0
-    hooks:
-      - id: detect-secrets
-        args: ["--baseline", ".secrets.baseline"]
-  - repo: local
-    hooks:
-      - id: check-format-and-headers
-        name: Check format and headers and fix if necessary
-        entry: ./scripts/hooks/check-format-and-headers.sh
-        language: script
-        files: ".*.java"
-        pass_filenames: false

CONTRIBUTING.md

@@ -3,58 +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.
 
-The project uses [pre-commit](https://pre-commit.com/) to format code (with [Spotless](https://github.com/diffplug/spotless)), validate license headers and check for secrets (with [detect-secrets](https://github.com/Yelp/detect-secrets)). To install the pre-commit hooks then first install pre-commit and then run:
-```shell
-pre-commit install
-```
-When you make a commit then these hooks will run and check the modified files. If it makes changes then you can review them and then `git commit` again to accept the changes.
+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.
 
-#### Code Quality
-This project uses `spotless` that enforces `alfresco-formatter.xml` to ensure code quality.
-
-To check code-style violations you can use:
-```bash
-mvn spotless:check
-```
-To reformat files you can use:
-```bash
-mvn spotless:apply
-```
-
-#### Secret Detection
-
-We are using [detect-secrets](https://github.com/Yelp/detect-secrets) to try to avoid accidentally publishing secret keys.
-If you have pre-commit installed then this should run automatically when making a commit. Usually there should be no issues,
-but if it finds a potential issue (e.g. a high entropy string) then you will see the following:
-
-```shell
-Detect secrets...........................................................Failed
-- hook id: detect-secrets
-- exit code: 1
-
-ERROR: Potential secrets about to be committed to git repo!
-
-Secret Type: Secret Keyword
-Location:    test.txt:1
-```
-
-If this is a false positive and you actually want to commit the string then run these two commands:
-
-```shell
-detect-secrets scan --baseline .secrets.baseline
-detect-secrets audit .secrets.baseline
-```
-
-This will update the baseline file to include your new code and then allow you to review the detected secret and mark it as a false positive.
-Once you are finished then you can add `.secrets.baseline` to the staged changes and you should be able to create a commit.
-
-
-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.
+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).

README.md

@@ -1,6 +1,6 @@
 # alfresco-community-repo
 
-[![Build Status](https://github.com/Alfresco/alfresco-community-repo/actions/workflows/master_release.yml/badge.svg?branch=master)](https://github.com/Alfresco/alfresco-community-repo/actions/workflows/master_release.yml)
+[![Build Status](https://github.com/Alfresco/alfresco-community-repo/actions/workflows/master_release.yml/badge.svg?branch=7.3.1)](https://github.com/Alfresco/alfresco-community-repo/actions/workflows/master_release.yml)
 
 #### Alfresco Core
 
@@ -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.

alfresco-formatter.xml

@@ -1,401 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="23">
-    <profile kind="CodeFormatterProfile" name="Spotless" version="23">
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_if_empty"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_if_empty"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_if_empty"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_if_empty"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_annotations" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="next_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="49"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_constructor" value="next_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="999"/>
-        <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_if_empty"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_if_empty"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_if_empty"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_if_empty"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration" value="next_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="49"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="49"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="49"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_if_empty"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_if_empty"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="49"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_if_empty"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assertion_message" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_if_empty"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="999"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-    </profile>
-</profiles>

amps/ags/pom.xml

@@ -7,29 +7,21 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.2.2.4-SNAPSHOT</version>
+      <version>19.106</version>
    </parent>
 
    <modules>
       <module>rm-community</module>
+      <module>rm-automation</module>
    </modules>
 
-   <profiles>
-      <profile>
-         <id>all-tas-tests</id>
-         <modules>
-            <module>rm-automation</module>
-         </modules>
-      </profile>
-   </profiles>
-
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
       <license.update.dryrun>true</license.update.dryrun>
       <license.verbose>false</license.verbose>
-      <license.failOnNotUptodateHeader>true</license.failOnNotUptodateHeader>
+      <license.failOnNotUptodateHeader>false</license.failOnNotUptodateHeader>
    </properties>
 
    <build>

amps/ags/rm-automation/pom.xml

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

amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>23.2.2.4-SNAPSHOT</version>
+      <version>19.106</version>
    </parent>
 
    <build>
@@ -42,10 +42,15 @@
    </build>
 
    <dependencies>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-reload4j</artifactId>
+         <version>${dependency.slf4j.version}</version>
+         <scope>test</scope>
+      </dependency>
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi</artifactId>
-         <version>${project.version}</version>
          <exclusions>
             <exclusion>
                <groupId>org.alfresco.tas</groupId>
@@ -82,25 +87,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-jdk18on</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.bouncycastle</groupId>
-         <artifactId>bcpkix-jdk18on</artifactId>
+         <version>3.2.13</version>
       </dependency>
    </dependencies>
 </project>

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;

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;

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())
             {

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

@@ -26,7 +26,6 @@
  */
 package org.alfresco.rest.v0;
 
-import static org.apache.http.HttpStatus.SC_OK;
 import static org.testng.Assert.assertTrue;
 
 import java.io.UnsupportedEncodingException;
@@ -37,7 +36,6 @@ import java.util.List;
 import org.alfresco.rest.core.v0.BaseAPI;
 import org.alfresco.rest.rm.community.model.audit.AuditEntry;
 import org.alfresco.rest.rm.community.util.PojoUtility;
-import org.apache.http.HttpResponse;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.slf4j.Logger;
@@ -60,8 +58,6 @@ public class RMAuditAPI extends BaseAPI
     private static final String RM_AUDIT_API = "{0}rma/admin/rmauditlog";
     private static final String RM_AUDIT_LOG_API = RM_AUDIT_API + "?{1}";
 
-    private static final String RM_AUDIT_LOG_AS_RECORD = "{0}node/{1}/rmauditlog";
-
     /**
      * Returns a list of rm audit entries .
      *
@@ -88,21 +84,6 @@ public class RMAuditAPI extends BaseAPI
         return PojoUtility.jsonToObject(auditEntries, AuditEntry.class);
     }
 
-    /**
-     * Returns a list of rm audit entries .
-     *
-     * @param user     The username of the user to use.
-     * @param password The password of the user.
-     * @param size     Maximum number of log entries to return
-     * @return return All return log entries
-     */
-    public List<AuditEntry> getRMAuditLogAll(String user, String password, final int size) {
-        String parameters = "size=" + size;
-        JSONArray auditEntries =  doGetRequest(user, password,
-            MessageFormat.format(RM_AUDIT_LOG_API,"{0}", parameters)).getJSONObject("data").getJSONArray("entries");
-        return PojoUtility.jsonToObject(auditEntries, AuditEntry.class);
-    }
-
     /**
      * Clear the list of audit entries.
      *
@@ -119,19 +100,5 @@ public class RMAuditAPI extends BaseAPI
                 && getRMAuditLog(username, password, 100, null).size() == 2);
     }
 
-    /**
-     * Logs the Audit Log as Record.
-     *
-     * @param username The username of the user to use.
-     * @param password The password of the user.
-     * @param recNodeRef The Record Node reference for which Audit log should be created as record
-     * @param destinationNodeRef The Folder id Node reference where the html file should be placed
-     * @throws AssertionError If the API call didn't create the Audit Log as Record.
-     */
-    public HttpResponse logsAuditLogAsRecord(String username, String password, String recNodeRef, String destinationNodeRef) {
-        JSONObject requestParams = new JSONObject();
-        requestParams.put("destination", destinationNodeRef);
-        return doPostJsonRequest(username, password, SC_OK, requestParams, RM_AUDIT_LOG_AS_RECORD,recNodeRef);
-    }
 
 }

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

@@ -97,16 +97,4 @@ public class RecordFoldersAPI extends BaseAPI
         return null;
     }
 
-
-    public HttpResponse reOpenRecordFolder(String user, String password, String recordFolder)
-    {
-        String recNodeRef = getNodeRefSpacesStore() + contentService.getNodeRef(user, password, RM_SITE_ID, recordFolder);
-
-            JSONObject requestParams = new JSONObject();
-            requestParams.put("name", "openRecordFolder");
-            requestParams.put("nodeRef", recNodeRef);
-
-            return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
-        }
-
 }

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

@@ -360,25 +360,4 @@ public class RecordsAPI extends BaseAPI
     {
         return getNodeRefSpacesStore() + getItemNodeRef(username, password, recordPath + "/" + recordName);
     }
-
-    /**
-     * Reopens the record given as parameter
-     *
-     * @param user       the user declaring the document as record
-     * @param password   the user's password
-     * @param recordName the record name
-     * @return The HTTP Response.
-     */
-
-    public HttpResponse reOpenRecord(String user, String password, String recordName)
-    {
-        String recNodeRef = getNodeRefSpacesStore() + contentService.getNodeRef(user, password, RM_SITE_ID, recordName);
-
-        JSONObject requestParams = new JSONObject();
-        requestParams.put("name", "undeclareRecord");
-        requestParams.put("nodeRef", recNodeRef);
-
-        return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
-    }
-
 }

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/AuditHoldsTest.java

@@ -1,146 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.audit;
-import static java.util.Arrays.asList;
-import static org.alfresco.rest.rm.community.base.TestData.*;
-import static org.alfresco.rest.rm.community.model.audit.AuditEvents.ADD_TO_HOLD;
-import static org.alfresco.rest.rm.community.model.audit.AuditEvents.REMOVE_FROM_HOLD;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.core.IsNot.not;
-import static org.springframework.http.HttpStatus.CREATED;
-import static org.testng.AssertJUnit.*;
-
-import java.util.Collections;
-import java.util.List;
-import org.alfresco.dataprep.CMISUtil;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-import org.alfresco.rest.rm.community.model.audit.AuditEvents;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.rm.community.model.recordfolder.RecordFolder;
-import org.alfresco.rest.rm.community.model.user.UserRoles;
-import org.alfresco.rest.v0.HoldsAPI;
-import org.alfresco.rest.v0.service.RMAuditService;
-import org.alfresco.rest.v0.service.RoleService;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-public class AuditHoldsTest extends BaseRMRestTest {
-    private final String PREFIX = generateTestPrefix(AuditAddToHoldTests.class);
-    private final String HOLD1 = PREFIX + "hold1";
-    private SiteModel publicSite;
-    private FileModel testFile;
-    @Autowired
-    private RMAuditService rmAuditService;
-    @Autowired
-    private HoldsAPI holdsAPI;
-    @Autowired
-    private RoleService roleService;
-    private UserModel rmAdmin;
-    private RecordCategory recordCategory;
-    private RecordCategoryChild recordFolder1,recordFolder2;
-    private List<AuditEntry> auditEntries;
-    private String hold1NodeRef;
-    public static final String RECORD_FOLDER_THREE = "record-folder-three";
-    @BeforeClass(alwaysRun = true)
-    public void preconditionForAuditAddToHoldTests()
-    {
-        createRMSiteIfNotExists();
-        rmAdmin = roleService.createUserWithRMRole(UserRoles.ROLE_RM_ADMIN.roleId);
-
-        STEP("Create a hold");
-        hold1NodeRef = holdsAPI.createHoldAndGetNodeRef(rmAdmin.getUsername(), rmAdmin.getPassword(), HOLD1, HOLD_REASON,
-            HOLD_DESCRIPTION);
-
-        STEP("Create a collaboration site with a test file.");
-        publicSite = dataSite.usingAdmin().createPublicRandomSite();
-        testFile = dataContent.usingAdmin().usingSite(publicSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        STEP("Create a record category with 2 folders and 1 record");
-        recordCategory = createRootCategory(getRandomName("recordCategory"));
-        recordFolder1 = createRecordFolder(recordCategory.getId(), PREFIX + "recFolder1");
-        recordFolder2 = createRecordFolder(recordCategory.getId(), PREFIX + "recFolder2");
-        Record recordToBeAdded = createElectronicRecord(recordFolder1.getId(), PREFIX + "record");
-        assertStatusCode(CREATED);
-
-        STEP("Add some items to the hold, then remove them from the hold");
-        final List<String> itemsList = asList(testFile.getNodeRefWithoutVersion(), recordToBeAdded.getId(), recordFolder2.getId());
-        final List<String> holdsList = Collections.singletonList(HOLD1);
-        holdsAPI.addItemToHold(rmAdmin.getUsername(), rmAdmin.getPassword(), recordToBeAdded.getId(), HOLD1);
-        holdsAPI.removeItemsFromHolds(rmAdmin.getUsername(), rmAdmin.getPassword(), itemsList, holdsList);
-
-        STEP("Delete the record folder that was held");
-        getRestAPIFactory().getRecordFolderAPI().deleteRecordFolder(recordFolder2.getId());
-
-        STEP("Rename the parent of the record that was held");
-        RecordFolder recordFolder = RecordFolder.builder().name(RECORD_FOLDER_THREE).build();
-        getRestAPIFactory().getRecordFolderAPI().updateRecordFolder(recordFolder, recordFolder1.getId());
-    }
-    /**
-     * Data provider with hold events that have links to held items
-     *
-     * @return the hold events
-     */
-    @DataProvider (name = "holdsEvents")
-    public Object[][] getHoldEvents()
-    {
-        return new AuditEvents[][]
-            {
-                { ADD_TO_HOLD },
-                { REMOVE_FROM_HOLD }
-            };
-    }
-    @Test (dataProvider = "holdsEvents")
-    public void checkItemPathLink(AuditEvents event) {
-        auditEntries = rmAuditService.getAuditEntriesFilteredByEvent(getAdminUser(), event);
-        assertFalse("Audit results should not be empty",auditEntries.size()==0);
-        final String auditedEvent = event + " - " + testFile.getName();
-        assertTrue("Audit results should contain one " + auditedEvent + " event",auditEntries.stream().anyMatch(e -> e.getEvent().startsWith(event.eventDisplayName)));
-        STEP("Check the audit log contains only an entry for add to hold.");
-        assertThat(auditEntries, is(not(empty())));
-    }
-    @AfterClass(alwaysRun = true)
-    private void cleanup() {
-        dataSite.usingAdmin().deleteSite(publicSite);
-        deleteRecordFolder(recordFolder1.getId());
-        deleteRecordFolder(recordFolder2.getId());
-        deleteRecordCategory(recordCategory.getId());
-        rmAuditService.clearAuditLog();
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/ElectronicRecordAuditLogTest.java

@@ -1,244 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.audit;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.v0.RMAuditAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.Utility;
-import org.alfresco.utility.model.UserModel;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.util.EntityUtils;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.AssertJUnit;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.ASPECTS_COMPLETED_RECORD;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createRecordModel;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.fail;
-
-public class ElectronicRecordAuditLogTest extends BaseRMRestTest {
-
-    private Optional<UserModel> rmAdmin;
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RMAuditAPI auditLog;
-    @Autowired
-    private RecordsAPI recordApi;
-    /* electronic record details */
-    private static final String AUDIT_ELECTRONIC_RECORD = generateTestPrefix(ElectronicRecordAuditLogTest.class) + "electronic record";
-    private static final String AUDIT_COMPLETE_REOPEN_ELECTRONIC_RECORD = "Complete Reopen Electronic Record";
-    public static final String TITLE = "Title";
-    public static final String DESCRIPTION = "Description";
-    private RecordCategory category1;
-    private RecordCategoryChild recordFolder1;
-    private Record electronicRecord, electronicRecord2;
-
-    @BeforeClass(alwaysRun = true)
-    public void electronicRecordsAuditLogSetup()
-    {
-        createRMSiteIfNotExists();
-        rmAdmin = Optional.ofNullable(getDataUser().createRandomTestUser());
-        rmRolesAndActionsAPI.assignRoleToUser(
-            getDataUser().usingAdmin().getAdminUser().getUsername(),
-            getDataUser().usingAdmin().getAdminUser().getPassword(),
-            rmAdmin.get().getUsername(),
-            "Administrator");
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-        category1 = createRootCategory(TITLE, DESCRIPTION);
-        recordFolder1 = createFolder(category1.getId(),TITLE);
-
-        electronicRecord = createElectronicRecord(recordFolder1.getId(),AUDIT_ELECTRONIC_RECORD,rmAdmin.get());
-    }
-
-    @Test(description = "Audit log for newly filed electronic record")
-    @AlfrescoTest(jira="RM-4303")
-    public void newElectronicRecordAudit() {
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-
-        // newly created record contains 2 events: "file to" and metadata update
-        // the order in which object creation and metadata update are listed isn't always identical due to
-        // both happening in the same transaction
-        assertTrue("File To Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("File to")));
-        assertTrue("Updated metadata Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-    }
-
-    @Test
-        (
-            dependsOnMethods = "newElectronicRecordAudit",
-            description = "Viewing electronic record audit log is itself an auditable event"
-        )
-    @AlfrescoTest(jira="RM-4303")
-    public void electronicRecordAuditIsEvent()
-    {
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Audit View Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Audit View")));
-    }
-
-    @Test
-        (
-            dependsOnMethods = "electronicRecordAuditIsEvent",
-            description = "Rename electronic record is an edit metadata event"
-        )
-    @AlfrescoTest(jira="RM-4303")
-    public void renameElectronicRecord() {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-        Record renameElectronicRecord = createRecordModel("edited " + electronicRecord.getName(), "", "");
-
-        // rename record
-        getRestAPIFactory().getRecordsAPI().updateRecord(renameElectronicRecord, electronicRecord.getId());
-        assertStatusCode(OK);
-
-        // we expect 1 new event: "metadata update"
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Updated metadata Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-    }
-
-    @Test (
-        dependsOnMethods = "newElectronicRecordAudit",
-        description = "Complete and reopen electronic record")
-    @AlfrescoTest(jira="RM-4303")
-    public void completeAndReopenElectronicRecord() {
-        electronicRecord2 = createElectronicRecord(recordFolder1.getId(),AUDIT_COMPLETE_REOPEN_ELECTRONIC_RECORD);
-
-        // complete record
-        recordApi.completeRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-            electronicRecord2.getName());
-
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-                org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-                List<String> aspects = recordsAPI.getRecord(electronicRecord2.getId()).getAspectNames();
-                // a record must be completed
-                assertTrue("Record is not completed.",aspects.contains(ASPECTS_COMPLETED_RECORD));
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Complete Record Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Complete Record")));
-
-        // Reopen record
-        recordApi.reOpenRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-            electronicRecord2.getName());
-
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-                org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-                List<String> aspects = recordsAPI.getRecord(electronicRecord2.getId()).getAspectNames();
-                // a record mustn't be completed
-                assertFalse(aspects.contains(ASPECTS_COMPLETED_RECORD));
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Reopen Record Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Reopen Record")));
-    }
-
-    @Test
-        (
-            dependsOnMethods = "completeAndReopenElectronicRecord",
-            description = "File electronic record's audit log as record"
-        )
-    @AlfrescoTest(jira="RM-4303")
-    public void fileElectronicRecordAuditLogAsRecord()
-    {
-        // audit log is stored in the same folder, refresh it so that it appears in the list
-        HttpResponse auditRecordHttpResponse = auditLog.logsAuditLogAsRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-        getRecordNodeRef(electronicRecord2.getId()),getFolderNodeRef(recordFolder1.getId()));
-        JSONObject auditRecordProperties = getAuditPropertyValues(auditRecordHttpResponse);
-        Record auditRecord = getRestAPIFactory().getRecordsAPI().getRecord(auditRecordProperties.get("record").toString()
-            .replace("workspace://SpacesStore/",""));
-        // check audit log
-        AssertJUnit.assertTrue(auditRecordProperties.get("recordName").toString().endsWith(".html"));
-        AssertJUnit.assertTrue(auditRecord.getAspectNames().stream().noneMatch(x -> x.startsWith(ASPECTS_COMPLETED_RECORD)));
-    }
-
-    private String getFolderNodeRef(String folderId) {
-        return "workspace://SpacesStore/" + folderId;
-    }
-
-    private String getRecordNodeRef(String recordId) {
-        return "workspace/SpacesStore/" + recordId;
-    }
-
-    private JSONObject getAuditPropertyValues(HttpResponse httpResponse) {
-        HttpEntity entity = httpResponse.getEntity();
-        String responseString = null;
-        try {
-            responseString = EntityUtils.toString(entity, "UTF-8");
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        JSONObject result = new JSONObject(responseString);
-        return result;
-    }
-
-    @AfterMethod
-    private void closeAuditLog() {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-    }
-
-    @AfterClass(alwaysRun = true)
-    private void electronicRecordAuditLogCleanup() {
-        deleteRecord(electronicRecord.getId());
-        deleteRecordFolder(recordFolder1.getId());
-        deleteRecordCategory(category1.getId());
-        dataUser.usingAdmin().deleteUser(new UserModel(rmAdmin.get().getUsername(), rmAdmin.get().getPassword()));
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/NonElectronicRecordAuditLogTest.java

@@ -1,246 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.audit;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.v0.RMAuditAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.Utility;
-import org.alfresco.utility.model.UserModel;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.util.EntityUtils;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.AssertJUnit;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.ASPECTS_COMPLETED_RECORD;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createRecordModel;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.fail;
-
-
-public class NonElectronicRecordAuditLogTest extends BaseRMRestTest {
-    private Optional<UserModel> rmAdmin;
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RMAuditAPI auditLog;
-    @Autowired
-    private RecordsAPI recordApi;
-    private RecordCategory category1;
-    private RecordCategoryChild recordFolder1;
-    private Record nonElectronicRecord , nonElectronicRecord2;
-    private static final String AUDIT_NON_ELECTRONIC_RECORD = generateTestPrefix(NonElectronicRecordAuditLogTest.class) + "non electronic record";
-    private static final String AUDIT_COMPLETE_REOPEN_NON_ELECTRONIC_RECORD = "Complete Reopen Non-Electronic Record";
-    public static final String TITLE = "Title";
-    public static final String DESCRIPTION = "Description";
-
-    @BeforeClass(alwaysRun = true)
-    public void nonElectronicRecordAuditLogSetup()
-    {
-        createRMSiteIfNotExists();
-        rmAdmin = Optional.ofNullable(getDataUser().createRandomTestUser());
-        rmRolesAndActionsAPI.assignRoleToUser(
-                getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(),
-                rmAdmin.get().getUsername(),
-                "Administrator");
-
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-        category1 = createRootCategory(TITLE, DESCRIPTION);
-        recordFolder1 = createFolder(category1.getId(),TITLE);
-        nonElectronicRecord = createNonElectronicRecord(recordFolder1.getId(),AUDIT_NON_ELECTRONIC_RECORD,rmAdmin.get());
-
-    }
-
-    @Test(description = "Audit log for newly filed non-electronic record")
-    @AlfrescoTest(jira="RM-4303")
-    public void newNonElectronicRecordAudit()
-    {
-
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-
-        // newly created record contains 3 events: "created object", "file to" and metadata update
-        assertTrue("File To Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("File to")));
-        assertTrue("Updated metadata Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-        assertTrue("Created Object Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Created Object")));
-    }
-
-    @Test
-            (
-                    dependsOnMethods = "newNonElectronicRecordAudit",
-                    description = "Viewing Non electronic record audit log is itself an auditable event"
-            )
-    @AlfrescoTest(jira="RM-4303")
-    public void nonElectronicRecordAuditIsEvent()
-    {
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Audit View Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Audit View")));
-
-    }
-
-    @Test
-            (
-                    dependsOnMethods = "nonElectronicRecordAuditIsEvent",
-                    description = "Rename electronic record is an edit metadata event"
-            )
-    @AlfrescoTest(jira="RM-4303")
-    public void renameNonElectronicRecord()
-    {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-        Record renameNonElectronicRecord = createRecordModel("edited " + nonElectronicRecord.getName(), "", "");
-
-        // rename record
-        getRestAPIFactory().getRecordsAPI().updateRecord(renameNonElectronicRecord, nonElectronicRecord.getId());
-        assertStatusCode(OK);
-
-        // we expect 1 new event: "metadata update"
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Updated metadata Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-
-    }
-
-    @Test (dependsOnMethods = "newNonElectronicRecordAudit",description = "Complete and reopen electronic record")
-    @AlfrescoTest(jira="RM-4303")
-    public void completeAndReopenNonElectronicRecord()
-    {
-        nonElectronicRecord2 = createNonElectronicRecord(recordFolder1.getId(),AUDIT_COMPLETE_REOPEN_NON_ELECTRONIC_RECORD);
-
-        // complete record
-        recordApi.completeRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-                nonElectronicRecord2.getName());
-
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-                org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-                List<String> aspects = recordsAPI.getRecord(nonElectronicRecord2.getId()).getAspectNames();
-                // a record must be completed
-                assertTrue("Record is not completed.",aspects.contains(ASPECTS_COMPLETED_RECORD));
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        List<AuditEntry> auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Complete Record Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Complete Record")));
-
-        // Reopen record
-        recordApi.reOpenRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-                nonElectronicRecord2.getName());
-
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-                org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-                List<String> aspects = recordsAPI.getRecord(nonElectronicRecord2.getId()).getAspectNames();
-                // a record mustn't be completed
-                assertFalse(aspects.contains(ASPECTS_COMPLETED_RECORD));
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        auditEntries= auditLog.getRMAuditLogAll(getAdminUser().getUsername(),getAdminUser().getPassword(),100);
-        assertTrue("Reopen Record Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Reopen Record")));
-
-    }
-    @Test
-            (
-                    dependsOnMethods = "completeAndReopenNonElectronicRecord",
-                    description = "File electronic record's audit log as record"
-            )
-    @AlfrescoTest(jira="RM-4303")
-    public void fileNonElectronicRecordAuditLogAsRecord()
-    {
-        // audit log is stored in the same folder, refresh it so that it appears in the list
-        HttpResponse auditRecordHttpResponse = auditLog.logsAuditLogAsRecord(rmAdmin.get().getUsername(),rmAdmin.get().getPassword(),
-                getRecordNodeRef(nonElectronicRecord2.getId()),getFolderNodeRef(recordFolder1.getId()));
-        JSONObject auditRecordProperties = getAuditPropertyValues(auditRecordHttpResponse);
-        Record auditRecord = getRestAPIFactory().getRecordsAPI().getRecord(auditRecordProperties.get("record").toString()
-                .replace("workspace://SpacesStore/",""));
-        // check audit log
-        AssertJUnit.assertTrue(auditRecordProperties.get("recordName").toString().endsWith(".html"));
-        AssertJUnit.assertTrue(auditRecord.getAspectNames().stream().noneMatch(x -> x.startsWith(ASPECTS_COMPLETED_RECORD)));
-
-    }
-
-    private String getFolderNodeRef(String folderId) {
-        return "workspace://SpacesStore/" + folderId;
-    }
-
-    private String getRecordNodeRef(String recordId) {
-        return "workspace/SpacesStore/" + recordId;
-    }
-
-    private JSONObject getAuditPropertyValues(HttpResponse httpResponse) {
-        HttpEntity entity = httpResponse.getEntity();
-        String responseString = null;
-        try {
-            responseString = EntityUtils.toString(entity, "UTF-8");
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        JSONObject result = new JSONObject(responseString);
-        return result;
-    }
-    @AfterMethod
-    private void closeAuditLog() {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-    }
-
-    @AfterClass(alwaysRun = true)
-    private void nonElectronicRecordAuditLogCleanup() {
-        deleteRecord(nonElectronicRecord.getId());
-        deleteRecord(nonElectronicRecord2.getId());
-        deleteRecordFolder(recordFolder1.getId());
-        deleteRecordCategory(category1.getId());
-        dataUser.usingAdmin().deleteUser(new UserModel(rmAdmin.get().getUsername(), rmAdmin.get().getPassword()));
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/RecordCategoryAuditLogTest.java

@@ -1,120 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.audit;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.v0.RMAuditAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.util.List;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.utility.data.RandomData.getRandomAlphanumeric;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-
-public class RecordCategoryAuditLogTest extends BaseRMRestTest {
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RMAuditAPI auditLog;
-
-    private final String TEST_PREFIX = generateTestPrefix(RecordCategoryAuditLogTest.class);
-    private final String RM_ADMIN = TEST_PREFIX + "rm_admin";
-    private static final String AUDIT_CATEGORY = generateTestPrefix(RecordCategoryAuditLogTest.class) + "category";
-    private RecordCategory recordCategoryAudit;
-
-    @BeforeClass(alwaysRun = true)
-    public void recordCategoryAuditLogSetup() {
-        STEP("Create RM Site");
-        createRMSiteIfNotExists();
-
-        STEP("Create RM Admin user");
-        rmRolesAndActionsAPI.createUserAndAssignToRole(getAdminUser().getUsername(), getAdminUser().getPassword(), RM_ADMIN,
-            getAdminUser().getPassword(),
-            "Administrator");
-    }
-
-    @Test
-    @AlfrescoTest(jira = "RM-2768")
-    public void recordCategoryAudit() throws Exception {
-        STEP("Create root level category");
-        recordCategoryAudit = createRootCategory(AUDIT_CATEGORY);
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-        // newly created record category contains 3 events: object creation, inherited permissions set to false and metadata update
-        // the order in which object creation and metadata update are listed isn't always identical due to
-        // both happening in the same transaction
-        assertTrue("Created Object Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Created Object")));
-        assertTrue("Updated metadata Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-    }
-
-    @Test
-        (
-            dependsOnMethods = "recordCategoryAudit",
-            description = "Viewing audit log is itself an auditable event"
-        )
-    @AlfrescoTest(jira="RM-4303")
-    public void recordCategoryAuditIsEvent() {
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-        assertTrue("Audit View Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Audit View")));
-    }
-
-    @Test
-        (
-            dependsOnMethods = "recordCategoryAuditIsEvent",
-            description = "Record category rename is an edit metadata event"
-        )
-    @AlfrescoTest(jira="RM-4303")
-    public void renameRecordCategory() {
-        String categoryName = "Category name " + getRandomAlphanumeric();
-        RecordCategory rootRecordCategory = createRootCategory(categoryName);
-        String newCategoryName = "Rename " + categoryName;
-        RecordCategory recordCategoryUpdated = RecordCategory.builder().name(newCategoryName).build();
-        RecordCategory renamedRecordCategory = getRestAPIFactory().getRecordCategoryAPI().updateRecordCategory(recordCategoryUpdated, rootRecordCategory.getId());
-
-        assertStatusCode(OK);
-        // we expect 1 new event: "metadata update"
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-        assertTrue("Updated metadata Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-    }
-    @AfterClass(alwaysRun = true)
-    private void electronicRecordAuditLogCleanup() {
-        deleteRecordCategory(recordCategoryAudit.getId());
-        dataUser.deleteUser(new UserModel(RM_ADMIN,
-            getAdminUser().getPassword()));
-        auditLog.clearAuditLog(getAdminUser().getUsername(), getAdminUser().getPassword());
-    }
-}
-

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/audit/RecordFolderAuditLogTest.java

@@ -1,175 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.audit;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.audit.AuditEntry;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.rm.community.model.recordfolder.RecordFolder;
-import org.alfresco.rest.v0.RMAuditAPI;
-import org.alfresco.rest.v0.RMRolesAndActionsAPI;
-import org.alfresco.rest.v0.RecordFoldersAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.Utility;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import java.util.List;
-import java.util.Optional;
-
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.ASPECTS_COMPLETED_RECORD;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.createRecordFolderModel;
-import static org.springframework.http.HttpStatus.OK;
-import static org.springframework.test.util.AssertionErrors.assertTrue;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.fail;
-
-public class RecordFolderAuditLogTest extends BaseRMRestTest {
-
-    private Optional<UserModel> rmAdmin;
-    @Autowired
-    private RMRolesAndActionsAPI rmRolesAndActionsAPI;
-    @Autowired
-    private RMAuditAPI auditLog;
-
-    @Autowired
-    private RecordFoldersAPI recordFoldersAPI;
-    private RecordCategory category1;
-    private RecordCategoryChild recordFolder1;
-    public static final String TITLE = "Title";
-    public static final String DESCRIPTION = "Description";
-
-    @BeforeClass(alwaysRun = true)
-    public void recordFolderAuditLogSetup() {
-        createRMSiteIfNotExists();
-        rmAdmin = Optional.ofNullable(getDataUser().createRandomTestUser());
-        rmRolesAndActionsAPI.assignRoleToUser(
-                getDataUser().usingAdmin().getAdminUser().getUsername(),
-                getDataUser().usingAdmin().getAdminUser().getPassword(),
-                rmAdmin.get().getUsername(),
-                "Administrator");
-    }
-
-    @Test(description = "Audit log for empty record folder")
-    @AlfrescoTest(jira = "RM-4303")
-    public void recordFolderAudit() {
-        category1 = createRootCategory(TITLE, DESCRIPTION);
-        recordFolder1 = createFolder(category1.getId(), TITLE);
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-        assertTrue("Created Object Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Created Object")));
-        assertTrue("Updated metadata Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-
-    }
-
-    @Test
-            (
-                    dependsOnMethods = "recordFolderAudit",
-                    description = "Viewing record folder audit log is itself an auditable event"
-            )
-    @AlfrescoTest(jira = "RM-4303")
-    public void recordFolderAuditIsEvent() {
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-        assertTrue("Audit View Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Audit View")));
-
-    }
-
-    @Test
-            (
-                    dependsOnMethods = "recordFolderAuditIsEvent",
-                    description = "Record folder rename is an edit metadata event"
-            )
-    @AlfrescoTest(jira = "RM-4303")
-    public void renameRecordFolder() {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(), rmAdmin.get().getPassword());
-        RecordFolder renameRecordFolder = createRecordFolderModel(category1.getId(), "edited");
-        getRestAPIFactory().getRecordFolderAPI().updateRecordFolder(renameRecordFolder, recordFolder1.getId());
-        assertStatusCode(OK);
-        // we expect 1 new event: "metadata update"
-        List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-//        assertTrue("Move To Event is not present.",auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Move to")));
-        assertTrue("Updated metadata Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Updated Metadata")));
-
-    }
-
-    @Test(dependsOnMethods = "recordFolderAudit",
-        description = "Close and reopen folder")
-    @AlfrescoTest(jira = "RM-4303")
-    public void closeReopenFolder() {
-        //close folder
-        recordFoldersAPI.closeRecordFolder(rmAdmin.get().getUsername(), rmAdmin.get().getPassword(),
-                recordFolder1.getName());
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-                List<AuditEntry> auditEntries = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-                assertTrue("Folder Close Record Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Close Record Folder")));
-
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-
-        //reopen folder
-        recordFoldersAPI.reOpenRecordFolder(rmAdmin.get().getUsername(), rmAdmin.get().getPassword(),
-                recordFolder1.getName());
-        try
-        {
-            Utility.sleep(1000, 30000, () ->
-            {
-
-                List<AuditEntry> auditEntries  = auditLog.getRMAuditLogAll(getAdminUser().getUsername(), getAdminUser().getPassword(), 100);
-                assertTrue("Reopen Record Event is not present.", auditEntries.stream().anyMatch(x -> x.getEvent().startsWith("Open Record Folder")));
-
-            });
-        }
-        catch (InterruptedException e)
-        {
-            fail("InterruptedException received while waiting for results.");
-        }
-    }
-    @AfterMethod
-    private void closeAuditLog()
-    {
-        auditLog.clearAuditLog(rmAdmin.get().getUsername(),rmAdmin.get().getPassword());
-    }
-
-    @AfterClass (alwaysRun = true)
-    public void recordFolderAuditLogCleanup()
-    {
-        deleteRecordFolder(recordFolder1.getId());
-        deleteRecordCategory(category1.getId());
-        dataUser.usingAdmin().deleteUser(new UserModel(rmAdmin.get().getUsername(), rmAdmin.get().getPassword()));
-    }
-
-}

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;

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

@@ -33,9 +33,7 @@ import org.alfresco.rest.rm.community.model.record.Record;
 import org.alfresco.rest.v0.RecordsAPI;
 import org.alfresco.utility.Utility;
 import org.alfresco.utility.constants.UserRole;
-import org.alfresco.utility.data.RandomData;
 import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.FileType;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.UserModel;
 import org.json.JSONObject;
@@ -99,10 +97,9 @@ public class InplaceRecordSearchTests extends BaseRMRestTest {
     @Test
     public void searchForInplaceRecord() {
         // And a document that isn't a record
-        final String fileName = "File" + RandomData.getRandomAlphanumeric();
         uploadedDocbyCollabUser = dataContent.usingSite(privateSite)
             .usingUser(siteCollaborator)
-            .createContent(new FileModel(fileName, FileType.fromName(fileName + "." + CMISUtil.DocumentType.TEXT_PLAIN.extention)));
+            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
 
         assertNotNull(uploadedDocbyCollabUser.getNodeRef());
 

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

@@ -62,7 +62,6 @@ import org.alfresco.rest.rm.community.requests.gscore.api.RecordFolderAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledContainerAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledRecordFolderAPI;
-import org.alfresco.rest.rm.community.utils.AlfrescoRetryAnalyzer;
 import org.alfresco.rest.v0.service.RoleService;
 import org.alfresco.test.AlfrescoTest;
 import org.alfresco.utility.model.UserModel;
@@ -290,11 +289,10 @@ public class UpdateRecordsTests extends BaseRMRestTest
      * </pre>
      */
     @Test
-        (
-            dataProvider = "completeRecords",
-            description = "Complete records can't be updated",
-            retryAnalyzer = AlfrescoRetryAnalyzer.class
-        )
+    (
+        dataProvider = "completeRecords",
+        description = "Complete records can't be updated"
+    )
     @AlfrescoTest(jira="RM-4362")
     @Bug (id = "APPS-132")
     public void completeRecordsCantBeUpdated(String electronicRecordId, String nonElectronicRecordId)

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/rules/CopyToRuleOnFoldersTest.java

@@ -1,118 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.rules;
-
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.rm.community.model.rules.ActionsOnRule;
-import org.alfresco.rest.rm.community.model.rules.RuleDefinition;
-import org.alfresco.rest.rm.community.requests.gscore.api.RecordCategoryAPI;
-import org.alfresco.rest.rm.community.requests.gscore.api.RecordFolderAPI;
-import org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI;
-import org.alfresco.rest.rm.community.smoke.CreateCategoriesTests;
-import org.alfresco.rest.v0.RulesAPI;
-import org.alfresco.test.AlfrescoTest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.Test;
-
-import java.util.Collections;
-
-import static org.alfresco.rest.core.v0.BaseAPI.NODE_PREFIX;
-import static org.alfresco.rest.rm.community.base.TestData.ELECTRONIC_RECORD_NAME;
-import static org.alfresco.rest.rm.community.base.TestData.NONELECTRONIC_RECORD_NAME;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.rest.rm.community.utils.CoreUtil.createBodyForMoveCopy;
-import static org.alfresco.rest.rm.community.utils.CoreUtil.toContentModel;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.*;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.*;
-
-public class CopyToRuleOnFoldersTest extends BaseRMRestTest {
-
-    private RecordCategory category;
-    private RecordCategoryChild folder1,folder2;
-    private final static String title = "Run in background";
-    private final String TEST_PREFIX = generateTestPrefix(CopyToRuleOnFoldersTest.class);
-    private final String RM_ADMIN = TEST_PREFIX + "rm_admin";
-    private final String electronicRecord = TEST_PREFIX + "record_electronic_for_copyTo";
-    private final String nonElectronicRecord = TEST_PREFIX + "record_non_electronic_for_copyTo";
-
-    @Autowired
-    private RulesAPI rulesAPI;
-
-    @Test
-    @AlfrescoTest(jira = "RM-2994")
-    public void copyToRuleOnFoldersTest()
-    {
-
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description1")
-            .runInBackground(true).title(title)
-            .actions(Collections.singletonList(ActionsOnRule.COPY_TO.getActionValue()));
-
-
-        STEP("Create the RM site if doesn't exist");
-        createRMSiteIfNotExists();
-
-        STEP("Create record categories and record folders");
-        category= createRootCategory(getRandomName("recordCategory"));
-        String folder1 = createCategoryFolderInFilePlan().getId();
-        String folder2 = createCategoryFolderInFilePlan().getId();
-
-        // create a rule on folder
-        rulesAPI.createRule(getAdminUser().getUsername(), getAdminUser().getPassword(), NODE_PREFIX + folder1, ruleDefinition);
-
-        // create electronic record in record folder
-        String electronicRecordId = createElectronicRecord(folder1, ELECTRONIC_RECORD_NAME).getId();
-        assertStatusCode(CREATED);
-
-        // create non-electronic record in record folder
-        String nonElectronicRecord = createElectronicRecord(folder1, NONELECTRONIC_RECORD_NAME).getId();
-        assertStatusCode(CREATED);
-
-        // Move the electronic and non-electronic records from "Category with records"> "Folder with rule"
-        // to "Copy Category with records" > "Folder with rule"
-       getRestAPIFactory().getNodeAPI(toContentModel(folder1)).copy(createBodyForMoveCopy(category.getId()));
-        getRestAPIFactory().getNodeAPI(toContentModel( electronicRecord)).move(createBodyForMoveCopy(folder2));
-        getRestAPIFactory().getNodeAPI(toContentModel( nonElectronicRecord)).move(createBodyForMoveCopy(folder2));
-
-        RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-        // Delete the record category
-        RecordCategoryAPI recordCategoryAPI = getRestAPIFactory().getRecordCategoryAPI();
-        String recordCategoryId = category.getId();
-        recordCategoryAPI.deleteRecordCategory(recordCategoryId);
-        recordsAPI.deleteRecord(electronicRecord);
-        recordsAPI.deleteRecord(nonElectronicRecord);
-        assertStatusCode(NO_CONTENT);
-
-
-    }
-
-
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/rules/FileAsRecordRuleTests.java

@@ -1,229 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-
-package org.alfresco.rest.rm.community.rules;
-
-import org.alfresco.dataprep.CMISUtil;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.rm.community.model.rules.ActionsOnRule;
-import org.alfresco.rest.rm.community.model.rules.RuleDefinition;
-import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainerChildEntry;
-import org.alfresco.rest.rm.community.model.user.UserRoles;
-
-import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledContainerAPI;
-import org.alfresco.rest.rm.community.smoke.FileAsRecordTests;
-import org.alfresco.rest.v0.RulesAPI;
-import org.alfresco.rest.v0.service.RoleService;
-import org.alfresco.test.AlfrescoTest;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import static org.alfresco.rest.core.v0.BaseAPI.NODE_PREFIX;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.UNFILED_RECORDS_CONTAINER_ALIAS;
-import static org.alfresco.rest.rm.community.model.user.UserPermissions.PERMISSION_FILING;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.CREATED;
-
-@AlfrescoTest (jira = "APPS-36")
-public class FileAsRecordRuleTests extends BaseRMRestTest
-{
-    private UserModel nonRMUser, rmManager;
-    private RecordCategory category_manager, category_admin;
-    private RecordCategoryChild folder_admin, folder_manager ;
-    private static final String CATEGORY_MANAGER = "catManager" + generateTestPrefix(FileAsRecordTests.class);
-    private static final String CATEGORY_ADMIN = "catAdmin" + generateTestPrefix(FileAsRecordTests.class);
-    private static final String FOLDER_MANAGER = "recordFolder" + generateTestPrefix(FileAsRecordTests.class);
-    private static final String FOLDER_ADMIN = "recordFolder" + generateTestPrefix(FileAsRecordTests.class);
-    private FolderModel testFolder;
-    private FileModel document,inPlaceRecord;
-
-
-    @Autowired
-    private RoleService roleService;
-    @Autowired
-    private RulesAPI rulesAPI;
-
-    /**
-     * Create preconditions:
-     * 1. RM site is created
-     * 2. Two users: user without RM role and a user with RM manager role
-     * 3. Two Record categories with one folder each
-     * 4. User with RM MANAGER role has Filling permission over one category
-     * 5. A collaboration folder with rule set to declare and file as record to a record folder
-     **/
-    @BeforeClass(alwaysRun = true)
-    public void preconditionForDeclareFileAsRecordRuleTests()
-    {
-        STEP("Create the RM site if doesn't exist");
-        createRMSiteIfNotExists();
-
-        STEP("Create a user");
-        nonRMUser = dataUser.createRandomTestUser("testUser");
-
-        STEP("Create a collaboration site");
-        testSite = dataSite.usingUser(nonRMUser).createPublicRandomSite();
-
-        STEP("Create two categories with two folders");
-        category_manager = createRootCategory(CATEGORY_MANAGER);
-        category_admin = createRootCategory(CATEGORY_ADMIN);
-        folder_admin = createFolder(category_admin.getId(),FOLDER_ADMIN);
-        folder_manager = createFolder(category_manager.getId(),FOLDER_MANAGER);
-
-        STEP("Create an rm user and give filling permission over CATEGORY_MANAGER record category");
-        RecordCategory recordCategory = new RecordCategory().builder()
-            .id(category_manager.getId()).build();
-
-        rmManager = roleService.createCollaboratorWithRMRoleAndPermission(testSite, recordCategory,
-            UserRoles.ROLE_RM_MANAGER, PERMISSION_FILING);
-
-        STEP("Create a collaboration folder with a rule set to declare and file as record to a record folder");
-        RecordCategoryChild folderWithRule = createFolder(recordCategory.getId(), getRandomName("recordFolder"));
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(getAdminUser().getUsername(), getAdminUser().getPassword(), NODE_PREFIX + folderWithRule.getId(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-    }
-    /**
-     * Given I am a user that can create a rule on a folder in a collaboration site
-     * When I am creating the rule
-     * Then I have the option of adding a "Declare and File as Record" action to the rule
-     * <p>
-     * Given I am creating a rule
-     * When I add the "Declare and File as Record" action to the rule
-     * Then I am able to select the record folder I want the declared record to be filed to
-     * <p>
-     * Given I am configuring a "Declare and File as Record" action within a rule
-     * And I have at least one records management role (eg RM User)
-     * When I am selecting the record folder location to file the declared record to
-     * Then I see the record folders in the file plan that I have file access to as the creator of the record
-     **/
-    @Test
-    public void declareAsRecordRuleAsRMUserWithFilingPermissions() {
-        STEP("Create a collaboration folder");
-        testFolder = dataContent.usingSite(testSite)
-            .usingUser(rmManager)
-            .createFolder();
-
-        STEP("Create a rule with Declare as Record action and check that user can select a record folder.");
-        RecordCategory recordCategory = new RecordCategory().builder()
-            .id(category_manager.getId()).build();
-        RecordCategoryChild folderWithRule = createFolder(recordCategory.getId(), getRandomName("recordFolder"));
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(getAdminUser().getUsername(), getAdminUser().getPassword(), NODE_PREFIX + folderWithRule.getId(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-    }
-    /**
-     * Given I am configuring a "Declare and File as Record" action within a rule
-     * And I don't have a records management role
-     * When I am selecting the record folder location to file the declared record to
-     * Then I can see only the file plan
-     */
-    @Test
-    public void declareAsRecordRuleAsNonRMUser()
-    {
-        STEP("Create a collaboration folder");
-        testFolder = dataContent.usingSite(testSite)
-            .usingUser(nonRMUser)
-            .createFolder();
-
-        STEP("Create a rule with Declare as Record action and check that user can select a record folder.");
-        RecordCategory recordCategory = new RecordCategory().builder()
-            .id(category_manager.getId()).build();
-
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(nonRMUser.getUsername(), nonRMUser.getPassword(), NODE_PREFIX + testFolder.getNodeRef(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-    }
-
-    /**
-     * Given I have not selected a record folder location
-     * When the rule is triggered
-     * Then the file is declared as record to the UnFiled Records folder
-     */
-    @Test
-    public void triggerDeclareToUnfiledRuleAsNonRMUser()
-    {
-        STEP("Create a collaboration folder with a rule set to declare and file as record without a record folder location");
-
-        RecordCategory recordCategory = new RecordCategory().builder()
-            .id(category_manager.getId()).build();
-
-        RecordCategoryChild folderWithRule = createFolder(recordCategory.getId(), getRandomName("recordFolder"));
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(getAdminUser().getUsername(), getAdminUser().getPassword(), NODE_PREFIX + folderWithRule.getId(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-
-        STEP("Create as nonRMUser a new file into the previous folder in order to trigger the rule");
-        inPlaceRecord = dataContent.usingUser(nonRMUser).usingResource(testFolder).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-//      Verify that declared record is in Unfilled Records Folder
-        UnfiledContainerAPI unfiledContainersAPI = getRestAPIFactory().getUnfiledContainersAPI();
-        List<UnfiledContainerChildEntry> matchingRecords = unfiledContainersAPI.getUnfiledContainerChildren(UNFILED_RECORDS_CONTAINER_ALIAS)
-            .getEntries()
-            .stream()
-            .filter(e -> e.getEntry().getId().equals(inPlaceRecord.getNodeRefWithoutVersion()))
-            .collect(Collectors.toList());
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void cleanupDeclareAsRecordRuleTests()
-    {
-        STEP("Delete the collaboration site");
-        dataSite.usingUser(nonRMUser).deleteSite(testSite);
-
-        STEP("Delete Users");
-        dataUser.deleteUser(nonRMUser);
-        dataUser.deleteUser(rmManager);
-
-        STEP("Delete categories");
-        getRestAPIFactory().getFilePlansAPI().getRootRecordCategories(FILE_PLAN_ALIAS).getEntries().forEach(recordCategoryEntry ->
-            deleteRecordCategory(recordCategoryEntry.getEntry().getId()));
-    }
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/rules/FileVersionAsRecordRuleTest.java

@@ -1,221 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.rules;
-
-import org.alfresco.dataprep.CMISUtil;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.rm.community.model.rules.ActionsOnRule;
-import org.alfresco.rest.rm.community.model.rules.RuleDefinition;
-import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainerChildEntry;
-import org.alfresco.rest.rm.community.model.user.UserRoles;
-import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledContainerAPI;
-import org.alfresco.rest.rm.community.smoke.FileAsRecordTests;
-import org.alfresco.rest.v0.RulesAPI;
-import org.alfresco.rest.v0.service.RoleService;
-import org.alfresco.utility.model.FileModel;
-import org.alfresco.utility.model.FileType;
-import org.alfresco.utility.model.FolderModel;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.alfresco.rest.core.v0.BaseAPI.NODE_PREFIX;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.UNFILED_RECORDS_CONTAINER_ALIAS;
-import static org.alfresco.rest.rm.community.model.user.UserPermissions.PERMISSION_FILING;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.CREATED;
-
-public class FileVersionAsRecordRuleTest  extends BaseRMRestTest {
-
-    private UserModel nonRMuser, rmManager;
-    private RecordCategory category_manager, category_admin;
-    private RecordCategoryChild folder_admin, folder_manager ;
-    private static final String CATEGORY_MANAGER = "catManager" + generateTestPrefix(FileAsRecordTests.class);
-    private static final String CATEGORY_ADMIN = "catAdmin" + generateTestPrefix(FileAsRecordTests.class);
-    private static final String FOLDER_MANAGER = "recordFolder" + generateTestPrefix(FileAsRecordTests.class);
-    private static final String FOLDER_ADMIN = "recordFolder" + generateTestPrefix(FileAsRecordTests.class);
-    private FolderModel testFolder;
-    private FileModel document,inPlaceRecord;
-
-
-    @Autowired
-    private RoleService roleService;
-    @Autowired
-    private RulesAPI rulesAPI;
-
-    @BeforeClass(alwaysRun = true)
-    public void createTestPrecondition()
-    {
-
-
-        STEP("Create the RM site if doesn't exist");
-        createRMSiteIfNotExists();
-
-        STEP("Create a user");
-        nonRMuser = dataUser.createRandomTestUser("testUser");
-
-        STEP("Create a collaboration site");
-        testSite = dataSite.usingUser(nonRMuser).createPublicRandomSite();
-
-        STEP("Create a document with the user without RM role");
-        document = dataContent.usingSite(testSite)
-            .usingUser(nonRMuser)
-            .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        STEP("Create two categories with two folders");
-        category_manager = createRootCategory(CATEGORY_MANAGER);
-        category_admin = createRootCategory(CATEGORY_ADMIN);
-        folder_admin = createFolder(category_admin.getId(),FOLDER_ADMIN);
-        folder_manager = createFolder(category_manager.getId(),FOLDER_MANAGER);
-
-
-        STEP("Create an rm user and give filling permission over CATEGORY_MANAGER record category");
-        RecordCategory recordCategory = new RecordCategory().builder()
-            .id(category_manager.getId())
-            .build();
-        rmManager = roleService.createCollaboratorWithRMRoleAndPermission(testSite, recordCategory,
-            UserRoles.ROLE_RM_MANAGER, PERMISSION_FILING);
-
-
-
-        STEP("Create a collaboration folder with a rule set to declare and file version as record to a record folder");
-        RecordCategoryChild folderWithRule = createFolder(recordCategory.getId(), getRandomName("recordFolder"));
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(getAdminUser().getUsername(), getAdminUser().getPassword(), NODE_PREFIX + folderWithRule.getId(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-    }
-
-    @Test
-    public void declareVersionAsRecordRuleAsRMUserWithFilingPermissions()
-    {
-
-        STEP("Create a collaboration folder");
-        testFolder = dataContent.usingSite(testSite)
-            .usingUser(rmManager)
-            .createFolder();
-
-        STEP("Create a rule with Declare as Record action and check that user can select a record folder.");
-        RecordCategory recordCategory = new RecordCategory().builder()
-            .id(category_manager.getId()).build();
-        RecordCategoryChild folderWithRule = createFolder(recordCategory.getId(), getRandomName("recordFolder"));
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(rmManager.getUsername(), rmManager.getPassword(), NODE_PREFIX + testFolder.getNodeRef(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-
-    }
-
-    @Test
-    public void declareVersionAsRecordRuleAsNonRMUser()
-    {
-
-        STEP("Create a collaboration folder");
-        testFolder = dataContent.usingSite(testSite)
-            .usingUser(nonRMuser)
-            .createFolder();
-
-        STEP("Create a rule with Declare as Record action and check that user can select a record folder.");
-        RecordCategory recordCategory = new RecordCategory().builder()
-            .id(category_manager.getId()).build();
-
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(nonRMuser.getUsername(), nonRMuser.getPassword(), NODE_PREFIX + testFolder.getNodeRef(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-
-    }
-
-    @Test
-    public void triggerDeclareToUnfiledRuleAsNonRMUser() throws Exception {
-
-        STEP("Create a collaboration folder with a rule set to declare and file as record without a record folder location");
-
-
-        FileModel inplaceRecord = dataContent.usingSite(testSite).usingUser(nonRMuser)
-            .createContent(new FileModel("declareAndFileToIntoUnfiledRecordFolder",
-                FileType.TEXT_PLAIN));
-
-        RecordCategory recordCategory = new RecordCategory().builder()
-            .id(category_manager.getId()).build();
-
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description")
-            .applyToChildren(true)
-            .actions(Collections.singletonList(ActionsOnRule.DECLARE_AS_RECORD.getActionValue()));
-        rulesAPI.createRule(nonRMuser.getUsername(), nonRMuser.getPassword(), NODE_PREFIX + inplaceRecord.getNodeRef(), ruleDefinition);
-
-        assertStatusCode(CREATED);
-
-       STEP("Create as nonRMuser a new file into the previous folder in order to trigger the rule");
-        inPlaceRecord = dataContent.usingUser(nonRMuser).usingResource(testFolder).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
-
-        // verify the declared record is in Unfilled Records folder
-        UnfiledContainerAPI unfiledContainersAPI = getRestAPIFactory().getUnfiledContainersAPI();
-        List<UnfiledContainerChildEntry> matchingRecords = unfiledContainersAPI.getUnfiledContainerChildren(UNFILED_RECORDS_CONTAINER_ALIAS)
-            .getEntries()
-            .stream()
-            .filter(e -> e.getEntry().getId().equals(inplaceRecord.getNodeRefWithoutVersion()))
-            .collect(Collectors.toList());
-
-
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void cleanupDeclareVersionAsRecordRuleTests()
-    {
-
-        STEP("Delete the collaboration site");
-        dataSite.usingUser(nonRMuser).deleteSite(testSite);
-
-        STEP("Delete Users");
-        dataUser.deleteUser(nonRMuser);
-        dataUser.deleteUser(rmManager);
-
-
-        STEP("Delete categories");
-        getRestAPIFactory().getFilePlansAPI().getRootRecordCategories(FILE_PLAN_ALIAS).getEntries().forEach(recordCategoryEntry ->
-            deleteRecordCategory(recordCategoryEntry.getEntry().getId()));
-    }
-
-}

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/rules/MoveToRuleOnFoldersTest.java

@@ -1,237 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- * -
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * -
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * -
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.rest.rm.community.rules;
-
-import org.alfresco.rest.model.RestNodeModel;
-import org.alfresco.rest.rm.community.base.BaseRMRestTest;
-import org.alfresco.rest.rm.community.model.fileplan.FilePlan;
-import org.alfresco.rest.rm.community.model.record.Record;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategory;
-import org.alfresco.rest.rm.community.model.recordcategory.RecordCategoryChild;
-import org.alfresco.rest.rm.community.model.rules.ActionsOnRule;
-import org.alfresco.rest.rm.community.model.rules.ConditionsOnRule;
-import org.alfresco.rest.rm.community.model.rules.RuleDefinition;
-import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainer;
-import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainerChildEntry;
-import org.alfresco.rest.rm.community.model.user.UserRoles;
-import org.alfresco.rest.rm.community.requests.gscore.api.RecordFolderAPI;
-import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledContainerAPI;
-import org.alfresco.rest.search.RestRequestQueryModel;
-import org.alfresco.rest.v0.HoldsAPI;
-import org.alfresco.rest.v0.RecordsAPI;
-import org.alfresco.rest.v0.RulesAPI;
-import org.alfresco.rest.v0.service.RoleService;
-import org.alfresco.utility.model.UserModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-import java.util.stream.Collectors;
-
-import static java.lang.Integer.MAX_VALUE;
-import static java.util.Arrays.asList;
-import static org.alfresco.rest.core.v0.BaseAPI.NODE_PREFIX;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.FILE_PLAN_ALIAS;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAlias.UNFILED_RECORDS_CONTAINER_ALIAS;
-import static org.alfresco.rest.rm.community.util.CommonTestUtils.generateTestPrefix;
-import static org.alfresco.rest.rm.community.utils.CoreUtil.createBodyForMoveCopy;
-import static org.alfresco.rest.rm.community.utils.CoreUtil.toContentModel;
-import static org.alfresco.rest.rm.community.utils.FilePlanComponentsUtil.*;
-import static org.alfresco.utility.data.RandomData.getRandomAlphanumeric;
-import static org.alfresco.utility.data.RandomData.getRandomName;
-import static org.alfresco.utility.report.log.Step.STEP;
-import static org.springframework.http.HttpStatus.*;
-import static org.testng.Assert.assertNotNull;
-
-
-public class MoveToRuleOnFoldersTest extends BaseRMRestTest{
-
-
-    private RecordCategoryChild recordFolder2;
-    private RecordCategoryChild recordFolder1;
-    private String nonElectronicId;
-
-    public Record electronicRecord;
-
-    private String ruleType = ConditionsOnRule.UPDATE.getWhenConditionValue();
-    private UserModel rmAdmin;
-    public RecordCategory RecordCategoryOne;
-    private RecordCategoryChild recordFolder;
-    public static final String RECORD_FOLDER_ONE = "record-folder-one";
-    private final String TEST_PREFIX = generateTestPrefix(MoveToRuleOnFoldersTest.class);
-
-    private final String RECORD_CATEGORY_ONE = TEST_PREFIX + "category";
-
-    private final String recordName = "Test record";
-    private final String recordTitle = recordName + " title";
-    private final String recordDescription = recordName + " description";
-    private Record nonElectrinicRecordModel;
-    private RecordFolderAPI recordFolderAPI;
-    public String title,description,box,file,shelf,storageLocation,name;
-    @Autowired
-    private RulesAPI rulesAPI;
-    @Autowired
-    private HoldsAPI holdsAPI;
-
-    @Autowired
-    private RoleService roleService;
-
-    @Autowired
-    public RecordsAPI recordsAPI;
-
-
-    @BeforeClass(alwaysRun = true)
-    public void precondition()
-    {
-        //create RM site
-        createRMSiteIfNotExists();
-        rmAdmin = roleService.createUserWithRMRole(UserRoles.ROLE_RM_ADMIN.roleId);
-        //create root category, create folders , add electronic and non electronic records
-        RecordCategoryOne = createRootCategory(RECORD_CATEGORY_ONE);
-        recordFolder1=createRecordFolder(RecordCategoryOne.getId(), getRandomName("recFolder"));
-       // recordFolder1_id = createRecordFolder(RecordCategoryOne.getId(), getRandomName("recFolder")).getId();
-        recordFolder2 = createFolder(getAdminUser(),RecordCategoryOne.getId(),getRandomName("recFolder"));
-
-
-        STEP("CREATE ELECTRONIC RECORD");
-        recordFolderAPI = getRestAPIFactory().getRecordFolderAPI();
-        electronicRecord = recordFolderAPI.createRecord(createElectronicRecordModel(), recordFolder1.getId(), getFile(IMAGE_FILE));
-        STEP("Check the electronic record has been created");
-        assertStatusCode(CREATED);
-
-
-        STEP("Create a non-electronic record by completing some of the fields");
-        // Use these properties for non-electronic record to be created
-        title = "Title " + getRandomAlphanumeric();
-        description = "Description " + getRandomAlphanumeric();
-        box = "Box "+ getRandomAlphanumeric();
-        file = "File " + getRandomAlphanumeric();
-        shelf = "Shelf " + getRandomAlphanumeric();
-        storageLocation = "Storage Location " + getRandomAlphanumeric();
-        name = "Record " + getRandomAlphanumeric();
-        Random random = new Random();
-        Integer numberOfCopies = random.nextInt(MAX_VALUE);
-        Integer physicalSize = random.nextInt(MAX_VALUE);
-
-        // Set values of all available properties for the non electronic records
-        nonElectrinicRecordModel = createFullNonElectronicRecordModel(name, title, description, box, file, shelf, storageLocation, numberOfCopies, physicalSize);
-        // Create non-electronic record
-        nonElectronicId = recordFolderAPI.createRecord(nonElectrinicRecordModel, recordFolder1.getId()).getId();
-        STEP("Check the non-electronic record has been created");
-        assertStatusCode(CREATED);
-
-
-
-
-    }
-
-    @Test
-    public void MoveToRuleFoldersTest()
-    {
-
-        String CatName=RecordCategoryOne.getName();
-        String folder2name=recordFolder2.getName();
-        String recfolder2_path="/"+CatName+"/"+folder2name;
-
-        STEP("create a rule MOVE_TO for folder 1");
-        RuleDefinition ruleDefinition = RuleDefinition.createNewRule().title("name").description("description1")
-            .runInBackground(true).title(title)
-            .actions(Collections.singletonList(ActionsOnRule.MOVE_TO.getActionValue())).ruleType(ruleType).path(recfolder2_path);
-        rulesAPI.createRule(getAdminUser().getUsername(), getAdminUser().getPassword(), NODE_PREFIX +recordFolder1.getId() , ruleDefinition);
-
-
-
-        STEP("Update metadata for Non-Electronic Record");
-        updateRecordMetadata();
-
-        STEP("Delete ELECTRONIC AND NON-ELECTRONIC RECORDS IN FOLDER 2");
-        org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-        recordsAPI.deleteRecord(electronicRecord.getId());
-        assertStatusCode(NO_CONTENT);
-        recordsAPI.deleteRecord(nonElectronicId);
-        assertStatusCode(NO_CONTENT);
-
-        STEP("RULE CREATION FOR FOLDER 1 WITHOUT RUNNING IN BACKGROUND");
-
-        RuleDefinition ruleDefinition_notinbackground = RuleDefinition.createNewRule().title("name").description("description1")
-            .runInBackground(false).title(title)
-            .actions(Collections.singletonList(ActionsOnRule.MOVE_TO.getActionValue())).ruleType(ruleType).path(recfolder2_path);
-        rulesAPI.createRule(getAdminUser().getUsername(), getAdminUser().getPassword(), NODE_PREFIX +recordFolder1.getId() , ruleDefinition);
-
-        STEP("CREATE ELECTRONIC AND NON-ELECTRONIC RECORDS");
-        electronicRecord = recordFolderAPI.createRecord(createElectronicRecordModel(), recordFolder1.getId(), getFile(IMAGE_FILE));
-        STEP("Check the electronic record has been created");
-        assertStatusCode(CREATED);
-        nonElectronicId = recordFolderAPI.createRecord(nonElectrinicRecordModel, recordFolder1.getId()).getId();
-        STEP("Check the non-electronic record has been created");
-        assertStatusCode(CREATED);
-
-        STEP("UPDATE METADATA");
-        updateRecordMetadata();
-
-        STEP("CHECK IF ELECTRONIC AND NON-ELECTRONIC RECORDS MOVED  TO FOLDER2");
-        updateRecordMetadata();
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void cleanMoveToRuleOnFoldersTest()
-    {
-        deleteRecordCategory(RecordCategoryOne.getId());
-
-        getDataUser().deleteUser(rmAdmin);
-    }
-
-    private String getModifiedPropertyValue(String originalValue) {
-        /* to be used to append to modifications */
-        String MODIFIED_PREFIX = "modified_";
-        return MODIFIED_PREFIX + originalValue;
-    }
-    private void updateRecordMetadata(){
-        STEP("Update metadata for Non-Electronic Record");
-        org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI recordsAPI = getRestAPIFactory().getRecordsAPI();
-        Record nonelecrecord = recordsAPI.getRecord(nonElectronicId);
-        String nonelecnewName = getModifiedPropertyValue(nonElectrinicRecordModel.getName());
-        String nonelecnewTitle = getModifiedPropertyValue(nonElectrinicRecordModel.getProperties().getTitle());
-        String nonelecnewDescription = getModifiedPropertyValue(nonElectrinicRecordModel.getProperties().getDescription());
-        recordsAPI.updateRecord(createRecordModel(nonelecnewName, nonelecnewDescription, nonelecnewTitle),nonelecrecord.getId());
-        assertStatusCode(OK);
-
-        STEP("Update metadata for Electronic Record");
-        Record elecrecord = recordsAPI.getRecord(electronicRecord.getId());
-        String elecnewName = getModifiedPropertyValue(electronicRecord.getName());
-        String elecnewTitle = getModifiedPropertyValue(electronicRecord.getProperties().getTitle());
-        String elecnewDescription = getModifiedPropertyValue(electronicRecord.getProperties().getDescription());
-        recordsAPI.updateRecord(createRecordModel(elecnewName, elecnewDescription, elecnewTitle),elecrecord.getId());
-        assertStatusCode(OK);
-    }
-}
-

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/SearchDocumentsV1Test.java

@@ -72,7 +72,7 @@ public class SearchDocumentsV1Test extends BaseRMRestTest
         cmisQueryModel.setLanguage("cmis");
 
         RestRequestQueryModel aftsQueryModel = new RestRequestQueryModel();
-        aftsQueryModel.setQuery("cm:name:*" + SEARCH_TERM + ".txt");
+        aftsQueryModel.setQuery("cm:name:*" + SEARCH_TERM);
         aftsQueryModel.setLanguage("afts");
 
         return new RestRequestQueryModel[][] {
@@ -107,7 +107,7 @@ public class SearchDocumentsV1Test extends BaseRMRestTest
     private void waitIndexing() throws Exception
     {
         RestRequestQueryModel queryType = new RestRequestQueryModel();
-        queryType.setQuery("cm:name:*" + SEARCH_TERM + ".txt");
+        queryType.setQuery("cm:name:*" + SEARCH_TERM);
         queryType.setLanguage("afts");
         Utility.sleep(1000, 80000, () ->
         {

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/smoke/DispositionScheduleLinkedRecordsTest.java

@@ -53,6 +53,7 @@ import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.AssertJUnit;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
@@ -68,6 +69,7 @@ import static org.alfresco.rest.rm.community.model.recordcategory.RetentionPerio
 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.util.CommonTestUtils.generateTestPrefix;
+import static org.alfresco.utility.data.RandomData.getRandomName;
 import static org.alfresco.utility.report.log.Step.STEP;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -120,7 +122,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
         // create "rm Manager" user if it does not exist and assign it to RM Administrator role
         UserModel 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);
     }
 
@@ -137,6 +139,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
      **/
     @Test(enabled = false) // temporary disabled, see ACS-6073
     @AlfrescoTest(jira = "RM-1622")
+    @Ignore
     public void dispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
         STEP("Create record category");
         RecordCategory category1 = createRootCategory(CATEGORY_RM_3077);
@@ -204,6 +207,7 @@ public class DispositionScheduleLinkedRecordsTest extends BaseRMRestTest {
      * */
     @Test(enabled = false) // temporary disabled, see ACS-6073
     @AlfrescoTest (jira = "RM-3060")
+    @Ignore
     public void sameDispositionScheduleLinkedRecords() throws UnsupportedEncodingException {
 
         // create a category with retention applied on records level

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/utils/AlphabeticalPriorityInterceptor.java

@@ -26,19 +26,27 @@
  */
 package org.alfresco.rest.rm.community.utils;
 
-import org.testng.ITestResult;
-import org.testng.util.RetryAnalyzerCount;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
 
-public class AlfrescoRetryAnalyzer extends RetryAnalyzerCount
+import org.testng.IMethodInstance;
+import org.testng.IMethodInterceptor;
+import org.testng.ITestContext;
+
+/**
+ * A method interceptor that sorts test classes alphabetically.
+ *
+ * @author Damian Ujma
+ */
+public class AlphabeticalPriorityInterceptor implements IMethodInterceptor
 {
-    public AlfrescoRetryAnalyzer() {
-        super();
-        setCount(3);
-    }
-
     @Override
-    public boolean retryMethod(ITestResult result)
+    public List<IMethodInstance> intercept(List<IMethodInstance> methods,
+        ITestContext context)
     {
-        return true;
+        return methods.stream()
+            .sorted(Comparator.comparing(methodInstance -> methodInstance.getMethod().getTestClass().getName()))
+            .collect(Collectors.toList());
     }
 }

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties

@@ -0,0 +1,11 @@
+# Root logger option
+log4j.rootLogger=INFO, file
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=./target/reports/rm-automation-community-rest-api.log
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+log4j.logger.com.example=debug

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/resources/log4j2.properties

@@ -1,20 +0,0 @@
-###### Root Logger #######
-rootLogger.level=info
-rootLogger.appenderRef.rolling.ref=RollingAppender
-
-###### File appender definition #######
-appender.rolling.type=RollingFile
-appender.rolling.name=RollingAppender
-appender.rolling.fileName=target/reports/rm-automation-community-rest-api.log
-appender.rolling.filePattern=target/reports/rm-automation-community-rest-api.log.%i
-appender.rolling.layout.type=PatternLayout
-appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.rolling.policies.type=Policies
-appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size=10MB
-appender.rolling.strategy.type=DefaultRolloverStrategy
-appender.rolling.strategy.max=10
-
-###### Loggers definitions #######
-logger.com-example.name=com.example
-logger.com-example.level=debug

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/resources/testng.xml

@@ -2,7 +2,7 @@
 
 <suite name="TestNG AllTestSuite" configfailurepolicy="continue" verbose="1" time-out="300000">
    <listeners>
-      <listener class-name="org.alfresco.utility.testng.AlphabeticalPriorityInterceptor" />
+      <listener class-name="org.alfresco.rest.rm.community.utils.AlphabeticalPriorityInterceptor" />
    </listeners>
    <test name="restapi" preserve-order="false">
       <packages>

amps/ags/rm-community/pom.xml

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

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

@@ -1,3 +1,3 @@
 SOLR6_TAG=2.0.11
-POSTGRES_TAG=15.4
-ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
+POSTGRES_TAG=14.4
+ACTIVEMQ_TAG=5.17.6-jre17-rockylinux8

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.

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
@@ -116,8 +116,8 @@ rm.patch.v35.holdNewChildAssocPatch.batchSize=1000
 # Permission mapping
 # these take a comma separated string of permissions from org.alfresco.service.cmr.security.PermissionService
 # read maps to ReadRecords and write to FileRecords
-rm.haspermissionmap.read=Read
-rm.haspermissionmap.write=WriteProperties,AddChildren,ReadContent
+rm.haspermissionmap.read=ReadProperties,ReadChildren
+rm.haspermissionmap.write=WriteProperties,AddChildren
 
 #
 # Extended auto-version behaviour.  If true and other auto-version properties are satisfied, then

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/log4j.properties

@@ -0,0 +1,60 @@
+#
+# Warnings
+#
+log4j.logger.org.alfresco.module.org_alfresco_module_rm.caveat=warn
+log4j.logger.org.alfresco.module.org_alfresco_module_rm.security.RMMethodSecurityPostProcessor=warn
+
+#
+# Module patches
+#
+log4j.logger.org.alfresco.module.org_alfresco_module_rm.patch=info
+
+#
+# Set to 'debug' to see details of capability failures when AccessDenied is thrown.  May be
+# removed to enhance performance.
+#
+log4j.logger.org.alfresco.module.org_alfresco_module_rm.security.RMMethodSecurityInterceptor=info
+
+#
+# RM permission debug
+#
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.capability.RMEntryVoter=debug
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.capability.RMAfterInvocationProvider=debug
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.capability.declarative=debug
+
+#
+# RM Audit service debug
+#
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService=debug
+
+#
+# Job debug
+#
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.job=debug
+
+#
+# Script logging level
+#
+log4j.logger.org.alfresco.repo.jscript.ScriptLogger=error
+
+#
+# Behaviour debug
+#
+log4j.logger.org.alfresco.repo.policy.annotation.AnnotatedBehaviourPostProcessor=info
+log4j.logger.org.alfresco.module.org_alfresco_module_rm.behaviour.BaseBehaviourBean=info
+
+#
+# Patch debug
+#
+log4j.logger.org.alfresco.module.org_alfresco_module_rm.patch=info
+#
+# RM Audit service debug
+#
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService=debug
+
+#
+# Job debug
+#
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.job=debug
+log4j.logger.org.alfresco.repo.web.scripts.roles.DynamicAuthoritiesGet=info
+log4j.logger.org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAOImpl=info

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/log4j2.properties

@@ -1,50 +0,0 @@
-# Warnings
-logger.alfresco-module-org_alfresco_module_rm-caveat.name=org.alfresco.module.org_alfresco_module_rm.caveat
-logger.alfresco-module-org_alfresco_module_rm-caveat.level=warn
-
-logger.alfresco-module-org_alfresco_module_rm-security-RMMethodSecurityPostProcessor.name=org.alfresco.module.org_alfresco_module_rm.security.RMMethodSecurityPostProcessor
-logger.alfresco-module-org_alfresco_module_rm-security-RMMethodSecurityPostProcessor.level=warn
-
-# Module patches
-logger.alfresco-module-org_alfresco_module_rm-patch.name=org.alfresco.module.org_alfresco_module_rm.patch
-logger.alfresco-module-org_alfresco_module_rm-patch.level=info
-
-# Set to 'debug' to see details of capability failures when AccessDenied is thrown.  May be
-# removed to enhance performance.
-logger.alfresco-module-org_alfresco_module_rm-security-RMMethodSecurityInterceptor.name=org.alfresco.module.org_alfresco_module_rm.security.RMMethodSecurityInterceptor
-logger.alfresco-module-org_alfresco_module_rm-security-RMMethodSecurityInterceptor.level=info
-
-# RM permission debug
-#logger.alfresco-module-org_alfresco_module_rm-capability-RMEntryVoter.name=org.alfresco.module.org_alfresco_module_rm.capability.RMEntryVoter
-#logger.alfresco-module-org_alfresco_module_rm-capability-RMEntryVoter.level=debug
-
-#logger.alfresco-module-org_alfresco_module_rm-capability-RMAfterInvocationProvider.name=org.alfresco.module.org_alfresco_module_rm.capability.RMAfterInvocationProvider
-#logger.alfresco-module-org_alfresco_module_rm-capability-RMAfterInvocationProvider.level=debug
-
-#logger.alfresco-module-org_alfresco_module_rm-capability-declarative.name=org.alfresco.module.org_alfresco_module_rm.capability.declarative
-#logger.alfresco-module-org_alfresco_module_rm-capability-declarative.level=debug
-
-# RM Audit service debug
-#logger.alfresco-module-org_alfresco_module_rm-audit-RecordsManagementAuditService.name=org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditService
-#logger.alfresco-module-org_alfresco_module_rm-audit-RecordsManagementAuditService.level=debug
-
-# Job debug
-#logger.alfresco-module-org_alfresco_module_rm-job.name=org.alfresco.module.org_alfresco_module_rm.job
-#logger.alfresco-module-org_alfresco_module_rm-job.level=debug
-
-# Script logging level
-logger.alfresco-repo-jscript-ScriptLogger.name=org.alfresco.repo.jscript.ScriptLogger
-logger.alfresco-repo-jscript-ScriptLogger.level=error
-
-# Behaviour debug
-logger.alfresco-repo-policy-annotation-AnnotatedBehaviourPostProcessor.name=org.alfresco.repo.policy.annotation.AnnotatedBehaviourPostProcessor
-logger.alfresco-repo-policy-annotation-AnnotatedBehaviourPostProcessor.level=info
-
-logger.alfresco-module-org_alfresco_module_rm-behaviour-BaseBehaviourBean.name=org.alfresco.module.org_alfresco_module_rm.behaviour.BaseBehaviourBean
-logger.alfresco-module-org_alfresco_module_rm-behaviour-BaseBehaviourBean.level=info
-
-logger.alfresco-repo-web-scripts-roles-DynamicAuthoritiesGet.name=org.alfresco.repo.web.scripts.roles.DynamicAuthoritiesGet
-logger.alfresco-repo-web-scripts-roles-DynamicAuthoritiesGet.level=info
-
-logger.alfresco-module-org_alfresco_module_rm-query-RecordsManagementQueryDAOImpl.name=org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAOImpl
-logger.alfresco-module-org_alfresco_module_rm-query-RecordsManagementQueryDAOImpl.level=info

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.2.2.4-SNAPSHOT</version>
+      <version>19.106</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>
@@ -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>

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;

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;

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);
     }
 
     /**

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java

@@ -30,10 +30,8 @@ package org.alfresco.module.org_alfresco_module_rm.job;
 import static org.alfresco.module.org_alfresco_module_rm.action.RMDispositionActionExecuterAbstractBase.PARAM_NO_ERROR_CHECK;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import lombok.extern.slf4j.Slf4j;
 import org.alfresco.error.AlfrescoRuntimeException;
@@ -49,6 +47,7 @@ import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.SearchParameters;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.cmr.security.PersonService;
+import org.springframework.extensions.surf.util.I18NUtil;
 
 
 /**
@@ -65,6 +64,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
     /** batching properties */
     private int batchSize;
     public static final int DEFAULT_BATCH_SIZE = 500;
+    private static final String MSG_NODE_FROZEN = "rm.action.node.frozen.error-message";
 
     /** list of disposition actions to automatically execute */
     private List<String> dispositionActions;
@@ -194,7 +194,6 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
 
             boolean hasMore = true;
             int skipCount = 0;
-            List<NodeRef> resultNodes = new ArrayList<>();
 
             if (batchSize < 1)
             {
@@ -215,14 +214,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
 
                 // execute search
                 ResultSet results = searchService.query(params);
-                if(results != null)
-                {
-                    // filtering out the hold/freezed cases from the result set
-                    resultNodes =
-                            results.getNodeRefs().stream().filter(node -> nodeService.getPrimaryParent(node) == null ?
-                                    !freezeService.isFrozenOrHasFrozenChildren(node) :
-                                    !freezeService.isFrozenOrHasFrozenChildren(nodeService.getPrimaryParent(node).getParentRef())).collect(Collectors.toList());
-                }
+                List<NodeRef> resultNodes = results.getNodeRefs();
                 hasMore = results.hasMore();
                 skipCount += resultNodes.size(); // increase by page size
                 results.close();
@@ -273,6 +265,12 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
                 }
                 Map<String, Serializable> props = Map.of(PARAM_NO_ERROR_CHECK, false);
 
+                if (freezeService.isFrozenOrHasFrozenChildren(parent.getParentRef()))
+                {
+                    log.debug(I18NUtil.getMessage(MSG_NODE_FROZEN, dispAction));
+                    continue;
+                }
+
                 try
                 {
                     // execute disposition action

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;

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;

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;

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;

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;

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;

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;

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;

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;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java

@@ -25,7 +25,7 @@
  * #L%
  */
 /*
- * Copyright (C) 2005 - 2024 Alfresco Software Limited.
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -44,7 +44,7 @@
  */
 package org.alfresco.repo.web.scripts.roles;
 
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/schedule/UpdateRecordScheduleGet.java

@@ -25,7 +25,7 @@
  * #L%
  */
 /*
- * Copyright (C) 2005 - 2024 Alfresco Software Limited.
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -54,7 +54,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;

amps/ags/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/jscript/JSONConversionComponentTest.java

@@ -139,7 +139,7 @@ public class JSONConversionComponentTest extends BaseRMTestCase
             Serializable value = stringValue;
             if (type.equals("boolean"))
             {
-                value = Boolean.valueOf(stringValue);
+                value = new Boolean(stringValue);
             }
             return value;
         }

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

@@ -3,9 +3,9 @@
 #
 
 # Version label
-version.major=23
-version.minor=2
-version.revision=2
+version.major=7
+version.minor=3
+version.revision=3
 version.label=
 
 # Edition label

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java

@@ -170,7 +170,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         executer.executeImpl();
 
         // then
-        verify(mockedNodeService, times(2)).getPrimaryParent(any(NodeRef.class));
+
         // ensure the query is executed and closed
         verifyQueryTimes(2);
 
@@ -206,7 +206,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         executer.executeImpl();
 
         // then
-        verify(mockedNodeService, times(1)).getPrimaryParent(any(NodeRef.class));
+
         // ensure the query is executed and closed
         verifyQueryTimes(1);
 
@@ -262,11 +262,11 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         // ensure each node is process correctly
         // node1
         verify(mockedNodeService, times(1)).getProperty(node1, RecordsManagementModel.PROP_DISPOSITION_ACTION);
-        verify(mockedNodeService, times(3)).getPrimaryParent(node1);
+        verify(mockedNodeService, times(1)).getPrimaryParent(node1);
         verify(mockedRecordsManagementActionService, times(1)).executeRecordsManagementAction(eq(parent), eq(CUTOFF), anyMap());
         // node2
         verify(mockedNodeService, times(1)).getProperty(node2, RecordsManagementModel.PROP_DISPOSITION_ACTION);
-        verify(mockedNodeService, times(3)).getPrimaryParent(node2);
+        verify(mockedNodeService, times(1)).getPrimaryParent(node2);
         verify(mockedRecordsManagementActionService, times(1)).executeRecordsManagementAction(eq(parent), eq(RETAIN), anyMap());
 
         // ensure no more interactions
@@ -329,7 +329,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         // call the service
         executer.executeImpl();
 
-        // check the loop iterated through all the elements
+        // check the loop iterated trough all the elements
         verify(mockedNodeService).exists(node1);
         verify(mockedNodeService).exists(node2);
         verify(mockedNodeService).exists(node3);

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;
     }
 }

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",

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.2.2.4-SNAPSHOT</version>
+        <version>19.106</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>

amps/ags/rm-community/rm-community-rest-api-explorer/src/main/webapp/definitions/gs-core-api.yaml

@@ -38,7 +38,6 @@ tags:
     description: Retrieve and manage unfiled records containers
   - name: unfiled-record-folders
     description: Retrieve and manage unfiled record folders
-
 paths:
   ## GS sites
   '/gs-sites':
@@ -2092,7 +2091,6 @@ paths:
           description: Unexpected error
           schema:
             $ref: '#/definitions/Error'
-
 parameters:
   ## File plans
   filePlanEntryIncludeParam:
@@ -3761,4 +3759,4 @@ definitions:
           - SiteConsumer
           - SiteCollaborator
           - SiteContributor
-          - SiteManager
+          - SiteManager

amps/pom.xml

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

amps/share-services/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>23.2.2.4-SNAPSHOT</version>
+        <version>19.106</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>
 

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;

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
          },

amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary-v2/filters.lib.js

@@ -241,7 +241,7 @@ var Filters =
                filterData = filterData.slice(0, -1);
             }
             filterQuery = this.constructPathQuery(parsedArgs);
-            filterParams.query = filterQuery + " +PATH:\"/cm:categoryRoot/cm:generalclassifiable" + Filters.iso9075EncodePath(filterData) + "/member\"";
+            filterParams.query = filterQuery + " +PATH:\"/cm:generalclassifiable" + Filters.iso9075EncodePath(filterData) + "/member\"";
             break;
 
          case "aspect":

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,

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);
-}
+}

amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/filters.lib.js

@@ -230,7 +230,7 @@ var Filters =
                filterData = filterData.slice(0, -1);
             }
             filterQuery = this.constructPathQuery(parsedArgs);
-            filterParams.query = filterQuery + " +PATH:\"/cm:categoryRoot/cm:generalclassifiable" + Filters.iso9075EncodePath(filterData) + "/member\"";
+            filterParams.query = filterQuery + " +PATH:\"/cm:generalclassifiable" + Filters.iso9075EncodePath(filterData) + "/member\"";
             break;
 
          default: // "path"

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();

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;

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;

core/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>23.2.2.4-SNAPSHOT</version>
+      <version>19.106</version>
    </parent>
 
    <dependencies>
@@ -54,14 +54,9 @@
          <classifier>asl</classifier>
       </dependency>
       <dependency>
-         <groupId>org.apache.logging.log4j</groupId>
-         <artifactId>log4j-api</artifactId>
-         <version>${dependency.log4j.version}</version>
-      </dependency>
-      <dependency>
-         <groupId>org.apache.logging.log4j</groupId>
-         <artifactId>log4j-core</artifactId>
-         <version>${dependency.log4j.version}</version>
+         <groupId>ch.qos.reload4j</groupId>
+         <artifactId>reload4j</artifactId>
+         <version>1.2.18.3</version>
       </dependency>
       <dependency>
          <groupId>org.json</groupId>
@@ -111,14 +106,15 @@
 
       <!-- 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 -->
       <dependency>
-         <groupId>org.apache.logging.log4j</groupId>
-         <artifactId>log4j-slf4j2-impl</artifactId>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-reload4j</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>
@@ -136,10 +132,6 @@
          <artifactId>commons-dbcp2</artifactId>
          <scope>test</scope>
       </dependency>
-      <dependency>
-         <groupId>org.apache.httpcomponents</groupId>
-         <artifactId>httpclient</artifactId>
-      </dependency>
    </dependencies>
 
    <build>

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;

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;
 

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;
-    }
-}

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);
-        }
-    }
-}

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);
-    }
-}

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

core/src/main/java/org/alfresco/util/log/NDC.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2022 Alfresco Software Limited.
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
 
 
 /**
- * A stand in for the org.apache.logging.log4j.ThreadContext class that avoids introducing runtime dependencies against the otherwise
+ * A stand in for the org.apache.log4j.NDC class that avoids introducing runtime dependencies against the otherwise
  * optional log4j.
  * 
  * @author dward
@@ -32,7 +32,7 @@ public class NDC
 {
     private static Log logger = LogFactory.getLog(NDC.class);
     
-    /** Log4J2 delegate for NDC */
+    /** Log4J delegate for NDC */
     private static NDCDelegate ndcDelegate;
 
     static

core/src/main/java/org/alfresco/util/log/log4j/Log4JNDC.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2022 Alfresco Software Limited.
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,19 +25,19 @@
 package org.alfresco.util.log.log4j;
 
 import org.alfresco.util.log.NDCDelegate;
-import org.apache.logging.log4j.ThreadContext;
+import org.apache.log4j.NDC;
 
 /**
- * A stand in for the org.apache.logging.log4j.ThreadContext class that avoids introducing runtime dependencies against the otherwise
+ * A stand in for the org.apache.log4j.NDC class that avoids introducing runtime dependencies against the otherwise
  * optional log4j.
  * 
  * @author dward
  */
 public class Log4JNDC implements NDCDelegate
 {
-    // Force resolution of the log4j2 ThreadContext class by the classloader (thus forcing an error if unavailable)
+    // Force resolution of the log4j NDC class by the classloader (thus forcing an error if unavailable)
     @SuppressWarnings("unused")
-    private static final Class<?> NDC_REF = ThreadContext.class;
+    private static final Class<?> NDC_REF = NDC.class;
 
     /**
      * Push new diagnostic context information for the current thread.
@@ -47,7 +47,7 @@ public class Log4JNDC implements NDCDelegate
      */
     public void push(String message)
     {
-        ThreadContext.push(message);
+        NDC.push(message);
     }
 
     /**
@@ -55,6 +55,6 @@ public class Log4JNDC implements NDCDelegate
      */
     public void remove()
     {
-        ThreadContext.clearAll();
+        NDC.remove();
     }
 }

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;

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();
 }

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()
     {

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))
             {
 

core/src/test/java/org/alfresco/query/CannedQueryTest.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
  *
@@ -55,11 +55,11 @@ public class CannedQueryTest extends TestCase
         RESULTS_TWO = new ArrayList<Long>(10);
         for (int i = 0; i < 10; i++)
         {
-            RESULTS_TWO.add(Long.valueOf(i));
+            RESULTS_TWO.add(new Long(i));
         }
         ANTI_RESULTS = new HashSet<Object>();
         ANTI_RESULTS.add("ONE_5");
-        ANTI_RESULTS.add(Long.valueOf(5));
+        ANTI_RESULTS.add(new Long(5));
     }
     
     @SuppressWarnings("rawtypes")

core/src/test/java/org/alfresco/util/VersionNumberTest.java

@@ -25,7 +25,6 @@ import junit.framework.TestCase;
  * 
  * @author Roy Wetherall
  */
-@SuppressWarnings({"PMD.DetachedTestCase", "PMD.JUnit4TestShouldUseTestAnnotation"})
 public class VersionNumberTest extends TestCase
 {
     public void testCreate()
@@ -137,36 +136,4 @@ public class VersionNumberTest extends TestCase
         assertEquals(-1, version8.compareTo(version9));
         assertEquals(-1, version9.compareTo(version10));
     }
-
-    public void testCompareNewSchema() {
-        // module min/max repo version is 23, actual ACS version is 23.1.0 which is greater than module
-        VersionNumber repoVersionMin = new VersionNumber("23");
-        VersionNumber repoVerisionActual = new VersionNumber("23.1.0");
-        assertEquals(1, repoVerisionActual.compareTo(repoVersionMin));
-
-        // module min/max repo version is 23.2, actual ACS version is 23.1.1 which is lower than module
-        repoVersionMin = new VersionNumber("23.2");
-        repoVerisionActual = new VersionNumber("23.1.1");
-        assertEquals(-1, repoVerisionActual.compareTo(repoVersionMin));
-
-        // module min/max repo version is 7.4, actual ACS version is 23.1.0 which is greater than module
-        repoVersionMin = new VersionNumber("7.4");
-        repoVerisionActual = new VersionNumber("23.1.0");
-        assertEquals(1, repoVerisionActual.compareTo(repoVersionMin));
-
-        // module min/max repo version is 24, actual ACS version is 24.1.0 which is greater than module
-        repoVersionMin = new VersionNumber("24");
-        repoVerisionActual = new VersionNumber("24.1.0");
-        assertEquals(1, repoVerisionActual.compareTo(repoVersionMin));
-
-        // module min/max repo version is 24, actual ACS version is 23.2.0 which is lower than module
-        repoVersionMin = new VersionNumber("24");
-        repoVerisionActual = new VersionNumber("23.2.0");
-        assertEquals(-1, repoVerisionActual.compareTo(repoVersionMin));
-
-        // module min/max repo version is 24.2, actual ACS version is 24.2.0 which is equal to module
-        repoVersionMin = new VersionNumber("24.2");
-        repoVerisionActual = new VersionNumber("24.2.0");
-        assertEquals(0, repoVerisionActual.compareTo(repoVersionMin));
-    }
 }

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;
 

data-model/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.2.2.4-SNAPSHOT</version>
+        <version>19.106</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.6.2</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/
@@ -216,6 +260,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>

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();
+
     }
+
 }

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())
         {

data-model/src/main/java/org/alfresco/service/cmr/repository/AssociationRef.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 
@@ -121,7 +121,7 @@ public class AssociationRef implements EntityRef, Serializable
         String targetNodeRefStr = tokenizer.nextToken();
         String assocTypeQNameStr = tokenizer.nextToken();
         
-        this.id = Long.valueOf(idStr);
+        this.id = new Long(idStr);
         this.sourceRef = new NodeRef(sourceNodeRefStr);
         this.targetRef = new NodeRef(targetNodeRefStr);
         this.assocTypeQName = QName.createQName(assocTypeQNameStr);

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);
     }
 }

data-model/src/main/java/org/alfresco/service/cmr/repository/MLText.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 
@@ -51,18 +51,6 @@ public class MLText extends HashMap<Locale, String>
 {
     private static final long serialVersionUID = -3696135175650511841L;
 
-    /**
-     * Returns default locale used by the {@link MLText} implementation
-     *
-     * @see I18NUtil#getLocale()
-     *
-     * @return default locale
-     */
-    public static Locale getDefaultLocale()
-    {
-        return I18NUtil.getLocale();
-    }
-
     public MLText()
     {
         super(3, 0.75F);
@@ -73,13 +61,13 @@ public class MLText extends HashMap<Locale, String>
      * 
      * @param value the value for the current default locale
      * 
-     * @see #getDefaultLocale()
+     * @see I18NUtil#getLocale()
      * @see #MLText(Locale, String)
      * @see #getDefaultValue()
      */
     public MLText(String value)
     {
-        this(getDefaultLocale(), value);
+        this(I18NUtil.getLocale(), value);
     }
     
     /**
@@ -136,7 +124,7 @@ public class MLText extends HashMap<Locale, String>
     /**
      * Retrieves a default value from the set of available locales.<br/>
      * 
-     * @see #getDefaultLocale()
+     * @see I18NUtil#getLocale()
      * @see #getClosestValue(Locale)
      */
     public String getDefaultValue()
@@ -147,7 +135,7 @@ public class MLText extends HashMap<Locale, String>
             return null;
         }
         // There is some hope of getting a match
-        Locale locale = getDefaultLocale();
+        Locale locale = I18NUtil.getLocale();
         return getClosestValue(locale);
     }
     
@@ -180,7 +168,7 @@ public class MLText extends HashMap<Locale, String>
         if (match == null)
         {
             // No close matches for the locale - go for the default locale
-            locale = getDefaultLocale();
+            locale = I18NUtil.getLocale();
             match = I18NUtil.getNearestLocale(locale, options);
             if (match == null)
             {