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

[ACS-7896] Bump AIS/ATS 5.1.2/4.1.2 (#2639 )
[maven-release-plugin][skip ci] prepare for next development iteration
2025-09-10 14:11:58 +00:00 · 2024-05-20 08:39:05 +00:00 · 2024-05-20 10:17:02 +02:00 · 2024-05-16 09:59:54 +00:00 · 2024-05-16 09:59:52 +00:00 · 2024-05-16 11:37:26 +02:00
7732 changed files with 993414 additions and 1126523 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -14,6 +14,15 @@ updates:
    timezone: Africa/Abidjan
  open-pull-requests-limit: 99
  ignore:
+  - dependency-name: com.google.code.gson:gson
+    versions:
+    - "> 2.8.6"
+  - dependency-name: io.fabric8:fabric8-maven-plugin
+    versions:
+    - "> 4.4.0"
+  - dependency-name: javax.servlet:javax.servlet-api
+    versions:
+    - "> 3.0.1"
  - dependency-name: org.acegisecurity:acegi-security
    versions:
    - "> 0.8.2_patched"
@@ -43,16 +52,109 @@ 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"
-  directory: "packaging/docker-alfresco/"
-  schedule:
-    interval: "daily"
-    time: "22:00"
-    timezone: Africa/Abidjan
- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: "monthly"
--- a/.github/workflows/ci.yml
+++ b/.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,15 +32,13 @@ 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: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
        with:
-          fetch-depth: 0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v8.24.1
+          java-version: "11"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Prepare maven cache and check compilation"
@@ -52,136 +46,49 @@ jobs:
      - 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' || startsWith(github.ref_name, 'release/')) && github.event_name != 'pull_request') &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v8.24.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v1.33.0
        continue-on-error: true
        with:
          srcclr-api-token: ${{ secrets.SRCCLR_API_TOKEN }}
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh
-
-  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@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/github-download-file@v8.24.1
-        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: "Remove excluded files"
-        run: |
-          mkdir temp-dir-for-sast
-          bash ./scripts/ci/remove-sast-exclusions.sh ./packaging/war/target/alfresco.war temp-dir-for-sast/reduced.war
-      - 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: "temp-dir-for-sast/reduced.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: "Remove temporary directory"
-        run: rm -rfv temp-dir-for-sast
-      - 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@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
-      - uses: Alfresco/ya-pmd-scan@v4.3.0
-        with:
-          classpath-build-command: "mvn test-compile -ntp -Pags -pl \"-:alfresco-community-repo-docker\""
-
+        
  all_unit_tests_suite:
-    name: ${{ matrix.testName }} - AllUnitTestsSuite - Build and test
+    name: "Core, Data-Model, Repository - AllUnitTestsSuite - Build and test"
    runs-on: ubuntu-latest
    needs: [prepare]
    if: >
      !contains(github.event.head_commit.message, '[skip repo]') &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - testName: Core
-            testModule: core
-            testAttributes: "-Dtest=AllCoreUnitTestSuite"
-          - testName: Data-Model
-            testModule: data-model
-            testAttributes: "-Dtest=AllDataModelUnitTestSuite"
-          - testName: Repository
-            testModule: repository
-            testAttributes: "-Dtest=AllUnitTestsSuite"
-          - testName: Mmt
-            testModule: mmt
-            testAttributes: "-Dtest=AllMmtUnitTestSuite"
+      !contains(github.event.head_commit.message, '[force]')
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run tests"
        run: |
-          mvn -B test -pl ${{ matrix.testModule }} -am ${{ matrix.testAttributes }} -DfailIfNoTests=false "${args[@]}"
+          mvn -B test -pl core,data-model -am -DfailIfNoTests=false
+          mvn -B test -pl "repository,mmt" -am "-Dtest=AllUnitTestsSuite,AllMmtUnitTestSuite" -DfailIfNoTests=false
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -192,7 +99,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:
@@ -210,10 +117,11 @@ jobs:
    env:
      REQUIRES_INSTALLED_ARTIFACTS: true
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -222,10 +130,9 @@ jobs:
      - name: "Set transformers tag"
        run: echo "TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)" >> $GITHUB_ENV
      - name: "Set up the environment"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
      - name: "Run tests"
-        run: mvn -B test -pl remote-api -Dtest=${{ matrix.testSuite }} -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco  # pragma: allowlist secret
+        run: mvn -B test -pl remote-api -Dtest=${{ matrix.testSuite }} -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -239,29 +146,30 @@ jobs:
      !contains(github.event.head_commit.message, '[skip db]')) ||
      contains(github.event.head_commit.message, '[db]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    strategy:
      fail-fast: false
      matrix:
-        version: ['10.5', '10.6']
+        version: ['10.2.18', '10.4', '10.5']
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: Run MariaDB ${{ matrix.version }} database
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d
        env:
          MARIADB_VERSION: ${{ matrix.version }}
      - name: "Run tests"
-        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver # pragma: allowlist secret
+        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

-  repository_mariadb_10_11_tests:
-    name: "Repository - MariaDB 10.11 tests"
+  repository_mariadb_10_6_tests:
+    name: "Repository - MariaDB 10.6 tests"
    runs-on: ubuntu-latest
    needs: [prepare]
    if: >
@@ -270,20 +178,50 @@ 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@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - name: "Run MariaDB 10.11 database"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d
+      - name: "Run MariaDB 10.6 database"
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d
        env:
-          MARIADB_VERSION: 10.11
+          MARIADB_VERSION: 10.6
      - name: "Run tests"
-        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver # pragma: allowlist secret
+        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.name=alfresco -Ddb.url=jdbc:mariadb://localhost:3307/alfresco?useUnicode=yes\&characterEncoding=UTF-8 -Ddb.username=alfresco -Ddb.password=alfresco -Ddb.driver=org.mariadb.jdbc.Driver
+      - name: "Clean Maven cache"
+        run: bash ./scripts/ci/cleanup_cache.sh
+
+  repository_mysql_5_7_28_tests:
+    name: Repository - MySQL 5.7.28 tests
+    runs-on: ubuntu-latest
+    needs: [prepare]
+    if: >
+      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
+      github.event_name != 'pull_request' &&
+      !contains(github.event.head_commit.message, '[skip db]')) ||
+      contains(github.event.head_commit.message, '[db]')) &&
+      !contains(github.event.head_commit.message, '[skip tests]') &&
+      !contains(github.event.head_commit.message, '[force]')
+    steps:
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
+      - name: "Init"
+        run: bash ./scripts/ci/init.sh
+      - name: "Run MySQL 5.7.28 database"
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mysql up -d
+        env:
+          MYSQL_VERSION: 5.7.28
+          MYSQL_PARAMS: --transaction-isolation='READ-COMMITTED' --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+      - name: "Run tests"
+        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -297,77 +235,59 @@ 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@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run MySQL 8 database"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mysql up -d
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mysql up -d
        env:
          MYSQL_VERSION: 8
+          MYSQL_PARAMS: --transaction-isolation='READ-COMMITTED'
      - name: "Run tests"
-        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco # pragma: allowlist secret
+        run: mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

-  repository_postgresql_14_15_tests:
-    name: "Repository - PostgreSQL 14.15 tests"
+  repository_postgresql_tests:
+    name: Repository - PostgreSQL ${{ matrix.version }} 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' || 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')
+      !contains(github.event.head_commit.message, '[force]')
+    strategy:
+      fail-fast: false
+      matrix:
+        version: ['10.9', '11.12', '11.7', '12.4', '12.7', '13.1']
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - name: "Run PostgreSQL 14.15 database"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
+      - name: Run PostgreSQL ${{ matrix.version }} database
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
        env:
-          POSTGRES_VERSION: 14.15
+          POSTGRES_VERSION: ${{ matrix.version }}
      - 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 # pragma: allowlist secret
+        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_10_tests:
-    name: "Repository - PostgreSQL 15.10 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@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
-      - name: "Init"
-        run: bash ./scripts/ci/init.sh
-      - name: "Run PostgreSQL 15.10 database"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
-        env:
-          POSTGRES_VERSION: 15.10
-      - 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 # pragma: allowlist secret
-      - name: "Clean Maven cache"
-        run: bash ./scripts/ci/cleanup_cache.sh
-
-  repository_postgresql_16_6_tests:
-    name: "Repository - PostgreSQL 16.6 tests"
+  repository_postgresql_13_3_tests:
+    name: "Repository - PostgreSQL 13.3 tests"
    runs-on: ubuntu-latest
    needs: [prepare]
    if: >
@@ -375,20 +295,21 @@ 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@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - name: "Run PostgreSQL 16.6 database"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
+      - name: "Run PostgreSQL 13.3 database"
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
        env:
-          POSTGRES_VERSION: 16.6
+          POSTGRES_VERSION: 13.3
      - 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 # pragma: allowlist secret
+        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

@@ -399,29 +320,30 @@ 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@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
      - name: "Run ActiveMQ"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile activemq up -d
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile activemq up -d
      - name: "Run tests"
-        run: mvn -B test -pl repository -am -Dtest=CamelRoutesTest,CamelComponentsTest -DfailIfNoTests=false # pragma: allowlist secret
+        run: mvn -B test -pl repository -am -Dtest=CamelRoutesTest,CamelComponentsTest -DfailIfNoTests=false
      - name: "Clean Maven cache"
        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:
@@ -436,12 +358,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
@@ -451,38 +368,20 @@ 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@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
      - 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"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
      - name: "Run tests"
-        run: mvn -B test -pl repository -am -Dtest=${{ matrix.testSuite }} -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco ${{ matrix.mvn-options }} # pragma: allowlist secret
+        run: mvn -B test -pl repository -am -Dtest=${{ matrix.testSuite }} -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco ${{ matrix.mvn-options }}
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -495,7 +394,7 @@ jobs:
      !contains(github.event.head_commit.message, '[skip tas]')) ||
      contains(github.event.head_commit.message, '[tas]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    strategy:
      fail-fast: false
      matrix:
@@ -527,17 +426,17 @@ jobs:
    env:
      REQUIRES_LOCAL_IMAGES: true
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
          bash ./scripts/ci/init.sh
          bash ./scripts/ci/build.sh
      - name: "Set up the environment"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
          ${{ env.TAS_SCRIPTS }}/start-compose.sh ${{ env.TAS_ENVIRONMENT }}/docker-compose-minimal+transforms.yml
          ${{ env.TAS_SCRIPTS }}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
@@ -564,18 +463,19 @@ 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@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - name: "Run Postgres 16.6 database"
-        run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d
+      - name: "Run Postgres 14.4 database"
+        run: docker-compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d
      - name: "Run tests"
-        run: mvn -B test -pl :alfresco-share-services -am -Dtest=ShareServicesTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco # pragma: allowlist secret
+        run: mvn -B test -pl :alfresco-share-services -am -Dtest=ShareServicesTestSuite -DfailIfNoTests=false -Ddb.driver=org.postgresql.Driver -Ddb.name=alfresco -Ddb.url=jdbc:postgresql://localhost:5433/alfresco -Ddb.username=alfresco -Ddb.password=alfresco
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh

@@ -588,18 +488,19 @@ jobs:
      !contains(github.event.head_commit.message, '[skip ags]')) ||
      contains(github.event.head_commit.message, '[ags]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    strategy:
      fail-fast: false
      matrix:
-        part: [1, 2, 3, 4]
+        part: [1, 2, 3]
    env:
      REQUIRES_INSTALLED_ARTIFACTS: true
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -620,18 +521,19 @@ jobs:
      !contains(github.event.head_commit.message, '[skip ags]')) ||
      contains(github.event.head_commit.message, '[ags on MySQL]')) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    strategy:
      fail-fast: false
      matrix:
-        part: [1, 2, 3, 4]
+        part: [1, 2, 3]
    env:
      REQUIRES_INSTALLED_ARTIFACTS: true
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -652,14 +554,15 @@ jobs:
      !contains(github.event.head_commit.message, '[skip ags]') && !contains(github.event.head_commit.message, '[skip tas]')) ||
      (contains(github.event.head_commit.message, '[ags]') && contains(github.event.head_commit.message, '[tas]'))) &&
      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[force]')
    env:
      REQUIRES_LOCAL_IMAGES: true
    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+        with:
+          java-version: "11"
      - name: "Build"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -676,7 +579,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 }}
@@ -690,28 +593,3 @@ jobs:
          aws s3 cp --acl private ./amps/ags/rm-automation/rm-automation-community-rest-api/target/reports/rm-automation-community-rest-api.log s3://ags-travis-artifacts/community/${{ github.run_number }}/AGS-Community-Rest-API-Tests/rm-automation-community-rest-api.log
      - name: "Clean Maven cache"
        run: bash ./scripts/ci/cleanup_cache.sh
-
-  ags_start_api_explorer:
-    name: "Test Tomcat deployment of api explorer"
-    runs-on: ubuntu-latest
-    needs: [ prepare ]
-    if: >
-      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) &&
-      !contains(github.event.head_commit.message, '[skip ags]')) ||
-      contains(github.event.head_commit.message, '[ags]')) &&
-      !contains(github.event.head_commit.message, '[skip tests]') &&
-      !contains(github.event.head_commit.message, '[force]')
-    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
-      - name: "Build"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: |
-          bash ./scripts/ci/init.sh
-          bash ./scripts/ci/build.sh
-      - name: "Test Tomcat deployment"
-        run: |
-          mvn verify -Pags,start-api-explorer -DskipTests &
-          ${{ env.TAS_SCRIPTS }}/wait-for-alfresco-start.sh "http://localhost:8085/api-explorer"
--- a/.github/workflows/master_release.yml
+++ b/.github/workflows/master_release.yml
@@ -27,19 +27,18 @@ 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
+      - uses: actions/checkout@v3
        with:
          persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.24.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.33.0
        with:
          username: ${{ env.GIT_USERNAME }}
          email: ${{ env.GIT_EMAIL }}
@@ -56,19 +55,18 @@ 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
+      - uses: actions/checkout@v3
        with:
          persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.24.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.24.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
      - name: "Init"
        run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.24.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.33.0
        with:
          username: ${{ env.GIT_USERNAME }}
          email: ${{ env.GIT_EMAIL }}
--- a/.github/workflows/precommit_formatter.yml
+++ b/.github/workflows/precommit_formatter.yml
@@ -1,32 +0,0 @@
-name: Pre-Commit formatter
-
-on:
-  push:
-    branches:
-      - precommit/**
-
-jobs:
-  format-code:
-    name: "Reformat code"
-    runs-on: ubuntu-latest
-    if: contains(github.event.head_commit.message, '[reformat code]')
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python ${{ inputs.python-version }}
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
-        with:
-          python-version: "3.9"
-      - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
-        continue-on-error: true
-        with:
-          extra_args: --all-files
-      - name: Update secrets baseline
-        run: pip install detect-secrets && detect-secrets scan --baseline .secrets.baseline
-      - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.24.1
-        with:
-          username: ${{ secrets.BOT_GITHUB_USERNAME }}
-          add-options: -u
-          commit-message: "Apply Pre-Commit code formatting"
-          skip-if-no-changes: true
-      - name: Push changes
-        run: git push
--- a/.gitignore
+++ b/.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

--- a/.pre-commit-config.yaml
+++ b/.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
--- a/.secrets.baseline
+++ b/.secrets.baseline
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,60 +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. 
-The code style definition file is taken always form the `master` branch of `alfresco-community-repo`. 
-All downstream projects use this code style definition file as well. 
-
-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).
--- a/README.md
+++ b/README.md
@@ -1,58 +1,39 @@
 # 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=release/7.2.N)](https://github.com/Alfresco/alfresco-community-repo/actions/workflows/master_release.yml)

-## Table of Contents
-1. [Content](#content)
-2. [Artifacts](#artifacts)
-3. [Setup](#setting-up-and-building-your-development-environment)
-4. [Branches](#branches)
-5. [Contributing](#contributing-guide)
-6. [Helpful links](#helpful-links)
-
-
-## Content
-Alfresco Community Repository contains following libraries:
-
-### Alfresco Core
-Core is a library packaged as a jar file which contains the following:
+#### Alfresco Core

+Alfresco Core is a library packaged as a jar file which contains the following:
 * Various helpers and utils
 * Canned queries interface and supporting classes
 * Generic encryption supporting classes

-### Alfresco Data Model
-
-Data Model is a library packaged as a jar file which  contains the following:
-
+#### Alfresco Data Model
+Data model is a library packaged as a jar file which  contains the following:
 * Dictionary, Repository and Search Services interfaces
 * Models for data types and Dictionary implementation
 * Parsers

-### Alfresco Repository
+#### Alfresco Repository

 Repository is a library packaged as a jar file which contains the following:
-
 * DAOs and SQL scripts
 * Various Service implementations
 * Utility classes

-### Alfresco Remote API
+#### Alfresco Remote API

 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
-
+#### Artifacts
 The artifacts can be obtained by:
-* downloading from [Alfresco maven repository](https://artifacts.alfresco.com/nexus/#browse/browse:public)
+* downloading from [Alfresco maven repository](https://artifacts.alfresco.com/nexus/content/groups/public)
 * as Maven dependency by adding the dependency to your pom file:
-
-~~~xml
-
+~~~
 <dependency>
  <groupId>org.alfresco</groupId>
  <artifactId>alfresco-core</artifactId>
@@ -83,46 +64,34 @@ The artifacts can be obtained by:
    <version>version</version>
    <type>war</type>
 </dependency>
-
 ~~~
-
 and Alfresco maven repository:
-
-~~~xml
-
+~~~
 <repository>
  <id>alfresco-maven-repo</id>
  <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
 </repository>
-
 ~~~
-
 The SNAPSHOT versions of the artifact are not published.

 ## Setting up and building your development environment
-
-See the [**Development Tomcat Environment**](https://github.com/Alfresco/acs-community-packaging/tree/master/dev/README.md)
-page which will show you how to try out your repository changes in a local Tomcat instance or using Docker containers. 
+See the [Development Tomcat Environment](https://github.com/Alfresco/acs-community-packaging/tree/master/dev/README.md)
+page which will show you how to try out your repository changes in a local tomcat instance.
+If you wish to use Docker images, take a look at the aliases ending in `D` and the docker-compose files in this
+project's test modules.    

 ## Branches
-
-This project has a branch for each ACS release. For example the code in ACS 6.2.2 is a
-branch called **`release/6.2.2`**. In addition to the original 6.2.2 release it will also contain Hot Fixes
-added later. The latest unreleased code is on the **`master`** branch. There are also **`.N`** branches, such as 
-**`release/7.1.N`** on which we gather unreleased fixes for future service pack releases. They do not indicate
+This project has a branch for each ACS release. For example the code in ACS 6.2.1 is a
+branch called `releases/6.2.2`. In addition to the original 6.2.2 release it will also contain Hot Fixes
+added later. The latest unreleased code is on the `master` branch. There are also `.N` branches, such as 
+`releases/7.1.N` on which we gather unreleased fixes for future service pack releases. They do not indicate
 that one is planned.

 For historic reasons the version of artifacts created on each branch do not match the ACS version.
-For example artifact in ACS 7.2.0 will be **`14.<something>`**.
+For example artifact in ACS 7.2.0 will be `14.<something>`.

-The enterprise projects which extend the **`alfresco-community-repo`** use the same branch names and leading
+The enterprise projects which extend the `alfresco-community-repo` use the same branch names and leading
 artifact version number.

-## Contributing guide
-
-Please use [**this guide**](CONTRIBUTING.md) to make a contribution to the project.
-
-## Helpful links
-
- [Alfresco Content Services Documentation](https://docs.alfresco.com/content-services/latest/)
- [Alfresco Platform](https://www.hyland.com/en/products/alfresco-platform)
+### Contributing guide
+Please use [this guide](CONTRIBUTING.md) to make a contribution to the project.
--- a/alfresco-formatter.xml
+++ b/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>
--- a/amps/ags/README.md
+++ b/amps/ags/README.md
@@ -71,7 +71,7 @@ the _alfresco-internal_ repository:
   </snapshots>
 </repository>
 ```
-
+ 

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

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

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

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

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

 docker logs $alfrescoContainerId > alfresco.log
 if [ -n "$shareContainerId" ]; then
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -7,22 +7,14 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>25.3.0.25-SNAPSHOT</version>
+      <version>16.21</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>
@@ -38,20 +30,16 @@
            <plugin>
               <artifactId>maven-surefire-plugin</artifactId>
               <configuration>
-                  <!-- Keeping illegal-access=permit for Java 11 compatibility, even though it has no effect on JDK 17 -->
                  <argLine>
                     --illegal-access=permit
-                     --add-opens=java.base/java.lang=ALL-UNNAMED
                  </argLine>
               </configuration>
            </plugin>
            <plugin>
               <artifactId>maven-failsafe-plugin</artifactId>
-               <!-- Keeping illegal-access=permit for Java 11 compatibility, even though it has no effect on JDK 17 -->
               <configuration>
                  <argLine>
                     --illegal-access=permit
-                     --add-opens=java.base/java.lang=ALL-UNNAMED
                  </argLine>
               </configuration>
            </plugin>
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -7,7 +7,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>25.3.0.25-SNAPSHOT</version>
+      <version>16.21</version>
   </parent>

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

   <build>
@@ -42,10 +42,15 @@
   </build>

   <dependencies>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-reload4j</artifactId>
+         <version>1.7.35</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>
@@ -74,39 +79,15 @@
         <artifactId>alfresco-testng</artifactId>
         <version>1.1</version>
      </dependency>
-      <dependency>
-         <groupId>org.awaitility</groupId>
-         <artifactId>awaitility</artifactId>
-         <version>${dependency.awaitility.version}</version>
-         <scope>test</scope>
-      </dependency>
      <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-collections4</artifactId>
-         <version>4.5.0</version>
+         <version>4.4</version>
      </dependency>
      <dependency>
         <groupId>com.github.docker-java</groupId>
         <artifactId>docker-java</artifactId>
-         <version>3.6.0</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.12</version>
      </dependency>
   </dependencies>
 </project>
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RMRestProperties.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RMRestProperties.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -26,11 +26,12 @@
 */
 package org.alfresco.rest.core;

-import lombok.Getter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;

+import lombok.Getter;
+
 /**
 * Extends {@link RestProperties} to be able to change/add properties
 *
@@ -44,18 +45,18 @@ import org.springframework.context.annotation.PropertySource;
@PropertySource(value = "classpath:local.properties", ignoreResourceNotFound = true)
 public class RMRestProperties extends RestProperties
 {
-    @Value("${alfresco.scheme}")
+    @Value ("${alfresco.scheme}")
    private String scheme;

-    @Value("${alfresco.server}")
+    @Value ("${alfresco.server}")
    private String server;

-    @Value("${alfresco.port}")
+    @Value ("${alfresco.port}")
    private String port;

-    @Value("${rest.rmPath}")
+    @Value ("${rest.rmPath}")
    private String restRmPath;

-    @Value("${docker.host}")
+    @Value ("${docker.host}")
    private String dockerHost;
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RMRestWrapper.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RMRestWrapper.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -27,11 +27,6 @@
 package org.alfresco.rest.core;

 import io.restassured.builder.RequestSpecBuilder;
-import lombok.Getter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Service;

 import org.alfresco.rest.exception.EmptyJsonResponseException;
 import org.alfresco.rest.model.RestErrorModel;
@@ -43,6 +38,12 @@ import org.alfresco.rest.requests.search.SearchAPI;
 import org.alfresco.rest.rm.community.requests.gscore.GSCoreAPI;
 import org.alfresco.utility.model.StatusModel;
 import org.alfresco.utility.model.UserModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+
+import lombok.Getter;

 /**
 * Extends {@link RestWrapper} in order to call GS APIs with our own properties
@@ -152,18 +153,15 @@ public class RMRestWrapper
    }

    /**
-     * You can handle the request sent to server by calling this method. If for example you want to sent multipart form data you can use:
-     * 
-     * <pre>
+     * You can handle the request sent to server by calling this method.
+     * If for example you want to sent multipart form data you can use: <pre>
     * restClient.configureRequestSpec()
-     *         .addMultiPart("filedata", Utility.getResourceTestDataFile("restapi-resource"))
-     *         .addFormParam("renditions", "doclib")
-     *         .addFormParam("autoRename", true);
+     *              .addMultiPart("filedata", Utility.getResourceTestDataFile("restapi-resource"))
+     *              .addFormParam("renditions", "doclib")
+     *              .addFormParam("autoRename", true);
     *
     * restClient.withCoreAPI().usingNode(ContentModel.my()).createNode();
-     * </pre>
-     * 
-     * This will create the node using the multipart data defined.
+     * </pre> This will create the node using the multipart data defined.
     */
    public RequestSpecBuilder configureRequestSpec()
    {
@@ -173,8 +171,7 @@ public class RMRestWrapper
    /**
     * Process a response that returns a html
     *
-     * @throws EmptyJsonResponseException
-     *             If there is no response from the server.
+     * @throws EmptyJsonResponseException If there is no response from the server.
     */
    public RestHtmlResponse processHtmlResponse(RestRequest simpleRequest)
    {
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RestAPIFactory.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -28,14 +28,10 @@ package org.alfresco.rest.core;

 import static lombok.AccessLevel.PROTECTED;

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

 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Service;
-
 import org.alfresco.rest.requests.Node;
 import org.alfresco.rest.requests.coreAPI.RestCoreAPI;
 import org.alfresco.rest.requests.search.SearchAPI;
@@ -43,13 +39,11 @@ import org.alfresco.rest.rm.community.requests.gscore.GSCoreAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.ActionsExecutionAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.FilePlanAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.FilesAPI;
-import org.alfresco.rest.rm.community.requests.gscore.api.HoldsAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.RMSiteAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.RMUserAPI;
 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.requests.gscore.api.RetentionScheduleAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.TransferAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.TransferContainerAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledContainerAPI;
@@ -57,6 +51,9 @@ import org.alfresco.rest.rm.community.requests.gscore.api.UnfiledRecordFolderAPI
 import org.alfresco.utility.data.DataUserAIS;
 import org.alfresco.utility.model.RepoTestModel;
 import org.alfresco.utility.model.UserModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;

 /**
 * REST API Factory which provides access to the APIs
@@ -69,7 +66,7 @@ import org.alfresco.utility.model.UserModel;
 public class RestAPIFactory
 {
    @Autowired
-    @Getter(value = PROTECTED)
+    @Getter (value = PROTECTED)
    private DataUserAIS dataUser;

    @Resource(name = "RMRestWrapper")
@@ -246,24 +243,4 @@ public class RestAPIFactory
    {
        return getGSCoreAPI(null).usingActionsExecutionsAPI();
    }
-
-    public HoldsAPI getHoldsAPI()
-    {
-        return getGSCoreAPI(null).usingHoldsAPI();
-    }
-
-    public HoldsAPI getHoldsAPI(UserModel userModel)
-    {
-        return getGSCoreAPI(userModel).usingHoldsAPI();
-    }
-
-    public RetentionScheduleAPI getRetentionScheduleAPI()
-    {
-        return getGSCoreAPI(null).usingRetentionScheduleAPI();
-    }
-
-    public RetentionScheduleAPI getRetentionScheduleAPI(UserModel userModel)
-    {
-        return getGSCoreAPI(userModel).usingRetentionScheduleAPI();
-    }
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/search/SearchRequestBuilder.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/search/SearchRequestBuilder.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -44,13 +44,11 @@ public class SearchRequestBuilder extends SearchRequest
    {
        new SearchRequest();
    }
-
    /**
     * Set the sql statement for the SearchRequest
     *
-     * @param query
-     *            sql statement
-     * @return search request
+     * @param query sql statement
+     * @return search  request
     */
    public SearchRequestBuilder setQueryBuilder(RestRequestQueryModel query)
    {
@@ -61,8 +59,7 @@ public class SearchRequestBuilder extends SearchRequest
    /**
     * Set the paging statement for the SearchRequest
     *
-     * @param paging
-     *            pagination requested
+     * @param paging pagination requested
     * @return search request
     */
    public SearchRequestBuilder setPagingBuilder(Pagination paging)
@@ -85,8 +82,7 @@ public class SearchRequestBuilder extends SearchRequest
    /**
     * Set the requested fields for the SearchRequest
     *
-     * @param fields
-     *            requested fields
+     * @param fields requested fields
     * @return search request
     */
    public SearchRequestBuilder setFieldsBuilder(List<String> fields)
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/APIUtils.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/APIUtils.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -26,12 +26,12 @@
 */
 package org.alfresco.rest.core.v0;

+import javax.json.Json;
+import javax.json.JsonReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
-import jakarta.json.Json;
-import jakarta.json.JsonReader;

 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpEntity;
@@ -52,20 +52,20 @@ public class APIUtils
 {
    /** Logger for this class. */
    private static final Logger LOGGER = LoggerFactory.getLogger(APIUtils.class);
-    /**
-     * The ISO instant formatter that formats or parses an instant in UTC, such as '2011-12-03T10:15:305Z' similar with {@link DateTimeFormatter#ISO_INSTANT}, but with only 3 nanoseconds
-     */
-    public static final DateTimeFormatter ISO_INSTANT_FORMATTER = new DateTimeFormatterBuilder().appendInstant(3).toFormatter();
+    /** The ISO instant formatter that formats or parses an instant in UTC, such as '2011-12-03T10:15:305Z'
+     * similar with {@link DateTimeFormatter#ISO_INSTANT}, but with only 3 nanoseconds*/
+    public static final DateTimeFormatter ISO_INSTANT_FORMATTER =
+            new DateTimeFormatterBuilder().appendInstant(3).toFormatter();

    /** Private constructor for helper class. */
    private APIUtils()
-    {}
+    {
+    }

    /**
     * Extract the body of a HTTP response as a JSON object.
     *
-     * @param httpResponse
-     *            The HTTP response.
+     * @param httpResponse The HTTP response.
     * @return A JSON representation of the object.
     */
    public static JSONObject convertHTTPResponseToJSON(HttpResponse httpResponse)
@@ -86,8 +86,7 @@ public class APIUtils
    /**
     * Util method to extract the message string from the HTTP response
     *
-     * @param httpResponse
-     *            http response
+     * @param httpResponse http response
     * @return error message from the http response
     */
    public static String extractErrorMessageFromHttpResponse(HttpResponse httpResponse)
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -39,6 +39,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

+import org.alfresco.dataprep.AlfrescoHttpClient;
+import org.alfresco.dataprep.AlfrescoHttpClientFactory;
+import org.alfresco.dataprep.ContentService;
 import org.apache.chemistry.opencmis.client.api.CmisObject;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException;
 import org.apache.http.HttpResponse;
@@ -61,10 +64,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

-import org.alfresco.dataprep.AlfrescoHttpClient;
-import org.alfresco.dataprep.AlfrescoHttpClientFactory;
-import org.alfresco.dataprep.ContentService;
-
 /**
 * The base API class containing common methods for making v0 API requests
 *
@@ -99,11 +98,9 @@ public abstract class BaseAPI
    /**
     * Helper method to extract list of properties values from result.
     *
-     * @param result
-     *            the response
+     * @param result the response
     * @return list of specified property values in result
-     * @throws RuntimeException
-     *             for malformed response
+     * @throws RuntimeException for malformed response
     */
    protected List<String> getPropertyValues(JSONObject result, String propertyName)
    {
@@ -127,7 +124,7 @@ public abstract class BaseAPI

    /**
     * Helper method to extract the property value for the given nodeRef and property name
-     *
+     * 
     * @param result
     * @param nodeRef
     * @param propertyName
@@ -142,7 +139,7 @@ public abstract class BaseAPI
            for (int i = 0; i < items.length(); i++)
            {
                JSONObject item = items.getJSONObject(i);
-                if (nodeRef.equals(item.getString("nodeRef")))
+                if(nodeRef.equals(item.getString("nodeRef")))
                {
                    propertyValue = item.getJSONObject("properties").getString(propertyName);
                }
@@ -155,15 +152,13 @@ public abstract class BaseAPI

        return propertyValue;
    }
-
+    
    /**
     * Helper method to extract property values from request result and put them in map as a list that corresponds to a unique property value.
     *
-     * @param requestResult
-     *            the request response
+     * @param requestResult the request response
     * @return a map containing information about multiple properties values that correspond to a unique one
-     * @throws RuntimeException
-     *             for malformed response
+     * @throws RuntimeException for malformed response
     */
    protected Map<String, List<String>> getPropertyValuesByUniquePropertyValue(JSONObject requestResult, String uniqueProperty, List<String> otherProperties)
    {
@@ -194,12 +189,11 @@ public abstract class BaseAPI
    /**
     * Retrieves the nodeRef of an item (category, folder or record) with the given path
     *
-     * @param username
-     *            the username
-     * @param password
-     *            the password
-     * @param path
-     *            the path to the container eg. in case of a category it would be the category name, in case of a folder it would be /categoryName/folderName when trying to get File Plan, the path would be ""
+     * @param username the username
+     * @param password the password
+     * @param path     the path to the container eg. in case of a category it would be the category name,
+     *                 in case of a folder it would be /categoryName/folderName
+     *                 when trying to get File Plan, the path would be ""
     * @return the container nodeRef
     */
    public String getItemNodeRef(String username, String password, String path)
@@ -210,12 +204,9 @@ public abstract class BaseAPI
    /**
     * Retrieve a Cmis object by its path
     *
-     * @param username
-     *            the user's username
-     * @param password
-     *            its password
-     * @param path
-     *            the object path
+     * @param username the user's username
+     * @param password its password
+     * @param path     the object path
     * @return the object in case it exists, null if its does not exist
     */
    protected CmisObject getObjectByPath(String username, String password, String path)
@@ -224,8 +215,7 @@ public abstract class BaseAPI
        try
        {
            object = contentService.getCMISSession(username, password).getObjectByPath(path);
-        }
-        catch (CmisObjectNotFoundException notFoundError)
+        } catch (CmisObjectNotFoundException notFoundError)
        {
            return null;
        }
@@ -235,12 +225,9 @@ public abstract class BaseAPI
    /**
     * Generic faceted request.
     *
-     * @param username
-     *            the username
-     * @param password
-     *            the password
-     * @param parameters
-     *            if the request has parameters
+     * @param username the username
+     * @param password the password
+     * @param parameters if the request has parameters
     * @return result object (see API reference for more details), null for any errors
     */
    protected JSONObject facetedRequest(String username, String password, List<NameValuePair> parameters, String requestURI)
@@ -250,13 +237,13 @@ public abstract class BaseAPI

        if (parameters == null || parameters.isEmpty())
        {
-            requestURL = MessageFormat.format(
+             requestURL = MessageFormat.format(
                    requestURI,
                    client.getAlfrescoUrl());
        }
        else
        {
-            requestURL = MessageFormat.format(
+             requestURL = MessageFormat.format(
                    requestURI,
                    client.getAlfrescoUrl(),
                    URLEncodedUtils.format(parameters, "UTF-8"));
@@ -268,26 +255,21 @@ public abstract class BaseAPI

    /**
     * Helper method for GET requests
-     * 
-     * @param adminUser
-     *            user with administrative privileges
-     * @param adminPassword
-     *            password for adminUser
-     * @param urlTemplate
-     *            request URL template
-     * @param urlTemplateParams
-     *            zero or more parameters used with <i>urlTemplate</i>
+     * @param adminUser user with administrative privileges
+     * @param adminPassword password for adminUser
+     * @param urlTemplate request URL template
+     * @param urlTemplateParams zero or more parameters used with <i>urlTemplate</i>
     */
    protected JSONObject doGetRequest(String adminUser,
-            String adminPassword,
-            String urlTemplate,
-            String... urlTemplateParams)
+        String adminPassword,
+        String urlTemplate,
+        String ... urlTemplateParams)
    {
        AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
        String requestUrl = MessageFormat.format(
-                urlTemplate,
-                client.getApiUrl(),
-                urlTemplateParams);
+            urlTemplate,
+            client.getApiUrl(),
+            urlTemplateParams);
        client.close();

        try
@@ -302,26 +284,21 @@ public abstract class BaseAPI

    /**
     * Helper method for Delete requests
-     * 
-     * @param adminUser
-     *            user with administrative privileges
-     * @param adminPassword
-     *            password for adminUser
-     * @param urlTemplate
-     *            request URL template
-     * @param urlTemplateParams
-     *            zero or more parameters used with <i>urlTemplate</i>
+     * @param adminUser user with administrative privileges
+     * @param adminPassword password for adminUser
+     * @param urlTemplate request URL template
+     * @param urlTemplateParams zero or more parameters used with <i>urlTemplate</i>
     */
    protected JSONObject doDeleteRequest(String adminUser,
-            String adminPassword,
-            String urlTemplate,
-            String... urlTemplateParams)
+        String adminPassword,
+        String urlTemplate,
+        String ... urlTemplateParams)
    {
        AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
        String requestUrl = MessageFormat.format(
-                urlTemplate,
-                client.getApiUrl(),
-                urlTemplateParams);
+            urlTemplate,
+            client.getApiUrl(),
+            urlTemplateParams);
        client.close();

        try
@@ -336,29 +313,23 @@ public abstract class BaseAPI

    /**
     * Helper method for PUT requests
-     * 
-     * @param adminUser
-     *            user with administrative privileges
-     * @param adminPassword
-     *            password for adminUser
-     * @param requestParams
-     *            zero or more endpoint specific request parameters
-     * @param urlTemplate
-     *            request URL template
-     * @param urlTemplateParams
-     *            zero or more parameters used with <i>urlTemplate</i>
+     * @param adminUser user with administrative privileges
+     * @param adminPassword password for adminUser
+     * @param requestParams zero or more endpoint specific request parameters
+     * @param urlTemplate request URL template
+     * @param urlTemplateParams zero or more parameters used with <i>urlTemplate</i>
     */
    protected JSONObject doPutRequest(String adminUser,
-            String adminPassword,
-            JSONObject requestParams,
-            String urlTemplate,
-            String... urlTemplateParams)
+        String adminPassword,
+        JSONObject requestParams,
+        String urlTemplate,
+        String ... urlTemplateParams)
    {
        AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
        String requestUrl = MessageFormat.format(
-                urlTemplate,
-                client.getApiUrl(),
-                urlTemplateParams);
+            urlTemplate,
+            client.getApiUrl(),
+            urlTemplateParams);
        client.close();

        try
@@ -374,25 +345,19 @@ public abstract class BaseAPI
    /**
     * Helper method for PUT requests
     *
-     * @param adminUser
-     *            user with administrative privileges
-     * @param adminPassword
-     *            password for adminUser
-     * @param expectedStatusCode
-     *            The expected return status code.
-     * @param requestParams
-     *            zero or more endpoint specific request parameters
-     * @param urlTemplate
-     *            request URL template
-     * @param urlTemplateParams
-     *            zero or more parameters used with <i>urlTemplate</i>
+     * @param adminUser user with administrative privileges
+     * @param adminPassword password for adminUser
+     * @param expectedStatusCode The expected return status code.
+     * @param requestParams zero or more endpoint specific request parameters
+     * @param urlTemplate request URL template
+     * @param urlTemplateParams zero or more parameters used with <i>urlTemplate</i>
     */
    protected HttpResponse doPutJsonRequest(String adminUser,
-            String adminPassword,
-            int expectedStatusCode,
-            JSONObject requestParams,
-            String urlTemplate,
-            String... urlTemplateParams)
+                String adminPassword,
+                int expectedStatusCode,
+                JSONObject requestParams,
+                String urlTemplate,
+                String... urlTemplateParams)
    {
        AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
        return doPutJsonRequest(adminUser, adminPassword, expectedStatusCode, client.getApiUrl(), requestParams, urlTemplate, urlTemplateParams);
@@ -401,30 +366,22 @@ public abstract class BaseAPI
    /**
     * Helper method for PUT requests
     *
-     * @param adminUser
-     *            user with administrative privileges
-     * @param adminPassword
-     *            password for adminUser
-     * @param expectedStatusCode
-     *            The expected return status code.
-     * @param urlStart
-     *            the start of the URL (for example "alfresco/s/slingshot").
-     * @param requestParams
-     *            zero or more endpoint specific request parameters
-     * @param urlTemplate
-     *            request URL template
-     * @param urlTemplateParams
-     *            zero or more parameters used with <i>urlTemplate</i>
-     * @throws AssertionError
-     *             if the returned status code is not as expected.
+     * @param adminUser user with administrative privileges
+     * @param adminPassword password for adminUser
+     * @param expectedStatusCode The expected return status code.
+     * @param urlStart the start of the URL (for example "alfresco/s/slingshot").
+     * @param requestParams zero or more endpoint specific request parameters
+     * @param urlTemplate request URL template
+     * @param urlTemplateParams zero or more parameters used with <i>urlTemplate</i>
+     * @throws AssertionError if the returned status code is not as expected.
     */
    private HttpResponse doPutJsonRequest(String adminUser,
-            String adminPassword,
-            int expectedStatusCode,
-            String urlStart,
-            JSONObject requestParams,
-            String urlTemplate,
-            String... urlTemplateParams)
+                String adminPassword,
+                int expectedStatusCode,
+                String urlStart,
+                JSONObject requestParams,
+                String urlTemplate,
+                String... urlTemplateParams)
    {
        String requestUrl = formatRequestUrl(urlStart, urlTemplate, urlTemplateParams);
        try
@@ -442,12 +399,9 @@ public abstract class BaseAPI
    /**
     * Fill in the parameters for a URL template.
     *
-     * @param urlStart
-     *            The start of the URL.
-     * @param urlTemplate
-     *            The template.
-     * @param urlTemplateParams
-     *            Any parameters that need to be filled into the URL template.
+     * @param urlStart The start of the URL.
+     * @param urlTemplate The template.
+     * @param urlTemplateParams Any parameters that need to be filled into the URL template.
     * @return The resultant URL.
     */
    private String formatRequestUrl(String urlStart, String urlTemplate, String[] urlTemplateParams)
@@ -462,29 +416,23 @@ public abstract class BaseAPI

    /**
     * Helper method for POST requests
-     * 
-     * @param adminUser
-     *            user with administrative privileges
-     * @param adminPassword
-     *            password for adminUser
-     * @param requestParams
-     *            zero or more endpoint specific request parameters
-     * @param urlTemplate
-     *            request URL template
-     * @param urlTemplateParams
-     *            zero or more parameters used with <i>urlTemplate</i>
+     * @param adminUser user with administrative privileges
+     * @param adminPassword password for adminUser
+     * @param requestParams zero or more endpoint specific request parameters
+     * @param urlTemplate request URL template
+     * @param urlTemplateParams zero or more parameters used with <i>urlTemplate</i>
     */
    protected JSONObject doPostRequest(String adminUser,
-            String adminPassword,
-            JSONObject requestParams,
-            String urlTemplate,
-            String... urlTemplateParams)
+        String adminPassword,
+        JSONObject requestParams,
+        String urlTemplate,
+        String ... urlTemplateParams)
    {
        AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
        String requestUrl = MessageFormat.format(
-                urlTemplate,
-                client.getApiUrl(),
-                urlTemplateParams);
+            urlTemplate,
+            client.getApiUrl(),
+            urlTemplateParams);
        client.close();

        try
@@ -500,25 +448,19 @@ public abstract class BaseAPI
    /**
     * Helper method for POST requests
     *
-     * @param adminUser
-     *            user with administrative privileges
-     * @param adminPassword
-     *            password for adminUser
-     * @param expectedStatusCode
-     *            The expected return status code.
-     * @param requestParams
-     *            zero or more endpoint specific request parameters
-     * @param urlTemplate
-     *            request URL template
-     * @param urlTemplateParams
-     *            zero or more parameters used with <i>urlTemplate</i>
+     * @param adminUser user with administrative privileges
+     * @param adminPassword password for adminUser
+     * @param expectedStatusCode The expected return status code.
+     * @param requestParams zero or more endpoint specific request parameters
+     * @param urlTemplate request URL template
+     * @param urlTemplateParams zero or more parameters used with <i>urlTemplate</i>
     */
    protected HttpResponse doPostJsonRequest(String adminUser,
-            String adminPassword,
-            int expectedStatusCode,
-            JSONObject requestParams,
-            String urlTemplate,
-            String... urlTemplateParams)
+                                    String adminPassword,
+                                    int expectedStatusCode,
+                                    JSONObject requestParams,
+                                    String urlTemplate,
+                                    String... urlTemplateParams)
    {
        AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
        return doPostJsonRequest(adminUser, adminPassword, expectedStatusCode, client.getApiUrl(), requestParams, urlTemplate, urlTemplateParams);
@@ -527,25 +469,19 @@ public abstract class BaseAPI
    /**
     * Helper method for POST requests to slingshot.
     *
-     * @param adminUser
-     *            user with administrative privileges
-     * @param adminPassword
-     *            password for adminUser
-     * @param expectedStatusCode
-     *            The expected return status code.
-     * @param requestParams
-     *            zero or more endpoint specific request parameters
-     * @param urlTemplate
-     *            request URL template
-     * @param urlTemplateParams
-     *            zero or more parameters used with <i>urlTemplate</i>
+     * @param adminUser user with administrative privileges
+     * @param adminPassword password for adminUser
+     * @param expectedStatusCode The expected return status code.
+     * @param requestParams zero or more endpoint specific request parameters
+     * @param urlTemplate request URL template
+     * @param urlTemplateParams zero or more parameters used with <i>urlTemplate</i>
     */
    protected HttpResponse doSlingshotPostJsonRequest(String adminUser,
-            String adminPassword,
-            int expectedStatusCode,
-            JSONObject requestParams,
-            String urlTemplate,
-            String... urlTemplateParams)
+                String adminPassword,
+                int expectedStatusCode,
+                JSONObject requestParams,
+                String urlTemplate,
+                String... urlTemplateParams)
    {
        AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
        return doPostJsonRequest(adminUser, adminPassword, expectedStatusCode, client.getAlfrescoUrl() + SLINGSHOT_PREFIX, requestParams, urlTemplate, urlTemplateParams);
@@ -554,42 +490,29 @@ public abstract class BaseAPI
    /**
     * Helper method for POST requests
     *
-     * @param adminUser
-     *            user with administrative privileges
-     * @param adminPassword
-     *            password for adminUser
-     * @param expectedStatusCode
-     *            The expected return status code.
-     * @param urlStart
-     *            the start of the URL (for example "alfresco/s/slingshot").
-     * @param requestParams
-     *            zero or more endpoint specific request parameters
-     * @param urlTemplate
-     *            request URL template
-     * @param urlTemplateParams
-     *            zero or more parameters used with <i>urlTemplate</i>
-     * @throws AssertionError
-     *             if the returned status code is not as expected.
+     * @param adminUser user with administrative privileges
+     * @param adminPassword password for adminUser
+     * @param expectedStatusCode The expected return status code.
+     * @param urlStart the start of the URL (for example "alfresco/s/slingshot").
+     * @param requestParams zero or more endpoint specific request parameters
+     * @param urlTemplate request URL template
+     * @param urlTemplateParams zero or more parameters used with <i>urlTemplate</i>
+     * @throws AssertionError if the returned status code is not as expected.
     */
    private HttpResponse doPostJsonRequest(String adminUser,
-            String adminPassword,
-            int expectedStatusCode,
-            String urlStart,
-            JSONObject requestParams,
-            String urlTemplate,
-            String... urlTemplateParams)
+                String adminPassword,
+                int expectedStatusCode,
+                String urlStart,
+                JSONObject requestParams,
+                String urlTemplate,
+                String... urlTemplateParams)
    {
        String requestUrl;
        requestUrl = formatRequestUrl(urlStart, urlTemplate, urlTemplateParams);
        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)
@@ -598,58 +521,23 @@ 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})
-     * @param requestUrl
-     *            URL the request is to be sent to
-     * @param adminUser
-     *            user with administrative privileges
-     * @param adminPassword
-     *            password for adminUser
-     * @param requestParams
-     *            endpoint specific request parameters
+     * @param requestType request type (a subclass of {@link HttpRequestBase})
+     * @param requestUrl URL the request is to be sent to
+     * @param adminUser user with administrative privileges
+     * @param adminPassword password for adminUser
+     * @param requestParams endpoint specific request parameters
     * @return response body
-     * @throws IllegalAccessException
-     *             for invalid <i>requestType</i>
-     * @throws InstantiationException
-     *             for invalid <i>requestType</i>
+     * @throws IllegalAccessException for invalid <i>requestType</i>
+     * @throws InstantiationException for invalid <i>requestType</i>
     */
    private <T extends HttpRequestBase> JSONObject doRequest(
-            Class<T> requestType,
-            String requestUrl,
-            String adminUser,
-            String adminPassword,
-            JSONObject requestParams) throws InstantiationException, IllegalAccessException
+        Class<T> requestType,
+        String requestUrl,
+        String adminUser,
+        String adminPassword,
+        JSONObject requestParams) throws InstantiationException, IllegalAccessException
    {
        AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
        T request = requestType.newInstance();
@@ -670,38 +558,49 @@ 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())
            {
-            case HttpStatus.SC_OK:
-            case HttpStatus.SC_CREATED:
-                // request successful
-                if (responseBody != null)
-                {
-                    returnValues = responseBody;
-                }
-                break;
+                case HttpStatus.SC_OK:
+                case HttpStatus.SC_CREATED:
+                    // request successful
+                    if (responseBody != null)
+                    {
+                        returnValues = responseBody;
+                    }
+                    break;

-            case HttpStatus.SC_INTERNAL_SERVER_ERROR:
-                if (responseBody != null && responseBody.has(EXCEPTION_KEY))
-                {
-                    LOGGER.error("Request failed with error message: {}", responseBody.getString(MESSAGE_KEY));
-                    returnValues = responseBody;
-                }
-                break;
-            case HttpStatus.SC_BAD_REQUEST:
-            case HttpStatus.SC_UNPROCESSABLE_ENTITY:
-                if (responseBody != null && responseBody.has(EXCEPTION_KEY))
-                {
-                    LOGGER.error("Request failed: {}", responseBody.getString(EXCEPTION_KEY));
-                    returnValues = responseBody;
-                }
-                break;
+                case HttpStatus.SC_INTERNAL_SERVER_ERROR:
+					if (responseBody != null  && responseBody.has(EXCEPTION_KEY))
+                    {
+                        LOGGER.error("Request failed with error message: {}", responseBody.getString(MESSAGE_KEY));
+                        returnValues = responseBody;
+                    }
+                    break;
+                case HttpStatus.SC_BAD_REQUEST:
+                case HttpStatus.SC_UNPROCESSABLE_ENTITY:
+                    if (responseBody != null  && responseBody.has(EXCEPTION_KEY))
+                    {
+                        LOGGER.error("Request failed: {}", responseBody.getString(EXCEPTION_KEY));
+                        returnValues = responseBody;
+                    }
+                    break;

-            default:
-                LOGGER.error("Request returned unexpected HTTP status {}", response.getStatusLine().getStatusCode());
-                break;
+                default:
+                    LOGGER.error("Request returned unexpected HTTP status {}", response.getStatusLine().getStatusCode());
+                    break;
            }
        }
        catch (JSONException error)
@@ -767,16 +666,40 @@ public abstract class BaseAPI
    }

    /**
-     * Used to set RM items properties including records, categories and folders
+     * Used to set RM items properties
+     * including records, categories and folders
     */
    public enum RMProperty
    {
-        NAME, TITLE, CONTENT, DESCRIPTION, AUTHOR, PHYSICAL_SIZE, NUMBER_OF_COPIES, STORAGE_LOCATION, SHELF, BOX, FILE, ORIGINATOR, ORIGINATING_ORGANIZATION, PUBLICATION_DATE
+        NAME,
+        TITLE,
+        CONTENT,
+        DESCRIPTION,
+        AUTHOR,
+        PHYSICAL_SIZE,
+        NUMBER_OF_COPIES,
+        STORAGE_LOCATION,
+        SHELF,
+        BOX,
+        FILE,
+        ORIGINATOR,
+        ORIGINATING_ORGANIZATION,
+        PUBLICATION_DATE
    }

    public enum RETENTION_SCHEDULE
    {
-        NAME, DESCRIPTION, RETENTION_AUTHORITY, RETENTION_INSTRUCTIONS, RETENTION_PERIOD, RETENTION_LOCATION, RETENTION_PERIOD_PROPERTY, RETENTION_GHOST, RETENTION_ELIGIBLE_FIRST_EVENT, RETENTION_EVENTS, COMBINE_DISPOSITION_STEP_CONDITIONS
+        NAME,
+        DESCRIPTION,
+        RETENTION_AUTHORITY,
+        RETENTION_INSTRUCTIONS,
+        RETENTION_PERIOD,
+        RETENTION_LOCATION,
+        RETENTION_PERIOD_PROPERTY,
+        RETENTION_GHOST,
+        RETENTION_ELIGIBLE_FIRST_EVENT,
+        RETENTION_EVENTS,
+        COMBINE_DISPOSITION_STEP_CONDITIONS
    }

    /**
@@ -784,8 +707,14 @@ public abstract class BaseAPI
     */
    public enum RM_ACTIONS
    {
-        EDIT_DISPOSITION_DATE("editDispositionActionAsOfDate"), END_RETENTION("retain"), CUT_OFF("cutoff"), UNDO_CUT_OFF("undoCutoff"), TRANSFER("transfer"), COMPLETE_EVENT("completeEvent"), UNDO_EVENT("undoEvent"), DESTROY("destroy");
-
+        EDIT_DISPOSITION_DATE("editDispositionActionAsOfDate"),
+        END_RETENTION("retain"),
+        CUT_OFF("cutoff"),
+        UNDO_CUT_OFF("undoCutoff"),
+        TRANSFER("transfer"),
+        COMPLETE_EVENT("completeEvent"),
+        UNDO_EVENT("undoEvent"),
+        DESTROY("destroy");
        String action;

        private RM_ACTIONS(String action)
@@ -801,16 +730,17 @@ public abstract class BaseAPI

    public enum PermissionType
    {
-        SET_READ, REMOVE_READ, SET_READ_AND_FILE, REMOVE_READ_AND_FILE,
+        SET_READ,
+        REMOVE_READ,
+        SET_READ_AND_FILE,
+        REMOVE_READ_AND_FILE,
    }

    /**
     * Util to return the property value from a map
     *
-     * @param properties
-     *            the map containing properties
-     * @param property
-     *            to get value for
+     * @param properties the map containing properties
+     * @param property   to get value for
     * @return the property value
     */
    public <K extends Enum<?>> String getPropertyValue(Map<K, String> properties, Enum<?> property)
@@ -826,14 +756,10 @@ public abstract class BaseAPI
    /**
     * Retrieves the property value and decides if that gets to be added to the request
     *
-     * @param requestParams
-     *            the request parameters
-     * @param propertyRequestValue
-     *            the property name in the request, eg. "prop_cm_name"
-     * @param itemProperties
-     *            map of item's properties values
-     * @param property
-     *            the property in the property map to check value for
+     * @param requestParams        the request parameters
+     * @param propertyRequestValue the property name in the request, eg. "prop_cm_name"
+     * @param itemProperties       map of item's properties values
+     * @param property             the property in the property map to check value for
     * @return the json object used in request with the property with its value added if that is not null or empty
     */
    protected <K extends Enum<?>> JSONObject addPropertyToRequest(JSONObject requestParams, String propertyRequestValue, Map<K, String> itemProperties, Enum<?> property) throws JSONException
@@ -850,14 +776,12 @@ public abstract class BaseAPI
    /**
     * Deletes the category, folder or record given as parameter
     *
-     * @param username
-     *            the username with whom the delete is performed
-     * @param password
-     *            the user's password
-     * @param itemPath
-     *            the path to the item eg. in case of a category it would be the "/" + category name, in case of a folder or subCategory it would be /categoryName/folderName or /categoryName/subCategoryName/ in case of a record /categoryName/folderName/recordName
-     * @throws AssertionError
-     *             if the delete was not successful.
+     * @param username the username with whom the delete is performed
+     * @param password the user's password
+     * @param itemPath the path to the item eg. in case of a category it would be the "/" + category name,
+     *                 in case of a folder or subCategory it would be /categoryName/folderName or /categoryName/subCategoryName/
+     *                 in case of a record /categoryName/folderName/recordName
+     * @throws AssertionError if the delete was not successful.
     */
    protected void deleteItem(String username, String password, String itemPath)
    {
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/RMEvents.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/RMEvents.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -28,8 +28,13 @@ package org.alfresco.rest.core.v0;

 public enum RMEvents
 {
-    ABOLISHED("abolished"), ALL_ALLOWANCES_GRANTED_ARE_TERMINATED("all_allowances_granted_are_terminated"), CASE_CLOSED("case_closed"), DECLASSIFICATION_REVIEW("declassification_review"), OBSOLETE("obsolete"), NO_LONGER_NEEDED("no_longer_needed"), STUDY_COMPLETE("study_complete");
-
+    ABOLISHED("abolished"),
+    ALL_ALLOWANCES_GRANTED_ARE_TERMINATED("all_allowances_granted_are_terminated"),
+    CASE_CLOSED("case_closed"),
+    DECLASSIFICATION_REVIEW("declassification_review"),
+    OBSOLETE("obsolete"),
+    NO_LONGER_NEEDED("no_longer_needed"),
+    STUDY_COMPLETE("study_complete");
    private String eventName;

    RMEvents(String eventName)
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/CapabilityModel.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/CapabilityModel.java
@@ -1,30 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model;
-
-public record CapabilityModel(String name, String title, String description, GroupModel group, int index)
-{}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/GroupModel.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/GroupModel.java
@@ -1,30 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model;
-
-public record GroupModel(String id, String title)
-{}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/audit/AuditEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/audit/AuditEntry.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -30,11 +30,11 @@ import java.util.List;

 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
 import org.alfresco.utility.model.TestModel;

 /**
@@ -47,43 +47,43 @@ import org.alfresco.utility.model.TestModel;
@Data
@NoArgsConstructor
@AllArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonIgnoreProperties (ignoreUnknown = true)
 public class AuditEntry extends TestModel
 {
-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String nodeName;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private List<Object> changedValues;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String identifier;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String path;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String nodeRef;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String fullName;

    @JsonProperty
    private String createPerson;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String userName;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String userRole;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String nodeType;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String event;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String timestamp;

 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/audit/AuditEvents.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/audit/AuditEvents.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -29,13 +29,24 @@ package org.alfresco.rest.rm.community.model.audit;
 /**
 * Enumerates the list of events audited
 *
- * @author Rodica Sutu
+ * @author  Rodica Sutu
 * @since 2.7
 *
 */
 public enum AuditEvents
 {
-    CREATE_PERSON("Create Person", "Create User"), DELETE_PERSON("Delete Person", "Delete User"), CREATE_USER_GROUP("Create User Group", "Create User Group"), DELETE_USER_GROUP("Delete User Group", "Delete User Group"), ADD_TO_USER_GROUP("Add To User Group", "Add To User Group"), REMOVE_FROM_USER_GROUP("Remove From User Group", "Remove From User Group"), LOGIN_UNSUCCESSFUL("Login.Failure", "Login Unsuccessful"), LOGIN_SUCCESSFUL("Login.Success", "Login Successful"), CREATE_HOLD("Create Hold", "Create Hold"), DELETE_HOLD("Delete Hold", "Delete Hold"), ADD_TO_HOLD("Add To Hold", "Add To Hold"), REMOVE_FROM_HOLD("Remove From Hold", "Remove From Hold");
+    CREATE_PERSON("Create Person", "Create User"),
+    DELETE_PERSON("Delete Person", "Delete User"),
+    CREATE_USER_GROUP("Create User Group", "Create User Group"),
+    DELETE_USER_GROUP("Delete User Group", "Delete User Group"),
+    ADD_TO_USER_GROUP("Add To User Group", "Add To User Group"),
+    REMOVE_FROM_USER_GROUP("Remove From User Group", "Remove From User Group"),
+    LOGIN_UNSUCCESSFUL("Login.Failure", "Login Unsuccessful"),
+    LOGIN_SUCCESSFUL("Login.Success", "Login Successful"),
+    CREATE_HOLD("Create Hold", "Create Hold"),
+    DELETE_HOLD("Delete Hold", "Delete Hold"),
+    ADD_TO_HOLD("Add To Hold", "Add To Hold"),
+    REMOVE_FROM_HOLD("Remove From Hold", "Remove From Hold");

    /** event audited */
    public final String event;
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/IdNamePair.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/IdNamePair.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -29,6 +29,7 @@ package org.alfresco.rest.rm.community.model.common;
 import java.util.List;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -46,15 +47,15 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class IdNamePair
 {
-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String id;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String name;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private List<String> aspectNames;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String nodeType;
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/Owner.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/Owner.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -27,10 +27,10 @@
 package org.alfresco.rest.rm.community.model.common;

 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import org.alfresco.utility.model.TestModel;

 /**
@@ -42,9 +42,9 @@ import org.alfresco.utility.model.TestModel;
@Builder
@Data
@EqualsAndHashCode(callSuper = true)
-// @NoArgsConstructor
-// @AllArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
+//@NoArgsConstructor
+//@AllArgsConstructor
+@JsonIgnoreProperties (ignoreUnknown = true)
 public class Owner extends TestModel
 {

--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/Path.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/Path.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -29,14 +29,15 @@ package org.alfresco.rest.rm.community.model.common;
 import java.util.List;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.utility.model.TestModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for path parameter
 *
@@ -50,12 +51,12 @@ import org.alfresco.utility.model.TestModel;
@AllArgsConstructor
 public class Path extends TestModel
 {
-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String name;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private Boolean isComplete;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private List<IdNamePair> elements;
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/ReviewPeriod.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/common/ReviewPeriod.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -27,6 +27,7 @@
 package org.alfresco.rest.rm.community.model.common;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -44,9 +45,9 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class ReviewPeriod
 {
-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String periodType;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String expression;
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/custom/CustomDefinitions.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/custom/CustomDefinitions.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -34,8 +34,10 @@ package org.alfresco.rest.rm.community.model.custom;
 */
 public enum CustomDefinitions
 {
-    ATTACHMENT("Attachment"), MESSAGE("Message"), NEXT_VERSION("Next Version"), RENDITION("Rendition");
-
+    ATTACHMENT("Attachment"),
+    MESSAGE("Message"),
+    NEXT_VERSION("Next Version"),
+    RENDITION("Rendition");
    /**
     * The name of custom reference.
     */
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplan/FilePlan.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplan/FilePlan.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -29,16 +29,17 @@ package org.alfresco.rest.rm.community.model.fileplan;
 import java.util.List;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.rest.model.RestByUserModel;
+import org.alfresco.rest.rm.community.model.common.Path;
+import org.alfresco.utility.model.TestModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.model.RestByUserModel;
-import org.alfresco.rest.rm.community.model.common.Path;
-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for file plan
 *
@@ -57,34 +58,34 @@ public class FilePlan extends TestModel
    /** Mandatory parameters */
    /*************************/

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel createdByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String modifiedAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String nodeType;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String parentId;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private List<String> aspectNames;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String createdAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel modifiedByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String name;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String id;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private FilePlanProperties properties;

    /************************/
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplan/FilePlanProperties.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplan/FilePlanProperties.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -34,14 +34,15 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_TITLE;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.utility.model.TestModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for file plan properties
 *
@@ -58,24 +59,24 @@ public class FilePlanProperties extends TestModel
    /*************************/
    /** Mandatory parameters */
    /*************************/
-    @JsonProperty(required = true, value = PROPERTIES_IDENTIFIER)
+    @JsonProperty (required = true, value = PROPERTIES_IDENTIFIER)
    private String identifier;

-    @JsonProperty(required = true, value = PROPERTIES_COMPONENT_ID)
+    @JsonProperty (required = true, value = PROPERTIES_COMPONENT_ID)
    private String componentd;

-    @JsonProperty(required = true, value = PROPERTIES_ROOT_NODE_REF)
+    @JsonProperty (required = true, value = PROPERTIES_ROOT_NODE_REF)
    private String rootNodeRef;

    /************************/
    /** Optional parameters */
    /************************/
-    @JsonProperty(PROPERTIES_COUNT)
+    @JsonProperty (PROPERTIES_COUNT)
    private Integer count;

-    @JsonProperty(PROPERTIES_TITLE)
+    @JsonProperty (PROPERTIES_TITLE)
    private String title;

-    @JsonProperty(PROPERTIES_DESCRIPTION)
+    @JsonProperty (PROPERTIES_DESCRIPTION)
    private String description;
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAlias.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAlias.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAspects.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAspects.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -36,15 +36,16 @@ public class FilePlanComponentAspects
 {
    /** Private constructor to prevent instantiation. */
    private FilePlanComponentAspects()
-    {}
+    {
+    }

    // aspect present on completed records
    public static final String ASPECTS_COMPLETED_RECORD = "rma:declaredRecord";

-    // aspect present on record folders/categories with vital records
-    public static final String ASPECTS_VITAL_RECORD_DEFINITION = "rma:vitalRecordDefinition";
+	// aspect present on record folders/categories with vital records
+    public static final String ASPECTS_VITAL_RECORD_DEFINITION= "rma:vitalRecordDefinition";

-    // aspect present on vital records
+	// aspect present on vital records
    public static final String ASPECTS_VITAL_RECORD = "rma:vitalRecord";

    // Frozen aspect
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentFields.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentFields.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -47,7 +47,7 @@ public class FilePlanComponentFields
    public static final String PROPERTIES_VITAL_RECORD_INDICATOR = "rma:vitalRecordIndicator";
    public static final String PROPERTIES_REVIEW_PERIOD = "rma:reviewPeriod";
    public static final String PROPERTIES_OWNER = "cm:owner";
-    public static final String PROPERTIES_AUTHOR = "cm:author";
+    public static final String PROPERTIES_AUTHOR="cm:author";

    /** Common properties for record folders and records */
    public static final String PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE = "rma:recordSearchHasDispositionSchedule";
@@ -61,6 +61,7 @@ public class FilePlanComponentFields
    public static final String PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS = "rma:recordSearchDispositionEvents";
    public static final String PROPERTIES_DECLASSIFICATION_REVIEW_COMPLETED_BY = "rma:declassificationReviewCompletedBy";
    public static final String PROPERTIES_DECLASSIFICATION_REVIEW_COMPLETED_AT = "rma:declassificationReviewCompletedAt";
+    

    /** File plan properties */
    public static final String PROPERTIES_COMPONENT_ID = "st:componentId";
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentType.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentType.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/BulkBodyCancel.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/BulkBodyCancel.java
@@ -1,41 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.hold;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Builder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class BulkBodyCancel
-{
-    private String reason;
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/Hold.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/Hold.java
@@ -1,83 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.hold;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import org.alfresco.utility.model.TestModel;
-
-/**
- * POJO for hold
- *
- * @author Damian Ujma
- */
-@Builder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class Hold extends TestModel
-{
-    @JsonProperty(required = true)
-    private String id;
-
-    @JsonProperty(required = true)
-    private String name;
-
-    @JsonProperty(required = true)
-    private String description;
-
-    @JsonProperty(required = true)
-    private String reason;
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (this == o)
-        {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass())
-        {
-            return false;
-        }
-        Hold hold = (Hold) o;
-        return Objects.equals(id, hold.id) && Objects.equals(name, hold.name)
-                && Objects.equals(description, hold.description) && Objects.equals(reason, hold.reason);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(id, name, description, reason);
-    }
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldBulkOperation.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldBulkOperation.java
@@ -1,59 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.hold;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import org.alfresco.rest.search.RestRequestQueryModel;
-import org.alfresco.utility.model.TestModel;
-
-/**
- * POJO for hold bulk request
- *
- * @author Damian Ujma
- */
-@Builder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldBulkOperation extends TestModel
-{
-    public enum HoldBulkOperationType
-    {
-        ADD
-    }
-
-    @JsonProperty(required = true)
-    private RestRequestQueryModel query;
-    @JsonProperty(required = true)
-    private HoldBulkOperationType op;
-
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldBulkOperationEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldBulkOperationEntry.java
@@ -1,48 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.hold;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * POJO for hold bulk request entry
- *
- * @author Damian Ujma
- */
-@Builder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldBulkOperationEntry
-{
-    private String bulkStatusId;
-
-    private long totalItems;
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldBulkStatus.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldBulkStatus.java
@@ -1,68 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.hold;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import org.alfresco.utility.model.TestModel;
-
-/**
- * POJO for hold bulk request
- *
- * @author Damian Ujma
- */
-@Builder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldBulkStatus extends TestModel
-{
-    private String bulkStatusId;
-
-    private String startTime;
-
-    private String endTime;
-
-    private long processedItems;
-
-    private long errorsCount;
-
-    private long totalItems;
-
-    private String lastError;
-
-    private String status;
-
-    private boolean isCancelled;
-
-    private String cancellationReason;
-
-    private HoldBulkOperation holdBulkOperation;
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldBulkStatusCollection.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldBulkStatusCollection.java
@@ -1,37 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.hold;
-
-import org.alfresco.rest.core.RestModels;
-
-/**
- * Handle collection of {@link HoldBulkStatusEntry}
- *
- * @author Damian Ujma
- */
-public class HoldBulkStatusCollection extends RestModels<HoldBulkStatusEntry, HoldBulkStatusCollection>
-{}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldBulkStatusEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldBulkStatusEntry.java
@@ -1,45 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.hold;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import org.alfresco.rest.core.RestModels;
-
-@Builder
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldBulkStatusEntry extends RestModels<HoldBulkStatus, HoldBulkStatusEntry>
-{
-    private HoldBulkStatus entry;
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldChild.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldChild.java
@@ -1,52 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.hold;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import org.alfresco.utility.model.TestModel;
-
-/**
- * POJO for hold child
- *
- * @author Damian Ujma
- */
-@Builder
-@EqualsAndHashCode(callSuper = true)
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldChild extends TestModel
-{
-    @JsonProperty(required = true)
-    private String id;
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldChildCollection.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldChildCollection.java
@@ -1,37 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.hold;
-
-import org.alfresco.rest.core.RestModels;
-
-/**
- * Handle collection of {@link HoldChildEntry}
- *
- * @author Damian Ujma
- */
-public class HoldChildCollection extends RestModels<HoldChildEntry, HoldChildCollection>
-{}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldChildEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldChildEntry.java
@@ -1,52 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.hold;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import org.alfresco.rest.core.RestModels;
-
-/**
- * POJO for hold child entry
- *
- * @author Damian Ujma
- */
-@Builder
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldChildEntry extends RestModels<Hold, HoldChildEntry>
-{
-    @JsonProperty
-    private HoldChild entry;
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldCollection.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldCollection.java
@@ -1,37 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.hold;
-
-import org.alfresco.rest.core.RestModels;
-
-/**
- * Handle collection of {@link HoldEntry}
- *
- * @author Damian Ujma
- */
-public class HoldCollection extends RestModels<HoldEntry, HoldCollection>
-{}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldDeletionReason.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldDeletionReason.java
@@ -1,52 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.hold;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import org.alfresco.utility.model.TestModel;
-
-/**
- * POJO for hold deletion reason
- *
- * @author Damian Ujma
- */
-@Builder
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldDeletionReason extends TestModel
-{
-    @JsonProperty
-    private String reason;
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldDeletionReasonEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldDeletionReasonEntry.java
@@ -1,52 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.hold;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import org.alfresco.rest.core.RestModels;
-
-/**
- * POJO for hold child entry
- *
- * @author Damian Ujma
- */
-@Builder
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-public class HoldDeletionReasonEntry extends RestModels<HoldDeletionReason, HoldDeletionReasonEntry>
-{
-    @JsonProperty
-    private HoldDeletionReason entry;
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/HoldEntry.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -26,27 +26,31 @@
 */
 package org.alfresco.rest.rm.community.model.hold;

+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-
-import org.alfresco.rest.core.RestModels;
+import org.alfresco.utility.model.TestModel;

 /**
 * POJO for hold entry
 *
- * @author Damian Ujma
+ * @author Rodica Sutu
+ * @since 3.2
 */
@Builder
@Data
-@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
-public class HoldEntry extends RestModels<Hold, HoldEntry>
+@JsonIgnoreProperties (ignoreUnknown = true)
+public class HoldEntry extends TestModel
 {
-    @JsonProperty
-    private Hold entry;
+    @JsonProperty (required = true)
+    private String name;
+
+    @JsonProperty (required = true)
+    private String nodeRef;
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/v0/HoldEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/hold/v0/HoldEntry.java
@@ -1,56 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.hold.v0;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import org.alfresco.utility.model.TestModel;
-
-/**
- * POJO for hold entry
- *
- * @author Rodica Sutu
- * @since 3.2
- */
-@Builder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class HoldEntry extends TestModel
-{
-    @JsonProperty(required = true)
-    private String name;
-
-    @JsonProperty(required = true)
-    private String nodeRef;
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/Record.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/Record.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -29,11 +29,6 @@ package org.alfresco.rest.rm.community.model.record;
 import java.util.List;

 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;

 import org.alfresco.rest.core.IRestModel;
 import org.alfresco.rest.core.assertion.ModelAssertion;
@@ -42,6 +37,12 @@ import org.alfresco.rest.model.RestNodeModel;
 import org.alfresco.rest.rm.community.model.common.Path;
 import org.alfresco.utility.model.TestModel;

+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
 /**
 * POJO for record
 *
@@ -60,28 +61,28 @@ public class Record extends TestModel implements IRestModel<RestNodeModel>
    /*************************/
    /** Mandatory parameters */
    /*************************/
-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String createdAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel createdByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String modifiedAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel modifiedByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String name;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String id;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String nodeType;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String parentId;

    /************************/
@@ -117,7 +118,7 @@ public class Record extends TestModel implements IRestModel<RestNodeModel>
        return assertThat();
    }

-    @JsonProperty(value = "entry")
+    @JsonProperty (value = "entry")
    RestNodeModel model;

    @Override
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/RecordBodyFile.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/RecordBodyFile.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -27,14 +27,15 @@
 package org.alfresco.rest.rm.community.model.record;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.utility.model.TestModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for File records
 *
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/RecordContent.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/RecordContent.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -27,14 +27,15 @@
 package org.alfresco.rest.rm.community.model.record;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.utility.model.TestModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for record content field
 *
@@ -49,15 +50,15 @@ import org.alfresco.utility.model.TestModel;
@AllArgsConstructor
 public class RecordContent extends TestModel
 {
-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String mimeType;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String mimeTypeName;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private Integer sizeInBytes;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String encoding;
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/RecordProperties.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/RecordProperties.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -64,6 +64,7 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD_EXPRESSION;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RESOLUTION_UNIT;
+
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_REVIEW_AS_OF;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RMV_VERSIONED;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_ROOT_NODE_REF;
@@ -84,12 +85,12 @@ import java.util.List;

 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-
 import org.alfresco.rest.rm.community.model.common.Owner;
 import org.alfresco.utility.model.TestModel;

@@ -110,160 +111,160 @@ public class RecordProperties extends TestModel
    /*************************/
    /** Mandatory parameters */
    /*************************/
-    @JsonProperty(required = true, value = PROPERTIES_ROOT_NODE_REF)
+    @JsonProperty (required = true, value = PROPERTIES_ROOT_NODE_REF)
    private String rootNodeRef;

-    @JsonProperty(required = true, value = PROPERTIES_DATE_FILED)
+    @JsonProperty (required = true, value = PROPERTIES_DATE_FILED)
    private String dateField;

-    @JsonProperty(required = true, value = PROPERTIES_IDENTIFIER)
+    @JsonProperty (required = true, value = PROPERTIES_IDENTIFIER)
    private String identifier;

-    @JsonProperty(required = true, value = PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE)
+    @JsonProperty (required = true, value = PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE)
    private Boolean recordSearchHasDispositionSchedule;

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

    /*********************************/
    /** Electronic record parameters */
    /*********************************/
-    @JsonProperty(PROPERTIES_VERSION_TYPE)
+    @JsonProperty (PROPERTIES_VERSION_TYPE)
    private String versionType;

-    @JsonProperty(PROPERTIES_VERSION_LABEL)
+    @JsonProperty (PROPERTIES_VERSION_LABEL)
    private String versionLabel;

    @JsonProperty(PROPERTIES_VERSIONED_NODEREF)
    private String versionedNodeRef;

-    @JsonProperty(PROPERTIES_RMV_VERSIONED)
+    @JsonProperty (PROPERTIES_RMV_VERSIONED)
    private String recordVersionLabel;

-    @JsonProperty(PROPERTIES_DATE_TIME_ORIGINAL)
+    @JsonProperty (PROPERTIES_DATE_TIME_ORIGINAL)
    private String dateTimeOriginal;

-    @JsonProperty(PROPERTIES_EXPOSURE_TIME)
+    @JsonProperty (PROPERTIES_EXPOSURE_TIME)
    private Double exposureTime;

-    @JsonProperty(PROPERTIES_FLASH)
+    @JsonProperty (PROPERTIES_FLASH)
    private Boolean flash;

-    @JsonProperty(PROPERTIES_F_NUMBER)
+    @JsonProperty (PROPERTIES_F_NUMBER)
    private Double fNumber;

-    @JsonProperty(PROPERTIES_FOCAL_LENGTH)
+    @JsonProperty (PROPERTIES_FOCAL_LENGTH)
    private Double focalLength;

-    @JsonProperty(PROPERTIES_ISO_SPEED_RATINGS)
+    @JsonProperty (PROPERTIES_ISO_SPEED_RATINGS)
    private Integer isoSpeedRatings;

-    @JsonProperty(PROPERTIES_MANUFACTURER)
+    @JsonProperty (PROPERTIES_MANUFACTURER)
    private String manufacturer;

-    @JsonProperty(PROPERTIES_MODEL)
+    @JsonProperty (PROPERTIES_MODEL)
    private String model;

-    @JsonProperty(PROPERTIES_ORIENTATION)
+    @JsonProperty (PROPERTIES_ORIENTATION)
    private Integer orientation;

-    @JsonProperty(PROPERTIES_PIXEL_X_DIMENSION)
+    @JsonProperty (PROPERTIES_PIXEL_X_DIMENSION)
    private Integer pixelXDimension;

-    @JsonProperty(PROPERTIES_PIXEL_Y_DIMENSION)
+    @JsonProperty (PROPERTIES_PIXEL_Y_DIMENSION)
    private Integer pixelYDimension;

-    @JsonProperty(PROPERTIES_RESOLUTION_UNIT)
+    @JsonProperty (PROPERTIES_RESOLUTION_UNIT)
    private String resolutionUnit;

-    @JsonProperty(PROPERTIES_SOFTWARE)
+    @JsonProperty (PROPERTIES_SOFTWARE)
    private String software;

-    @JsonProperty(PROPERTIES_X_RESOLUTION)
+    @JsonProperty (PROPERTIES_X_RESOLUTION)
    private Double xResolution;

-    @JsonProperty(PROPERTIES_Y_RESOLUTION)
+    @JsonProperty (PROPERTIES_Y_RESOLUTION)
    private Double yResolution;

-    @JsonProperty(PROPERTIES_RECORD_ORIGINATING_LOCATION)
+    @JsonProperty (PROPERTIES_RECORD_ORIGINATING_LOCATION)
    private String originatingLocation;

-    @JsonProperty(PROPERTIES_RECORD_ORIGINATING_USER_ID)
+    @JsonProperty (PROPERTIES_RECORD_ORIGINATING_USER_ID)
    private String originatingUserId;

-    @JsonProperty(PROPERTIES_RECORD_ORIGINATING_CREATION_DATE)
+    @JsonProperty (PROPERTIES_RECORD_ORIGINATING_CREATION_DATE)
    private String originatingCreationDate;

    /*************************************/
    /** Non-electronic record parameters */
    /*************************************/
-    @JsonProperty(PROPERTIES_TITLE)
+    @JsonProperty (PROPERTIES_TITLE)
    private String title;

-    @JsonProperty(PROPERTIES_SHELF)
+    @JsonProperty (PROPERTIES_SHELF)
    private String shelf;

-    @JsonProperty(PROPERTIES_STORAGE_LOCATION)
+    @JsonProperty (PROPERTIES_STORAGE_LOCATION)
    private String storageLocation;

-    @JsonProperty(PROPERTIES_FILE)
+    @JsonProperty (PROPERTIES_FILE)
    private String file;

-    @JsonProperty(PROPERTIES_BOX)
+    @JsonProperty (PROPERTIES_BOX)
    private String box;

-    @JsonProperty(PROPERTIES_DESCRIPTION)
+    @JsonProperty (PROPERTIES_DESCRIPTION)
    private String description;

-    @JsonProperty(PROPERTIES_NUMBER_OF_COPIES)
+    @JsonProperty (PROPERTIES_NUMBER_OF_COPIES)
    private Integer numberOfCopies;

-    @JsonProperty(PROPERTIES_PHYSICAL_SIZE)
+    @JsonProperty (PROPERTIES_PHYSICAL_SIZE)
    private Integer physicalSize;

-    @JsonProperty(PROPERTIES_OWNER)
+    @JsonProperty (PROPERTIES_OWNER)
    private Owner owner;

    @JsonProperty(PROPERTIES_AUTHOR)
    private String author;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD_EXPRESSION)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD_EXPRESSION)
    private String recordSearchDispositionPeriodExpression;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY)
    private String recordSearchDispositionAuthority;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_AS_OF)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_AS_OF)
    private Date recordSearchDispositionActionAsOf;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD)
    private String recordSearchDispositionPeriod;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_NAME)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_NAME)
    private String recordSearchDispositionActionName;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS_ELIGIBLE)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS_ELIGIBLE)
    private Boolean recordSearchDispositionEventsEligible;

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

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS)
    private String recordSearchDispositionInstructions;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD)
    private String recordSearchVitalRecordReviewPeriod;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD_EXPRESSION)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD_EXPRESSION)
    private String recordSearchVitalRecordReviewPeriodExpression;

    @JsonProperty(PROPERTIES_REVIEW_AS_OF)
    private Date reviewAsOf;

-    @JsonProperty(PROPERTIES_STORE)
+    @JsonProperty (PROPERTIES_STORE)
    private String store;

    @JsonProperty(PROPERTIES_WORM_UNLOCK_DATE)
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategory.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategory.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -29,16 +29,17 @@ package org.alfresco.rest.rm.community.model.recordcategory;
 import java.util.List;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.rest.model.RestByUserModel;
+import org.alfresco.rest.rm.community.model.common.Path;
+import org.alfresco.utility.model.TestModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.model.RestByUserModel;
-import org.alfresco.rest.rm.community.model.common.Path;
-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for record category
 *
@@ -58,34 +59,34 @@ public class RecordCategory extends TestModel
    /** Mandatory parameters */
    /*************************/

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel createdByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String modifiedAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String nodeType;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String parentId;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private List<String> aspectNames;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String createdAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel modifiedByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String name;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String id;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RecordCategoryProperties properties;

    /************************/
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChild.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChild.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -29,16 +29,17 @@ package org.alfresco.rest.rm.community.model.recordcategory;
 import java.util.List;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.rest.model.RestByUserModel;
+import org.alfresco.rest.rm.community.model.common.Path;
+import org.alfresco.utility.model.TestModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.model.RestByUserModel;
-import org.alfresco.rest.rm.community.model.common.Path;
-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for record category child
 *
@@ -57,28 +58,28 @@ public class RecordCategoryChild extends TestModel
    /*************************/
    /** Mandatory parameters */
    /*************************/
-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String createdAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel createdByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String modifiedAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel modifiedByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String name;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String id;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String nodeType;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String parentId;

    /************************/
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildCollection.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildCollection.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildEntry.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -27,11 +27,12 @@
 package org.alfresco.rest.rm.community.model.recordcategory;

 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;

 import org.alfresco.rest.core.RestModels;

+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
 * POJO for record category child entry
 *
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildProperties.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildProperties.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -32,15 +32,15 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_IS_CLOSED;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_LOCATION;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_OWNER;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_AS_OF;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_NAME;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD_EXPRESSION;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_AS_OF;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_NAME;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS_ELIGIBLE;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD_EXPRESSION;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_REVIEW_PERIOD;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_ROOT_NODE_REF;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_TITLE;
@@ -51,17 +51,18 @@ import java.util.List;

 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;

 import org.alfresco.rest.rm.community.model.common.Owner;
 import org.alfresco.rest.rm.community.model.common.ReviewPeriod;
 import org.alfresco.rest.rm.community.util.ReviewPeriodSerializer;
 import org.alfresco.utility.model.TestModel;

+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
 /**
 * POJO for record category child properties
 *
@@ -78,65 +79,65 @@ public class RecordCategoryChildProperties extends TestModel
    /**************************************************************************/
    /** Mandatory parameters - Shared by record categories and record folders */
    /**************************************************************************/
-    @JsonProperty(required = true, value = PROPERTIES_TITLE)
+    @JsonProperty (required = true, value = PROPERTIES_TITLE)
    private String title;

-    @JsonProperty(required = true, value = PROPERTIES_VITAL_RECORD_INDICATOR)
+    @JsonProperty (required = true, value = PROPERTIES_VITAL_RECORD_INDICATOR)
    private Boolean vitalRecordIndicator;

-    @JsonProperty(required = true, value = PROPERTIES_ROOT_NODE_REF)
+    @JsonProperty (required = true, value = PROPERTIES_ROOT_NODE_REF)
    private String rootNodeRef;

-    @JsonProperty(required = true, value = PROPERTIES_IDENTIFIER)
+    @JsonProperty (required = true, value = PROPERTIES_IDENTIFIER)
    private String identifier;

-    @JsonProperty(required = true, value = PROPERTIES_REVIEW_PERIOD)
-    @JsonSerialize(using = ReviewPeriodSerializer.class)
+    @JsonProperty (required = true, value = PROPERTIES_REVIEW_PERIOD)
+    @JsonSerialize (using = ReviewPeriodSerializer.class)
    private ReviewPeriod reviewPeriod;

-    @JsonProperty(required = true, value = PROPERTIES_DESCRIPTION)
+    @JsonProperty (required = true, value = PROPERTIES_DESCRIPTION)
    private String description;

    /*********************************************************/
    /** Optional parameters - Applies only to record folders */
    /*********************************************************/
-    @JsonProperty(PROPERTIES_HELD_CHILDREN_COUNT)
+    @JsonProperty (PROPERTIES_HELD_CHILDREN_COUNT)
    private Integer heldChildrenCount;

-    @JsonProperty(PROPERTIES_LOCATION)
+    @JsonProperty (PROPERTIES_LOCATION)
    private String location;

-    @JsonProperty(PROPERTIES_IS_CLOSED)
+    @JsonProperty (PROPERTIES_IS_CLOSED)
    private Boolean isClosed;

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

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_AS_OF)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_AS_OF)
    private Date recordSearchDispositionActionAsOf;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD)
    private String recordSearchDispositionPeriod;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_NAME)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_NAME)
    private String recordSearchDispositionActionName;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS_ELIGIBLE)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS_ELIGIBLE)
    private Boolean recordSearchDispositionEventsEligible;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS)
    private String recordSearchDispositionInstructions;

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

 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryCollection.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryCollection.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryEntry.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -27,12 +27,13 @@
 package org.alfresco.rest.rm.community.model.recordcategory;

 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;

 import org.alfresco.rest.core.RestModels;
 import org.alfresco.rest.rm.community.model.fileplan.FilePlan;

+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
 * POJO for file plan entry
 *
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryProperties.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryProperties.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -35,22 +35,24 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_TITLE;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_VITAL_RECORD_INDICATOR;

+
 import java.util.List;

 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;

 import org.alfresco.rest.rm.community.model.common.Owner;
 import org.alfresco.rest.rm.community.model.common.ReviewPeriod;
 import org.alfresco.rest.rm.community.util.ReviewPeriodSerializer;
 import org.alfresco.utility.model.TestModel;

+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
 /**
 * POJO for record category properties
 *
@@ -62,37 +64,37 @@ import org.alfresco.utility.model.TestModel;
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonIgnoreProperties (ignoreUnknown = true)
 public class RecordCategoryProperties extends TestModel
 {
    /*************************/
    /** Mandatory parameters */
    /*************************/
-    @JsonProperty(required = true, value = PROPERTIES_IDENTIFIER)
+    @JsonProperty (required = true, value = PROPERTIES_IDENTIFIER)
    private String identifier;

-    @JsonProperty(required = true, value = PROPERTIES_REVIEW_PERIOD)
-    @JsonSerialize(using = ReviewPeriodSerializer.class)
+    @JsonProperty (required = true, value = PROPERTIES_REVIEW_PERIOD)
+    @JsonSerialize (using = ReviewPeriodSerializer.class)
    private ReviewPeriod reviewPeriod;

-    @JsonProperty(required = true, value = PROPERTIES_VITAL_RECORD_INDICATOR)
+    @JsonProperty (required = true, value = PROPERTIES_VITAL_RECORD_INDICATOR)
    private Boolean vitalRecordIndicator;

    /************************/
    /** Optional parameters */
    /************************/
-    @JsonProperty(PROPERTIES_TITLE)
+    @JsonProperty (PROPERTIES_TITLE)
    private String title;

-    @JsonProperty(PROPERTIES_ROOT_NODE_REF)
+    @JsonProperty (PROPERTIES_ROOT_NODE_REF)
    private String rootNodeRef;

-    @JsonProperty(PROPERTIES_DESCRIPTION)
+    @JsonProperty (PROPERTIES_DESCRIPTION)
    private String description;

-    @JsonProperty(PROPERTIES_OWNER)
+    @JsonProperty (PROPERTIES_OWNER)
    private Owner owner;

-    @JsonProperty(PROPERTIES_CLASSIFICATION)
+    @JsonProperty (PROPERTIES_CLASSIFICATION)
    private List<String> classification;
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RetentionPeriodProperty.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RetentionPeriodProperty.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordfolder/RecordFolder.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordfolder/RecordFolder.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -29,16 +29,17 @@ package org.alfresco.rest.rm.community.model.recordfolder;
 import java.util.List;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.rest.model.RestByUserModel;
+import org.alfresco.rest.rm.community.model.common.Path;
+import org.alfresco.utility.model.TestModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.model.RestByUserModel;
-import org.alfresco.rest.rm.community.model.common.Path;
-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for record folder
 *
@@ -55,34 +56,34 @@ public class RecordFolder extends TestModel
    /*************************/
    /** Mandatory parameters */
    /*************************/
-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel createdByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String modifiedAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String nodeType;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String parentId;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private List<String> aspectNames;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String createdAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel modifiedByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String name;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String id;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RecordFolderProperties properties;

    /************************/
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordfolder/RecordFolderCollection.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordfolder/RecordFolderCollection.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordfolder/RecordFolderEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordfolder/RecordFolderEntry.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -27,15 +27,16 @@
 package org.alfresco.rest.rm.community.model.recordfolder;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.rest.core.RestModels;
+import org.alfresco.rest.rm.community.model.record.Record;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.core.RestModels;
-import org.alfresco.rest.rm.community.model.record.Record;
-
 /**
 * POJO for record folder entry
 *
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordfolder/RecordFolderProperties.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordfolder/RecordFolderProperties.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -33,8 +33,10 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_IS_CLOSED;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_LOCATION;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_OWNER;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields
+        .PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields
+        .PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD_EXPRESSION;
@@ -48,17 +50,18 @@ import java.util.List;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;

 import org.alfresco.rest.rm.community.model.common.Owner;
 import org.alfresco.rest.rm.community.model.common.ReviewPeriod;
 import org.alfresco.rest.rm.community.util.ReviewPeriodSerializer;
 import org.alfresco.utility.model.TestModel;

+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
 /**
 * POJO for record folder properties
 *
@@ -70,62 +73,62 @@ import org.alfresco.utility.model.TestModel;
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonIgnoreProperties (ignoreUnknown = true)
 public class RecordFolderProperties extends TestModel
 {
    /*************************/
    /** Mandatory parameters */
    /*************************/
-    @JsonProperty(required = true, value = PROPERTIES_IS_CLOSED)
+    @JsonProperty (required = true, value = PROPERTIES_IS_CLOSED)
    private Boolean isClosed;

-    @JsonProperty(required = true, value = PROPERTIES_IDENTIFIER)
+    @JsonProperty (required = true, value = PROPERTIES_IDENTIFIER)
    private String identifier;

-    @JsonProperty(required = true, value = PROPERTIES_HELD_CHILDREN_COUNT)
+    @JsonProperty (required = true, value = PROPERTIES_HELD_CHILDREN_COUNT)
    private Integer heldChildrenCount;

    /************************/
    /** Optional parameters */
    /************************/
-    @JsonProperty(PROPERTIES_TITLE)
+    @JsonProperty (PROPERTIES_TITLE)
    private String title;

-    @JsonProperty(PROPERTIES_VITAL_RECORD_INDICATOR)
+    @JsonProperty (PROPERTIES_VITAL_RECORD_INDICATOR)
    private Boolean vitalRecordIndicator;

-    @JsonProperty(PROPERTIES_ROOT_NODE_REF)
+    @JsonProperty (PROPERTIES_ROOT_NODE_REF)
    private String rootNodeRef;

-    @JsonProperty(PROPERTIES_LOCATION)
+    @JsonProperty (PROPERTIES_LOCATION)
    private String location;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE)
    private Boolean recordSearchHasDispositionSchedule;

-    @JsonProperty(PROPERTIES_REVIEW_PERIOD)
-    @JsonSerialize(using = ReviewPeriodSerializer.class)
+    @JsonProperty (PROPERTIES_REVIEW_PERIOD)
+    @JsonSerialize (using = ReviewPeriodSerializer.class)
    private ReviewPeriod reviewPeriod;

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

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

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD_EXPRESSION)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD_EXPRESSION)
    private String recordSearchVitalRecordReviewPeriodExpression;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY)
    private String recordSearchDispositionAuthority;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS)
    private String recordSearchDispositionInstructions;

 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionSchedule.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionSchedule.java
@@ -1,60 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.retentionschedule;
-
-import java.util.List;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import org.alfresco.utility.model.TestModel;
-
-/**
- * retention schedule
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class RetentionSchedule extends TestModel
-{
-    private String id;
-    private String parentId;
-    private String authority;
-    private String instructions;
-    private boolean isRecordLevel;
-    private boolean isUnpublishedUpdates;
-    private List<RetentionScheduleActionDefinition> actions;
-
-    public boolean getIsRecordLevel()
-    {
-        return isRecordLevel;
-    }
-
-    public void setIsRecordLevel(boolean recordLevel)
-    {
-        isRecordLevel = recordLevel;
-    }
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleActionDefinition.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleActionDefinition.java
@@ -1,51 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.retentionschedule;
-
-import java.util.List;
-
-import lombok.Data;
-
-/**
- * retention schedule action definition
- */
-@Data
-public class RetentionScheduleActionDefinition
-{
-    private String id;
-    private String name;
-    private int periodAmount;
-    private String period;
-    private String periodProperty;
-    private boolean combineRetentionStepConditions;
-    private List<String> events;
-    private boolean eligibleOnFirstCompleteEvent;
-    private String description;
-    private boolean retainRecordMetadataAfterDestruction;
-    private String location;
-    private int index;
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleCollection.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleCollection.java
@@ -1,32 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.retentionschedule;
-
-import org.alfresco.rest.core.RestModels;
-
-public class RetentionScheduleCollection extends RestModels<RetentionScheduleEntry, RetentionScheduleCollection>
-{}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleEntry.java
@@ -1,39 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.retentionschedule;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-import org.alfresco.rest.core.RestModels;
-
-@Data
-public class RetentionScheduleEntry extends RestModels<RetentionSchedule, RetentionScheduleEntry>
-{
-    @JsonProperty
-    private RetentionSchedule entry;
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleStepCollection.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleStepCollection.java
@@ -1,32 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.retentionschedule;
-
-import org.alfresco.rest.core.RestModels;
-
-public class RetentionScheduleStepCollection extends RestModels<RetentionScheduleStepEntry, RetentionScheduleStepCollection>
-{}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleStepEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/retentionschedule/RetentionScheduleStepEntry.java
@@ -1,39 +0,0 @@
-/*
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.retentionschedule;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-import org.alfresco.rest.core.RestModels;
-
-@Data
-public class RetentionScheduleStepEntry extends RestModels<RetentionScheduleActionDefinition, RetentionScheduleStepEntry>
-{
-    @JsonProperty
-    private RetentionScheduleActionDefinition entry;
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/role/Role.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/role/Role.java
@@ -1,91 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.role;
-
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import org.alfresco.rest.rm.community.model.CapabilityModel;
-import org.alfresco.utility.model.TestModel;
-
-/**
- * POJO for role
- */
-@Builder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class Role extends TestModel
-{
-
-    @JsonProperty(required = true)
-    private String name;
-
-    @JsonProperty(required = true)
-    private List<CapabilityModel> capabilities;
-
-    @JsonProperty(required = true)
-    private String displayLabel;
-
-    @JsonProperty(required = true)
-    private String groupShortName;
-
-    private List<String> assignedUsers;
-
-    private List<String> assignedGroups;
-
-    private String roleGroupName;
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (this == o)
-        {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass())
-        {
-            return false;
-        }
-        Role role = (Role) o;
-        return Objects.equals(name, role.name) && Objects.equals(capabilities, role.capabilities)
-                && Objects.equals(displayLabel, role.displayLabel) && Objects.equals(groupShortName, role.groupShortName) && Objects.equals(assignedUsers, role.assignedUsers)
-                && Objects.equals(assignedGroups, role.assignedGroups) && Objects.equals(roleGroupName, role.roleGroupName);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(name, capabilities, displayLabel, groupShortName, assignedUsers, assignedGroups, roleGroupName);
-    }
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/role/RoleCollection.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/role/RoleCollection.java
@@ -1,32 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.role;
-
-import org.alfresco.rest.core.RestModels;
-
-public class RoleCollection extends RestModels<RoleEntry, RoleCollection>
-{}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/role/RoleEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/role/RoleEntry.java
@@ -1,47 +0,0 @@
-/*-
- * #%L
- * Alfresco Records Management Module
- * %%
- * Copyright (C) 2005 - 2025 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.model.role;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import org.alfresco.rest.core.RestModels;
-
-@Builder
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-public class RoleEntry extends RestModels<Role, RoleEntry>
-{
-    @JsonProperty
-    private Role entry;
-}
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/rules/ActionsOnRule.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/rules/ActionsOnRule.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -31,7 +31,26 @@ package org.alfresco.rest.rm.community.model.rules;
 */
 public enum ActionsOnRule
 {
-    COMPLETE_RECORD("declareRecord"), REOPEN_RECORD("undeclareRecord"), OPEN_RECORD_FOLDER("openRecordFolder"), CLOSE_RECORD_FOLDER("closeRecordFolder"), FILE_TO("fileTo"), COPY_TO("copyTo"), MOVE_TO("moveTo"), LINK_TO("linkTo"), REJECT("reject"), REQUEST_INFORMATION("requestInfo"), COMPLETE_EVENT("completeEvent"), ADD_RECORD_TYPES("addRecordTypes"), EXECUTE_SCRIPT("executeScript"), SEND_EMAIL("sendEmail"), SET_PROPERTY_VALUE_COLL_SITE("set-property-value"), SET_PROPERTY_VALUE_RM("setPropertyValue"), HIDE_RECORD("hide-record"), DECLARE_VERSION_AS_RECORD("declare-as-version-record"), DECLARE_AS_RECORD("create-record"), WORM_LOCK("wormLock");
+    COMPLETE_RECORD("declareRecord"),
+    REOPEN_RECORD("undeclareRecord"),
+    OPEN_RECORD_FOLDER("openRecordFolder"),
+    CLOSE_RECORD_FOLDER("closeRecordFolder"),
+    FILE_TO("fileTo"),
+    COPY_TO("copyTo"),
+    MOVE_TO("moveTo"),
+    LINK_TO("linkTo"),
+    REJECT("reject"),
+    REQUEST_INFORMATION("requestInfo"),
+    COMPLETE_EVENT("completeEvent"),
+    ADD_RECORD_TYPES("addRecordTypes"),
+    EXECUTE_SCRIPT("executeScript"),
+    SEND_EMAIL("sendEmail"),
+    SET_PROPERTY_VALUE_COLL_SITE("set-property-value"),
+    SET_PROPERTY_VALUE_RM("setPropertyValue"),
+    HIDE_RECORD("hide-record"),
+    DECLARE_VERSION_AS_RECORD("declare-as-version-record"),
+    DECLARE_AS_RECORD("create-record"),
+    WORM_LOCK("wormLock");

    private String actionValue;

--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/rules/ConditionsOnRule.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/rules/ConditionsOnRule.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -31,17 +31,18 @@ package org.alfresco.rest.rm.community.model.rules;
 */
 public enum ConditionsOnRule
 {
-    UPDATE("update"), ADDED("inbound"), REMOVED("outbound");
-
+    UPDATE("update"),
+    ADDED("inbound"),
+    REMOVED("outbound");
    private String whenConditionValue;

    ConditionsOnRule(String value)
    {
-        this.whenConditionValue = value;
+            this.whenConditionValue = value;
    }

    public String getWhenConditionValue()
    {
-        return whenConditionValue;
+            return whenConditionValue;
    }
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/rules/RuleDefinition.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/rules/RuleDefinition.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -200,3 +200,4 @@ public class RuleDefinition
        return this;
    }
 }
+
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSite.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSite.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -27,14 +27,15 @@
 package org.alfresco.rest.rm.community.model.site;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.rest.model.RestSiteModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.model.RestSiteModel;
-
 /**
 * POJO for RM Site component
 *
@@ -47,7 +48,7 @@ import org.alfresco.rest.model.RestSiteModel;
@AllArgsConstructor
 public class RMSite extends RestSiteModel
 {
-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RMSiteCompliance compliance;

    /** Private constructor allowing Lombok to include superclass fields in the builder. */
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSiteCompliance.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSiteCompliance.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -34,5 +34,6 @@ package org.alfresco.rest.rm.community.model.site;
 */
 public enum RMSiteCompliance
 {
-    STANDARD, DOD5015
+    STANDARD,
+    DOD5015
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSiteFields.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/site/RMSiteFields.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -27,8 +27,16 @@
 package org.alfresco.rest.rm.community.model.site;

 /**
- * RM Site properties from the RM Model Schema "entry": { "id": "string", "guid": "string", "title": "string", "description": "string", "visibility": "{@link org.springframework.social.alfresco.api.entities.Site.Visibility}", "compliance": "{@link RMSiteCompliance}", "role": "{@link org.alfresco.utility.constants.UserRole}" }
- * 
+ *RM Site properties from the RM Model Schema
+ *"entry": {
+ *      "id": "string",
+ *      "guid": "string",
+ *      "title": "string",
+ *      "description": "string",
+ *      "visibility": "{@link org.springframework.social.alfresco.api.entities.Site.Visibility}",
+ *      "compliance": "{@link RMSiteCompliance}",
+ *      "role": "{@link org.alfresco.utility.constants.UserRole}"
+ *}
 * @author Tuna Aksoy
 * @author Rodica Sutu
 * @since 2.6
@@ -39,6 +47,6 @@ public class RMSiteFields
    public static final String COMPLIANCE = "compliance";
    public static final String TITLE = "title";
    public static final String DESCRIPTION = "description";
-    public static final String VISIBILITY = "visibility";
+    public static final String VISIBILITY ="visibility";
    public static final String ROLE = "role";
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/Transfer.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/Transfer.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -30,15 +30,16 @@ package org.alfresco.rest.rm.community.model.transfer;
 import java.util.List;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.rest.model.RestByUserModel;
+import org.alfresco.utility.model.TestModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.model.RestByUserModel;
-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for Transfer
 *
@@ -55,28 +56,28 @@ public class Transfer extends TestModel
    /*************************/
    /** Mandatory parameters */
    /*************************/
-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel createdByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String nodeType;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String parentId;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private List<String> aspectNames;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String createdAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String name;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String id;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private TransferProperties properties;

    /************************/
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferChild.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferChild.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -30,16 +30,17 @@ package org.alfresco.rest.rm.community.model.transfer;
 import java.util.List;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.rest.model.RestByUserModel;
+import org.alfresco.rest.rm.community.model.common.Path;
+import org.alfresco.utility.model.TestModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.model.RestByUserModel;
-import org.alfresco.rest.rm.community.model.common.Path;
-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for transfer child
 *
@@ -56,28 +57,28 @@ public class TransferChild extends TestModel
    /*************************/
    /** Mandatory parameters */
    /*************************/
-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String createdAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel createdByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String modifiedAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel modifiedByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String name;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String id;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String nodeType;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String parentId;

    /************************/
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferChildCollection.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferChildCollection.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -31,7 +31,6 @@ import org.alfresco.rest.core.RestModels;

 /**
 * Handle collection of {@link TransferChildEntry}
- * 
 * @author Silviu Dinuta
 * @since 2.6
 */
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferChildEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferChildEntry.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -27,15 +27,16 @@

 package org.alfresco.rest.rm.community.model.transfer;

+import org.alfresco.rest.core.RestModels;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.core.RestModels;
-
 /**
 * POJO for transfer child entry
 *
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferChildProperties.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferChildProperties.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -64,19 +64,20 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_X_RESOLUTION;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_Y_RESOLUTION;

+import org.alfresco.rest.rm.community.model.common.Owner;
+import org.alfresco.rest.rm.community.model.common.ReviewPeriod;
+import org.alfresco.rest.rm.community.util.ReviewPeriodSerializer;
+import org.alfresco.utility.model.TestModel;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.rm.community.model.common.Owner;
-import org.alfresco.rest.rm.community.model.common.ReviewPeriod;
-import org.alfresco.rest.rm.community.util.ReviewPeriodSerializer;
-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for transfer child properties
 *
@@ -91,127 +92,128 @@ import org.alfresco.utility.model.TestModel;
 public class TransferChildProperties extends TestModel
 {
    /**************************************************************************/
-    /** Mandatory parameters - Shared by record folders and records */
+    /** Mandatory parameters - Shared by record folders and records*/
    /**************************************************************************/
-    @JsonProperty(PROPERTIES_TITLE)
+    @JsonProperty (PROPERTIES_TITLE)
    private String title;

-    @JsonProperty(required = true, value = PROPERTIES_ROOT_NODE_REF)
+    @JsonProperty (required = true, value = PROPERTIES_ROOT_NODE_REF)
    private String rootNodeRef;

-    @JsonProperty(required = true, value = PROPERTIES_IDENTIFIER)
+    @JsonProperty (required = true, value = PROPERTIES_IDENTIFIER)
    private String identifier;

-    @JsonProperty(PROPERTIES_DESCRIPTION)
+    @JsonProperty (PROPERTIES_DESCRIPTION)
    private String description;

    /*********************************************************/
    /** Optional parameters - Applies only to record folders */
    /*********************************************************/
-    @JsonProperty(PROPERTIES_VITAL_RECORD_INDICATOR)
+    @JsonProperty (PROPERTIES_VITAL_RECORD_INDICATOR)
    private Boolean vitalRecordIndicator;

-    @JsonProperty(PROPERTIES_REVIEW_PERIOD)
-    @JsonSerialize(using = ReviewPeriodSerializer.class)
+    @JsonProperty (PROPERTIES_REVIEW_PERIOD)
+    @JsonSerialize (using = ReviewPeriodSerializer.class)
    private ReviewPeriod reviewPeriod;

-    @JsonProperty(PROPERTIES_HELD_CHILDREN_COUNT)
+    @JsonProperty (PROPERTIES_HELD_CHILDREN_COUNT)
    private Integer heldChildrenCount;

-    @JsonProperty(PROPERTIES_LOCATION)
+    @JsonProperty (PROPERTIES_LOCATION)
    private String location;

-    @JsonProperty(PROPERTIES_IS_CLOSED)
+    @JsonProperty (PROPERTIES_IS_CLOSED)
    private Boolean isClosed;

    /*********************************************************/
    /** Optional parameters - Applies only to records */
    /*********************************************************/
-    @JsonProperty(PROPERTIES_DATE_FILED)
+    @JsonProperty (PROPERTIES_DATE_FILED)
    private String dateField;

-    @JsonProperty(PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE)
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE)
    private Boolean recordSearchHasDispositionSchedule;

-    @JsonProperty(PROPERTIES_ORIGINAL_NAME)
+    @JsonProperty (PROPERTIES_ORIGINAL_NAME)
    private String originalName;

+
    /*********************************/
    /** Electronic record parameters */
    /*********************************/
-    @JsonProperty(PROPERTIES_VERSION_TYPE)
+    @JsonProperty (PROPERTIES_VERSION_TYPE)
    private String versionType;

-    @JsonProperty(PROPERTIES_VERSION_LABEL)
+    @JsonProperty (PROPERTIES_VERSION_LABEL)
    private String versionLabel;

-    @JsonProperty(PROPERTIES_DATE_TIME_ORIGINAL)
+    @JsonProperty (PROPERTIES_DATE_TIME_ORIGINAL)
    private String dateTimeOriginal;

-    @JsonProperty(PROPERTIES_EXPOSURE_TIME)
+    @JsonProperty (PROPERTIES_EXPOSURE_TIME)
    private Double exposureTime;

-    @JsonProperty(PROPERTIES_FLASH)
+    @JsonProperty (PROPERTIES_FLASH)
    private Boolean flash;

-    @JsonProperty(PROPERTIES_F_NUMBER)
+    @JsonProperty (PROPERTIES_F_NUMBER)
    private Double fNumber;

-    @JsonProperty(PROPERTIES_FOCAL_LENGTH)
+    @JsonProperty (PROPERTIES_FOCAL_LENGTH)
    private Double focalLength;

-    @JsonProperty(PROPERTIES_ISO_SPEED_RATINGS)
+    @JsonProperty (PROPERTIES_ISO_SPEED_RATINGS)
    private Integer isoSpeedRatings;

-    @JsonProperty(PROPERTIES_MANUFACTURER)
+    @JsonProperty (PROPERTIES_MANUFACTURER)
    private String manufacturer;

-    @JsonProperty(PROPERTIES_MODEL)
+    @JsonProperty (PROPERTIES_MODEL)
    private String model;

-    @JsonProperty(PROPERTIES_ORIENTATION)
+    @JsonProperty (PROPERTIES_ORIENTATION)
    private Integer orientation;

-    @JsonProperty(PROPERTIES_PIXEL_X_DIMENSION)
+    @JsonProperty (PROPERTIES_PIXEL_X_DIMENSION)
    private Integer pixelXDimension;

-    @JsonProperty(PROPERTIES_PIXEL_Y_DIMENSION)
+    @JsonProperty (PROPERTIES_PIXEL_Y_DIMENSION)
    private Integer pixelYDimension;

-    @JsonProperty(PROPERTIES_RESOLUTION_UNIT)
+    @JsonProperty (PROPERTIES_RESOLUTION_UNIT)
    private String resolutionUnit;

-    @JsonProperty(PROPERTIES_SOFTWARE)
+    @JsonProperty (PROPERTIES_SOFTWARE)
    private String software;

-    @JsonProperty(PROPERTIES_X_RESOLUTION)
+    @JsonProperty (PROPERTIES_X_RESOLUTION)
    private Double xResolution;

-    @JsonProperty(PROPERTIES_Y_RESOLUTION)
+    @JsonProperty (PROPERTIES_Y_RESOLUTION)
    private Double yResolution;

    /*************************************/
    /** Non-electronic record parameters */
    /*************************************/

-    @JsonProperty(PROPERTIES_SHELF)
+    @JsonProperty (PROPERTIES_SHELF)
    private String shelf;

-    @JsonProperty(PROPERTIES_STORAGE_LOCATION)
+    @JsonProperty (PROPERTIES_STORAGE_LOCATION)
    private String storageLocation;

-    @JsonProperty(PROPERTIES_FILE)
+    @JsonProperty (PROPERTIES_FILE)
    private String file;

-    @JsonProperty(PROPERTIES_BOX)
+    @JsonProperty (PROPERTIES_BOX)
    private String box;

-    @JsonProperty(PROPERTIES_NUMBER_OF_COPIES)
+    @JsonProperty (PROPERTIES_NUMBER_OF_COPIES)
    private Integer numberOfCopies;

-    @JsonProperty(PROPERTIES_PHYSICAL_SIZE)
+    @JsonProperty (PROPERTIES_PHYSICAL_SIZE)
    private Integer physicalSize;

-    @JsonProperty(PROPERTIES_OWNER)
+    @JsonProperty (PROPERTIES_OWNER)
    private Owner owner;
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferCollection.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferCollection.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -31,7 +31,6 @@ import org.alfresco.rest.core.RestModels;

 /**
 * Handle collection of {@link TransferEntry}
- * 
 * @author Silviu Dinuta
 * @since 2.6
 */
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferEntry.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -27,16 +27,17 @@

 package org.alfresco.rest.rm.community.model.transfer;

+import org.alfresco.rest.core.RestModels;
+import org.alfresco.rest.rm.community.model.transfercontainer.TransferContainer;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.core.RestModels;
-import org.alfresco.rest.rm.community.model.transfercontainer.TransferContainer;
-
 /**
 * POJO for transfer entry
 *
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferProperties.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfer/TransferProperties.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -27,23 +27,24 @@

 package org.alfresco.rest.rm.community.model.transfer;

-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_ACCESSION_INDICATOR;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_IDENTIFIER;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_OWNER;
-import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_PDF_INDICATOR;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_ROOT_NODE_REF;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_PDF_INDICATOR;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_TRANSFER_LOCATION;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_ACCESSION_INDICATOR;
+
+import org.alfresco.rest.rm.community.model.common.Owner;
+import org.alfresco.utility.model.TestModel;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.rm.community.model.common.Owner;
-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for Transfer properties
 *
@@ -60,24 +61,24 @@ public class TransferProperties extends TestModel
    /*************************/
    /** Mandatory parameters */
    /*************************/
-    @JsonProperty(required = true, value = PROPERTIES_IDENTIFIER)
+    @JsonProperty (required = true, value = PROPERTIES_IDENTIFIER)
    private String identifier;

    /************************/
    /** Optional parameters */
    /************************/
-    @JsonProperty(PROPERTIES_ROOT_NODE_REF)
+    @JsonProperty (PROPERTIES_ROOT_NODE_REF)
    private String rootNodeRef;

-    @JsonProperty(PROPERTIES_OWNER)
+    @JsonProperty (PROPERTIES_OWNER)
    private Owner owner;

-    @JsonProperty(PROPERTIES_PDF_INDICATOR)
+    @JsonProperty (PROPERTIES_PDF_INDICATOR)
    private Boolean pdfIndicator;

-    @JsonProperty(PROPERTIES_TRANSFER_LOCATION)
+    @JsonProperty (PROPERTIES_TRANSFER_LOCATION)
    private String transferLocation;

-    @JsonProperty(PROPERTIES_ACCESSION_INDICATOR)
+    @JsonProperty (PROPERTIES_ACCESSION_INDICATOR)
    private Boolean accessionIndicator;
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfercontainer/TransferContainer.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfercontainer/TransferContainer.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -30,15 +30,16 @@ package org.alfresco.rest.rm.community.model.transfercontainer;
 import java.util.List;

 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.rest.model.RestByUserModel;
+import org.alfresco.utility.model.TestModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.model.RestByUserModel;
-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for Transfer Container
 *
@@ -55,34 +56,34 @@ public class TransferContainer extends TestModel
    /*************************/
    /** Mandatory parameters */
    /*************************/
-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel createdByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String modifiedAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String nodeType;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String parentId;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private List<String> aspectNames;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String createdAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel modifiedByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String name;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String id;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private TransferContainerProperties properties;

    /************************/
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfercontainer/TransferContainerProperties.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/transfercontainer/TransferContainerProperties.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -31,15 +31,16 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_IDENTIFIER;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_ROOT_NODE_REF;

+import org.alfresco.utility.model.TestModel;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for Transfer Container properties
 *
@@ -56,16 +57,16 @@ public class TransferContainerProperties extends TestModel
    /*************************/
    /** Mandatory parameters */
    /*************************/
-    @JsonProperty(required = true, value = PROPERTIES_IDENTIFIER)
+    @JsonProperty (required = true, value = PROPERTIES_IDENTIFIER)
    private String identifier;

    /************************/
    /** Optional parameters */
    /************************/
-    @JsonProperty(PROPERTIES_ROOT_NODE_REF)
+    @JsonProperty (PROPERTIES_ROOT_NODE_REF)
    private String rootNodeRef;

-    @JsonProperty(PROPERTIES_COUNT)
+    @JsonProperty (PROPERTIES_COUNT)
    private Integer count;

 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainer.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainer.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -28,17 +28,18 @@ package org.alfresco.rest.rm.community.model.unfiledcontainer;

 import java.util.List;

+import org.alfresco.rest.model.RestByUserModel;
+import org.alfresco.rest.rm.community.model.common.Path;
+import org.alfresco.utility.model.TestModel;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.model.RestByUserModel;
-import org.alfresco.rest.rm.community.model.common.Path;
-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for unfiled container
 *
@@ -55,34 +56,34 @@ public class UnfiledContainer extends TestModel
    /*************************/
    /** Mandatory parameters */
    /*************************/
-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel createdByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String modifiedAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String nodeType;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String parentId;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private List<String> aspectNames;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String createdAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel modifiedByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String name;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String id;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private UnfiledContainerProperties properties;

    /************************/
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainerChild.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainerChild.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -28,19 +28,20 @@ package org.alfresco.rest.rm.community.model.unfiledcontainer;

 import java.util.List;

+import org.alfresco.rest.model.RestByUserModel;
+import org.alfresco.rest.rm.community.model.common.Path;
+import org.alfresco.rest.rm.community.model.record.RecordContent;
+import org.alfresco.utility.model.TestModel;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.model.RestByUserModel;
-import org.alfresco.rest.rm.community.model.common.Path;
-import org.alfresco.rest.rm.community.model.record.RecordContent;
-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for record category child
 *
@@ -52,40 +53,40 @@ import org.alfresco.utility.model.TestModel;
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonIgnoreProperties (ignoreUnknown = true)
 public class UnfiledContainerChild extends TestModel
 {
    /*************************/
    /** Mandatory parameters */
    /*************************/
-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String createdAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private Boolean isUnfiledRecordFolder;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private Boolean isRecord;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel createdByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String modifiedAt;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private RestByUserModel modifiedByUser;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String name;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String id;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String nodeType;

-    @JsonProperty(required = true)
+    @JsonProperty (required = true)
    private String parentId;

    /************************/
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainerChildCollection.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainerChildCollection.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainerChildEntry.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainerChildEntry.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -27,11 +27,12 @@
 package org.alfresco.rest.rm.community.model.unfiledcontainer;

 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;

 import org.alfresco.rest.core.RestModels;

+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
 * POJO for record category child entry
 *
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainerChildProperties.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainerChildProperties.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -61,15 +61,16 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo

 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.rest.rm.community.model.common.Owner;
+import org.alfresco.utility.model.TestModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.rest.rm.community.model.common.Owner;
-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for record category child properties
 *
@@ -82,112 +83,112 @@ import org.alfresco.utility.model.TestModel;
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonIgnoreProperties (ignoreUnknown = true)
 public class UnfiledContainerChildProperties extends TestModel
 {
    /**************************************************************************/
    /** Mandatory parameters - Shared by unfiled record folder and records */
    /**************************************************************************/
-    @JsonProperty(required = true, value = PROPERTIES_TITLE)
+    @JsonProperty (required = true, value = PROPERTIES_TITLE)
    private String title;

-    @JsonProperty(required = true, value = PROPERTIES_ROOT_NODE_REF)
+    @JsonProperty (required = true, value = PROPERTIES_ROOT_NODE_REF)
    private String rootNodeRef;

-    @JsonProperty(required = true, value = PROPERTIES_IDENTIFIER)
+    @JsonProperty (required = true, value = PROPERTIES_IDENTIFIER)
    private String identifier;

-    @JsonProperty(required = true, value = PROPERTIES_DESCRIPTION)
+    @JsonProperty (required = true, value = PROPERTIES_DESCRIPTION)
    private String description;

-    @JsonProperty(value = PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE)
+    @JsonProperty (value = PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE)
    private Boolean recordSearchHasDispositionSchedule;

    /*********************************/
    /** Electronic record parameters */
    /*********************************/
-    @JsonProperty(PROPERTIES_VERSION_TYPE)
+    @JsonProperty (PROPERTIES_VERSION_TYPE)
    private String versionType;

-    @JsonProperty(PROPERTIES_VERSION_LABEL)
+    @JsonProperty (PROPERTIES_VERSION_LABEL)
    private String versionLabel;

    @JsonProperty(PROPERTIES_VERSIONED_NODEREF)
    private String versionedNodeRef;

-    @JsonProperty(PROPERTIES_RMV_VERSIONED)
+    @JsonProperty (PROPERTIES_RMV_VERSIONED)
    private String recordVersionLabel;

-    @JsonProperty(PROPERTIES_DATE_TIME_ORIGINAL)
+    @JsonProperty (PROPERTIES_DATE_TIME_ORIGINAL)
    private String dateTimeOriginal;

-    @JsonProperty(PROPERTIES_EXPOSURE_TIME)
+    @JsonProperty (PROPERTIES_EXPOSURE_TIME)
    private Double exposureTime;

-    @JsonProperty(PROPERTIES_FLASH)
+    @JsonProperty (PROPERTIES_FLASH)
    private Boolean flash;

-    @JsonProperty(PROPERTIES_F_NUMBER)
+    @JsonProperty (PROPERTIES_F_NUMBER)
    private Double fNumber;

-    @JsonProperty(PROPERTIES_FOCAL_LENGTH)
+    @JsonProperty (PROPERTIES_FOCAL_LENGTH)
    private Double focalLength;

-    @JsonProperty(PROPERTIES_ISO_SPEED_RATINGS)
+    @JsonProperty (PROPERTIES_ISO_SPEED_RATINGS)
    private Integer isoSpeedRatings;

-    @JsonProperty(PROPERTIES_MANUFACTURER)
+    @JsonProperty (PROPERTIES_MANUFACTURER)
    private String manufacturer;

-    @JsonProperty(PROPERTIES_MODEL)
+    @JsonProperty (PROPERTIES_MODEL)
    private String model;

-    @JsonProperty(PROPERTIES_ORIENTATION)
+    @JsonProperty (PROPERTIES_ORIENTATION)
    private Integer orientation;

-    @JsonProperty(PROPERTIES_PIXEL_X_DIMENSION)
+    @JsonProperty (PROPERTIES_PIXEL_X_DIMENSION)
    private Integer pixelXDimension;

-    @JsonProperty(PROPERTIES_PIXEL_Y_DIMENSION)
+    @JsonProperty (PROPERTIES_PIXEL_Y_DIMENSION)
    private Integer pixelYDimension;

-    @JsonProperty(PROPERTIES_RESOLUTION_UNIT)
+    @JsonProperty (PROPERTIES_RESOLUTION_UNIT)
    private String resolutionUnit;

-    @JsonProperty(PROPERTIES_SOFTWARE)
+    @JsonProperty (PROPERTIES_SOFTWARE)
    private String software;

-    @JsonProperty(PROPERTIES_X_RESOLUTION)
+    @JsonProperty (PROPERTIES_X_RESOLUTION)
    private Double xResolution;

-    @JsonProperty(PROPERTIES_Y_RESOLUTION)
+    @JsonProperty (PROPERTIES_Y_RESOLUTION)
    private Double yResolution;

-    @JsonProperty(PROPERTIES_ORIGINAL_NAME)
+    @JsonProperty (PROPERTIES_ORIGINAL_NAME)
    private String originalName;

    /*************************************/
    /** Non-electronic record parameters */
    /*************************************/

-    @JsonProperty(PROPERTIES_SHELF)
+    @JsonProperty (PROPERTIES_SHELF)
    private String shelf;

-    @JsonProperty(PROPERTIES_STORAGE_LOCATION)
+    @JsonProperty (PROPERTIES_STORAGE_LOCATION)
    private String storageLocation;

-    @JsonProperty(PROPERTIES_FILE)
+    @JsonProperty (PROPERTIES_FILE)
    private String file;

-    @JsonProperty(PROPERTIES_BOX)
+    @JsonProperty (PROPERTIES_BOX)
    private String box;

-    @JsonProperty(PROPERTIES_NUMBER_OF_COPIES)
+    @JsonProperty (PROPERTIES_NUMBER_OF_COPIES)
    private Integer numberOfCopies;

-    @JsonProperty(PROPERTIES_PHYSICAL_SIZE)
+    @JsonProperty (PROPERTIES_PHYSICAL_SIZE)
    private Integer physicalSize;

-    @JsonProperty(PROPERTIES_OWNER)
+    @JsonProperty (PROPERTIES_OWNER)
    private Owner owner;
 }
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainerProperties.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/unfiledcontainer/UnfiledContainerProperties.java
@@ -2,7 +2,7 @@
 * #%L
 * Alfresco Records Management Module
 * %%
- * Copyright (C) 2005 - 2025 Alfresco Software Limited
+ * Copyright (C) 2005 - 2024 Alfresco Software Limited
 * %%
 * This file is part of the Alfresco software.
 * -
@@ -31,14 +31,15 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo

 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.utility.model.TestModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

-import org.alfresco.utility.model.TestModel;
-
 /**
 * POJO for file plan properties
 *
@@ -50,15 +51,15 @@ import org.alfresco.utility.model.TestModel;
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
-@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonIgnoreProperties (ignoreUnknown = true)
 public class UnfiledContainerProperties extends TestModel
 {
    /*************************/
    /** Mandatory parameters */
    /*************************/
-    @JsonProperty(required = true, value = PROPERTIES_IDENTIFIER)
+    @JsonProperty (required = true, value = PROPERTIES_IDENTIFIER)
    private String identifier;

-    @JsonProperty(required = true, value = PROPERTIES_ROOT_NODE_REF)
+    @JsonProperty (required = true, value = PROPERTIES_ROOT_NODE_REF)
    private String rootNodeRef;
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
alfresco-build	d77fede9d2	[maven-release-plugin][skip ci] prepare release 16.21	2024-05-20 08:39:05 +00:00
Kacper Magdziarz	b82cf7fa49	[ACS-7896] Bump AIS/ATS 5.1.2/4.1.2 (#2639 )	2024-05-20 10:17:02 +02:00
alfresco-build	e8b4d0b5ff	[maven-release-plugin][skip ci] prepare for next development iteration	2024-05-16 09:59:54 +00:00
alfresco-build	e14cb0b314	[maven-release-plugin][skip ci] prepare release 16.20	2024-05-16 09:59:52 +00:00
Domenico Sibilio	abe5a72481	ACS-7884 Bump cxf to 3.6.3 (#2649 )	2024-05-16 11:37:26 +02:00
alfresco-build	10721c9921	[maven-release-plugin][skip ci] prepare for next development iteration	2024-05-16 05:23:45 +00:00
alfresco-build	5451bf7144	[maven-release-plugin][skip ci] prepare release 16.19	2024-05-16 05:23:43 +00:00
rrajoria	8887639abe	Update GoogleDrive version	2024-05-16 10:29:47 +05:30
alfresco-build	94b80c057e	[maven-release-plugin][skip ci] prepare for next development iteration	2024-05-15 12:31:57 +00:00
alfresco-build	d9e7007b0a	[maven-release-plugin][skip ci] prepare release 16.18	2024-05-15 12:31:55 +00:00
Sara	ed026d08ad	Merge pull request #2644 from Alfresco/feature/ACS-7886_Prepare_For_ACS_7-2-2_SP Feature/acs 7886 Prepare for ACS 7.2.2 Service Pack	2024-05-15 13:08:39 +01:00
Domenico Sibilio	bd2cc5497b	ACS-7744 Bump Keycloak to 24.0.3 (#2620 )	2024-05-14 08:30:20 +01:00
Domenico Sibilio	5a7116e9ef	ACS-7567 Test with Keycloak 24.0.2 (#2599 )	2024-05-14 08:30:12 +01:00
Tiago Salvado	8c7c8a69b4	[MNT-24072] Retain users/groups (who are already exist and are part of AUTH.ALF zone) so parent associations can be created (#2414 ) (#2583 ) * [MNT-24072] Retain existent users and groups so parent associations can be created * [MNT-24072] Using person/authority 'exists' methods instead * [MNT-24072] Added code to rezone users/groups (who already exist and are part of AUTH.ALF zone) that have parent associations to create * [MNT-24072] PMD scan changes * [MNT-24072] Added a validation to prevent an authority from being added to zones where already is (cherry picked from commit `71b69529c6`)	2024-05-14 08:30:05 +01:00
Eva Vasques	427183d31c	Update license headers (#2506 )	2024-05-14 08:29:46 +01:00
Domenico Sibilio	5f38888559	ACS-6192 Bump org.json:json to 20231013 (#2316 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-14 08:29:07 +01:00
Domenico Sibilio	c35e94ba74	MNT-24063 Bump ActiveMQ to 5.16.7 (#2308 )	2024-05-14 08:28:00 +01:00
evasques	165de60f00	[MNT-23550] Always disable behaviours to prevent unexpected modifier … (#2077 ) * [MNT-23550] Always disable behaviours to prevent unexpected modifier changes (#1898) (cherry picked from commit `f83328f7b0`) * Apply AlphabeticalPriorityInterceptor to RM Automation tests --------- Co-authored-by: tiagosalvado10 <9038083+tiagosalvado10@users.noreply.github.com>	2024-05-14 08:27:52 +01:00
Jared Ottley	7e179d0e5c	[MNT-23553] REST API call fails when using Oracle database - Remove semicolon from sql	2024-05-14 08:27:37 +01:00
tiagosalvado10	7f7444813e	[MNT-23424] Clean Rhino scope only for custom scripts (#1696 )	2024-05-14 08:26:18 +01:00
Antonio Felix	0dba988ff7	Fix/mnt 23290 slow group membership (#1637 ) (#1644 ) * MNT-23290 - Change query to get the root groups (cherry picked from commit `d785b100df`)	2024-05-14 08:25:58 +01:00
evasques	b002cbabc4	MNT-23204: Group Search (#1558 ) (#1587 ) (cherry picked from commit `93a7790d44`) Co-authored-by: rrajoria <88024787+rrajoria@users.noreply.github.com>	2024-05-14 08:25:51 +01:00
tiagosalvado10	7fb09e2b18	[MNT-23158] Scripts limits configuration and optimization (#1519 ) (#1551 ) (cherry picked from commit `f391cfa38c`)	2024-05-14 08:25:34 +01:00
evasques	6a9ab0f089	Revert "ACS-1600 : Error when running propTablesCleanupJob on an env with 100 million records in alf_prop_value (#473 )" (#1358 ) (#1512 ) This reverts commit `00b0b21668`. (cherry picked from commit `b8ac41ac0d`)	2024-05-14 08:25:17 +01:00
evasques	3fecdc75bd	MNT-23174 - RM upgrade from 3.4.1.1 to 11.153 fails (#1434 ) (#1450 ) * Added batching capability to process records in hold * Changed the retrieval of child assocs witout preload to not fill up the caches when we have very big holds * Added property rm.patch.v35.holdNewChildAssocPatch.batchSize to be able to configure the batchSize * Adapt mocks on unit test to the new calls (cherry picked from commit `a512c3443c`) * ACS-3578 Ignoring tests that suddenly started failing. (cherry picked from commit `2c43a64fd0`) Co-authored-by: Tom Page <thomas.page@alfresco.com>	2024-05-14 08:21:35 +01:00
tiagosalvado10	4373aa8f97	[MNT-23379] Set site manager permission if node belongs to a site and inheritance flag is disabled (#1657 ) (#1667 ) * [MNT-23379] Set site manager permission if node belongs to a site and inheritance flag is disabled (#1657) * [MNT-23379] Set site manager permission if node belongs to a site and inheritance flag is disabled * [MNT-23379] Added validation. Added throwable object to error logging. * [MNT-23379] Added unit test * [MNT-23379] Changed 'runAs' call to 'runAsSystem' with lambda (cherry picked from commit `88a0854548`) * [MNT-23379] Added sleep between document creation and update to prevent test failures (#1668) (cherry picked from commit `4749166080`)	2024-05-14 07:36:53 +01:00
alfresco-build	b2239eac6f	[maven-release-plugin][skip ci] prepare for next development iteration	2024-05-08 19:50:21 +00:00
alfresco-build	ca44e805f2	[maven-release-plugin][skip ci] prepare release 16.17	2024-05-08 19:50:18 +00:00
Kacper Magdziarz	705861084a	[ACS-7715] Backward compatibility testing of Search and Insight Engine 2.0.10 with ACS 7.2.X (#2625 )	2024-05-08 21:22:11 +02:00
alfresco-build	7a303cef49	[maven-release-plugin][skip ci] prepare for next development iteration	2024-04-26 15:14:35 +00:00
alfresco-build	f7b864d35f	[maven-release-plugin][skip ci] prepare release 16.16	2024-04-26 15:14:33 +00:00
Eva Vasques	e61991bc7d	MNT-24321 Transfer Service Exception Handling (#2573 ) (#2610 ) * Mark method deserialize in ExceptionJsonSerializer as deprecated * Remove usage of jsonErrorSerializer (cherry picked from commit `c31158a113`)	2024-04-26 15:05:54 +01:00
alfresco-build	9a9665fb98	[maven-release-plugin][skip ci] prepare for next development iteration	2024-04-22 13:46:03 +00:00
alfresco-build	8a405f7ba3	[maven-release-plugin][skip ci] prepare release 16.15	2024-04-22 13:46:00 +00:00
Eva Vasques	e02722af37	Migrate to GHA and Update License Headers (#2603 ) * ACS-4653 Migrate to GHA on release/7.2.1 (#1758) * Remove travis configuration files * Added property dependency.alfresco-transform-core.version * Added github action configuration for 7.2.1 * Add missing scripts and adjust start-compose.sh * Give execution permissions to scripts * ACS-3841 Add missing logs for WebDAV TAS tests (#1629) * ACS-3841 Add missing logs * ACS-3841 Reformat code + fix grep (cherry picked from commit `cdbe3292e0`) * Move ags ci getLogs script. Update badge on readme (cherry picked from commit `309f6baae3`) * ACS-4653 GHA - Fix mySQL tests (#1765) * Added missing mysql params for older version. Test [db] (cherry picked from commit `7a504a0292`) * Fix readme - status for 7.2.N * Update license headers * ACS-4776 Finalize deprecation of BitlyUrlShortenerImpl (#1787) (cherry picked from commit `906a812ea5`) --------- Co-authored-by: Domenico Sibilio <domenicosibilio@gmail.com>	2024-04-22 13:48:59 +01:00
Travis CI User	3d1f95bcc8	[maven-release-plugin][skip ci] prepare for next development iteration	2022-11-18 18:40:12 +00:00
Travis CI User	868bf5db7e	[maven-release-plugin][skip ci] prepare release 16.14	2022-11-18 18:40:09 +00:00
Antonio Felix	e4c2bc7740	MNT-23330 - Downloading a document replaces filename having space with + character (#1327 ) (#1567 ) (cherry picked from commit `3aac7be11c`)	2022-11-18 17:57:32 +00:00
Travis CI User	3d651b97b6	[maven-release-plugin][skip ci] prepare for next development iteration	2022-11-09 14:47:28 +00:00
Travis CI User	9ee0f4a234	[maven-release-plugin][skip ci] prepare release 16.13	2022-11-09 14:47:25 +00:00
Antonio Felix	8f8743f4b5	MNT-23276 - The null facet name should be considered (#1540 ) (#1543 ) (cherry picked from commit `295a8f7ba2`)	2022-11-09 14:05:38 +00:00
Travis CI User	d9489cedc4	[maven-release-plugin][skip ci] prepare for next development iteration	2022-11-07 17:56:00 +00:00
Travis CI User	c4e4c43668	[maven-release-plugin][skip ci] prepare release 16.12	2022-11-07 17:55:57 +00:00
Antonio Felix	b0fa6b3736	MNT-23276 - Protect from null facet names (#1536 ) * MNT-23276 - Protect from null facet names	2022-11-07 17:05:40 +00:00
Travis CI User	4d801ed962	[maven-release-plugin][skip ci] prepare for next development iteration	2022-08-22 10:48:59 +00:00
Travis CI User	138947af7f	[maven-release-plugin][skip ci] prepare release 16.11	2022-08-22 10:48:57 +00:00
mikolajbrzezinski	2ba28bae10	ACS-3316 Fix custom models downloading and XSS (#1304 ) (#1319 ) * Revert "Revert "ACS-3316 Fix HTML sanitisation bypass (#1266)" (#1294)" This reverts commit `6c407b1ef5`. * ACS-3316 Set node name for download node * ACS-3316 Update license Co-authored-by: Damian.Ujma@hyland.com <Damian.Ujma@hyland.com> (cherry picked from commit `cc3f8aaff4`)	2022-08-22 12:07:39 +02:00
Travis CI User	9ebcd0193a	[maven-release-plugin][skip ci] prepare for next development iteration	2022-07-26 09:23:57 +00:00
Travis CI User	afbf52413f	[maven-release-plugin][skip ci] prepare release 16.10	2022-07-26 09:23:55 +00:00
mstrankowski	ad67088017	Upping version to 16.10-SNAPSHOT, to avoid collision with already existing tag	2022-07-26 10:41:38 +02:00
mstrankowski	4c29d23ac0	Retrigger build for: Update ServicePack branch to 7.2.2 with empty commit	2022-07-25 22:20:12 +02:00
mstrankowski	ed8b18c576	Update ServicePack branch to 7.2.2	2022-07-25 20:55:41 +02:00
Travis CI User	c9b49789c7	[maven-release-plugin][skip ci] prepare for next development iteration	2022-07-21 00:05:09 +00:00
Travis CI User	d28d4873be	[maven-release-plugin][skip ci] prepare release 15.9	2022-07-21 00:05:06 +00:00
Jared Ottley	44d7c2328c	[ACS-3320] REST API Explorer 7.2.1 final release	2022-07-20 15:56:56 -06:00
Travis CI User	073338afa7	[maven-release-plugin][skip ci] prepare for next development iteration	2022-07-14 19:50:50 +00:00
Travis CI User	3e53467ac8	[maven-release-plugin][skip ci] prepare release 15.8	2022-07-14 19:50:48 +00:00
pzurek	0d5ffdac2e	Merge branch 'release/7.2.N' of github.com:Alfresco/alfresco-community-repo into release/7.2.N	2022-07-14 21:07:07 +02:00
pzurek	ac03eb7642	Revert "Revert "PRODSEC-6115: Bump Surf webscript Version to 8.31 and removing set exception (#1207 )"" This reverts commit `3304a62a35`.	2022-07-14 21:06:36 +02:00
Travis CI User	2ff5b7dd0a	[maven-release-plugin][skip ci] prepare for next development iteration	2022-07-14 17:04:48 +00:00
Travis CI User	b0d7e6dfba	[maven-release-plugin][skip ci] prepare release 15.7	2022-07-14 17:04:46 +00:00
pzurek	3304a62a35	Revert "PRODSEC-6115: Bump Surf webscript Version to 8.31 and removing set exception (#1207 )" This reverts commit `f48db84334`.	2022-07-14 18:20:46 +02:00
Travis CI User	763591c1a3	[maven-release-plugin][skip ci] prepare for next development iteration	2022-07-14 11:24:55 +00:00
Travis CI User	6de5a507fe	[maven-release-plugin][skip ci] prepare release 15.6	2022-07-14 11:24:53 +00:00
Damian Ujma	3990bc9db4	ACS-3271 Update MySQL 5.7.23 tests to 5.7.28 version (#1209 ) * PRODSEC-6261 Add 'shouldNotGetProcessesByNotInvolvedUser' test * PRODSEC-6261 Add user validation to 'getProcess' method * PRODSEC-6261 Add TestRail annotation minor fix * Update MySQL 5.7.23 tests to MySQL 7.7.28	2022-07-14 12:43:46 +02:00
Damian Ujma	f2207fe43e	ACS-3150 Upgrade jackson and gson libraries - Backporting (#1211 ) * PRODSEC-6261 Add 'shouldNotGetProcessesByNotInvolvedUser' test * PRODSEC-6261 Add user validation to 'getProcess' method * PRODSEC-6261 Add TestRail annotation minor fix * ACS-3150 Upgrade jackson and gson libraries (#1151) (cherry picked from commit `f1a3aa696e`) Co-authored-by: Piotr Żurek <Piotr.Zurek@hyland.com>	2022-07-13 15:23:30 +02:00
rrajoria	f48db84334	PRODSEC-6115: Bump Surf webscript Version to 8.31 and removing set exception (#1207 ) * PRODSEC-6115: Bump Surf webscript Version to 8.31 * Update NodeBrowserScript.java	2022-07-12 17:20:22 +05:30
Damian Ujma	98d73b7200	PRODSEC-6261 Fix workflow api bola - Backporting (#1206 ) * PRODSEC-6261 Add 'shouldNotGetProcessesByNotInvolvedUser' test * PRODSEC-6261 Add user validation to 'getProcess' method * PRODSEC-6261 Add TestRail annotation minor fix	2022-07-12 13:12:15 +02:00
Travis CI User	acd4b1efcb	[maven-release-plugin][skip ci] prepare for next development iteration	2022-05-18 09:14:26 +00:00
Travis CI User	4433dd009a	[maven-release-plugin][skip ci] prepare release 15.5	2022-05-18 09:14:23 +00:00
mikolajbrzezinski	d1a9794ec8	MTN-22905 Fix case sensitivity issues on people search MTN-22905 Fix case sensitivity issues on people search backport * useCQ = true * useCQ back to original * useCQ = true * Copyright Update * useCQ restored, Javascrpit changed * Javascript changes to filter * PR comments requested change * Revert "PR comments requested change" This reverts commit `0673b6c3ff`. * Revert "useCQ restored, Javascrpit changed" This reverts commit `00b79b5aca`. * Revert "Copyright Update" This reverts commit `76d1f1c005`. * Revert "useCQ = true" This reverts commit `215ad952f5`. * Revert "useCQ back to original" This reverts commit `deb5e82218`. * Revert "useCQ = true" This reverts commit `115910ffc1`. * test change * Initial changes * Further changes * Space deleted * jobtitle search * Restore check sorting and mock * Avoid null [hint:useCQ] * Wrong sign * Fix * Clean up * Initial changes * Rename Method (cherry picked from commit `1ccb8a2164`)	2022-05-18 10:27:53 +02:00
alandavis	bf848ff882	Revert "ACS-2864 Use maven props in AGS test version.properties so we don't have to update the value" And correct the value to 2.7.1 This reverts commit `69ebccfc20`.	2022-05-09 17:13:19 +01:00
alandavis	69ebccfc20	ACS-2864 Use maven props in AGS test version.properties so we don't have to update the value (cherry picked from commit `4a4bb2de02`) (cherry picked from commit `b36e21ad04`)	2022-05-09 16:24:02 +01:00
Travis CI User	600b50fce1	[maven-release-plugin][skip ci] prepare for next development iteration	2022-05-03 10:25:04 +00:00
Travis CI User	37e8586658	[maven-release-plugin][skip ci] prepare release 15.4	2022-05-03 10:25:01 +00:00
evasques	4b12ed5a51	MNT-22968 - Bump Freemarker (#1094 )	2022-05-03 08:41:14 +01:00
Travis CI User	e379b7704d	[maven-release-plugin][skip ci] prepare for next development iteration	2022-04-07 16:28:45 +00:00
Travis CI User	297be122a6	[maven-release-plugin][skip ci] prepare release 15.3	2022-04-07 16:28:42 +00:00
Vítor Moreira	ca28024ad8	Fix/mnt 22946 spring rce databind jdk9 72 n (#1055 ) * Bump dependency.webscripts.version from 8.28 to 8.29 (#1052) (cherry picked from commit `22a0343c41`) * MNT-22946: bump spring version to 5.3.18 (#1054) (cherry picked from commit `53777cd5b9`) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-04-07 16:40:27 +01:00
Travis CI User	cfd3255aa7	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-21 18:14:39 +00:00
Travis CI User	4e436160cc	[maven-release-plugin][skip ci] prepare release 15.2	2022-03-21 18:14:36 +00:00
alandavis	bf0ca4ca83	Set acs.version.revision versions 7.2.1	2022-03-21 17:09:20 +00:00
Travis CI User	e23a97960f	[maven-release-plugin][skip ci] prepare for next development iteration	2022-03-21 11:23:53 +00:00
Travis CI User	2d2371a792	[maven-release-plugin][skip ci] prepare release 15.1	2022-03-21 11:23:50 +00:00
alandavis	0ea69dd4ef	Create release/7.2.N branch	2022-03-21 10:11:14 +00:00