[APPS-3242] Fix for facet field aggregation

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/ci.yml

@@ -44,14 +44,14 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - id: changed-files
-        uses: Alfresco/alfresco-build-tools/.github/actions/github-list-changes@v8.2.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/github-list-changes@v8.13.0
         with:
           write-list-to-env: true
-      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v8.2.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v8.13.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Prepare maven cache and check compilation"
@@ -69,12 +69,12 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v8.13.0
         continue-on-error: true
         with:
           srcclr-api-token: ${{ secrets.SRCCLR_API_TOKEN }}
@@ -92,10 +92,10 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/github-download-file@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/github-download-file@v8.13.0
         with:
           token: ${{ secrets.BOT_GITHUB_TOKEN }}
           repository: "Alfresco/veracode-baseline-archive"
@@ -106,12 +106,16 @@ jobs:
         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: "packaging/war/target/alfresco.war"
+          file: "temp-dir-for-sast/reduced.war"
           fail_build: true
           project_name: alfresco-community-repo
           issue_details: true
@@ -129,6 +133,8 @@ jobs:
         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
 
@@ -142,9 +148,9 @@ jobs:
       !contains(github.event.head_commit.message, '[skip tests]') &&
       !contains(github.event.head_commit.message, '[force]')
     steps:
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - uses: Alfresco/ya-pmd-scan@v4.1.0
         with:
           classpath-build-command: "mvn test-compile -ntp -Pags -pl \"-:alfresco-community-repo-docker\""
@@ -175,14 +181,14 @@ jobs:
             testAttributes: "-Dtest=AllMmtUnitTestSuite"
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.13.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testModule }}
@@ -213,7 +219,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.13.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -255,9 +261,9 @@ jobs:
       REQUIRES_INSTALLED_ARTIFACTS: true
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -270,7 +276,7 @@ jobs:
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.13.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }}
@@ -301,7 +307,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.13.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -331,12 +337,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ['10.2.18', '10.4', '10.5']
+        version: ['10.5', '10.6']
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: Run MariaDB ${{ matrix.version }} database
@@ -345,7 +351,7 @@ jobs:
           MARIADB_VERSION: ${{ matrix.version }}
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.13.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.version }}
@@ -376,7 +382,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.13.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -392,8 +398,8 @@ jobs:
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
 
-  repository_mariadb_10_6_tests:
-    name: "Repository - MariaDB 10.6 tests"
+  repository_mariadb_10_11_tests:
+    name: "Repository - MariaDB 10.11 tests"
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
@@ -405,18 +411,18 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - name: "Run MariaDB 10.6 database"
+      - name: "Run MariaDB 10.11 database"
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d
         env:
-          MARIADB_VERSION: 10.6
+          MARIADB_VERSION: 10.11
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.13.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -447,7 +453,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.13.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -476,9 +482,9 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run MySQL 8 database"
@@ -487,7 +493,7 @@ jobs:
           MYSQL_VERSION: 8
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.13.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -509,7 +515,7 @@ jobs:
           RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }}
         run: |
           eval "args=($RP_OPTS)"
-          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 "${args[@]}"
+          mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.cj.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}"
         continue-on-error: true
       - name: "Update GitHub Step Summary"
         if: github.ref_name == 'master'
@@ -518,7 +524,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.13.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -534,8 +540,8 @@ jobs:
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
 
-  repository_postgresql_13_12_tests:
-    name: "Repository - PostgreSQL 13.12 tests"
+  repository_postgresql_14_15_tests:
+    name: "Repository - PostgreSQL 14.15 tests"
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
@@ -546,18 +552,18 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - name: "Run PostgreSQL 13.12 database"
+      - name: "Run PostgreSQL 14.15 database"
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
         env:
-          POSTGRES_VERSION: 13.12
+          POSTGRES_VERSION: 14.15
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.13.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -588,7 +594,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.13.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -604,8 +610,8 @@ jobs:
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
 
-  repository_postgresql_14_9_tests:
-    name: "Repository - PostgreSQL 14.9 tests"
+  repository_postgresql_15_10_tests:
+    name: "Repository - PostgreSQL 15.10 tests"
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
@@ -616,18 +622,18 @@ jobs:
             !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - name: "Run PostgreSQL 14.9 database"
+      - 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: 14.9
+          POSTGRES_VERSION: 15.10
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.13.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -658,7 +664,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.13.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -674,8 +680,8 @@ jobs:
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
 
-  repository_postgresql_15_4_tests:
-    name: "Repository - PostgreSQL 15.4 tests"
+  repository_postgresql_16_6_tests:
+    name: "Repository - PostgreSQL 16.6 tests"
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
@@ -686,18 +692,18 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - name: "Run PostgreSQL 15.4 database"
+      - name: "Run PostgreSQL 16.6 database"
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
         env:
-          POSTGRES_VERSION: 15.4
+          POSTGRES_VERSION: 16.6
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.13.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -728,7 +734,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.13.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -754,16 +760,16 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run ActiveMQ"
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile activemq up -d
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.13.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -794,7 +800,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.13.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -854,9 +860,9 @@ jobs:
             mvn-options: '-Dencryption.ssl.keystore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.keystore -Dencryption.ssl.truststore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.truststore'
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Set transformers tag"
@@ -879,7 +885,7 @@ jobs:
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.13.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }} ${{ matrix.idp }}
@@ -910,7 +916,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.13.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -968,9 +974,9 @@ jobs:
       REQUIRES_LOCAL_IMAGES: true
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -986,7 +992,7 @@ jobs:
         run: mvn install -pl :alfresco-community-repo-integration-test -am -DskipTests -Pall-tas-tests
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.13.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.test-name }}
@@ -1024,7 +1030,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.13.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.tests.outcome }}
@@ -1050,16 +1056,16 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - name: "Run Postgres 15.4 database"
+      - name: "Run Postgres 16.6 database"
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.13.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -1090,7 +1096,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.13.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -1124,9 +1130,9 @@ jobs:
       REQUIRES_INSTALLED_ARTIFACTS: true
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -1134,7 +1140,7 @@ jobs:
           bash ./scripts/ci/build.sh
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.13.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (PostgreSQL) ${{ matrix.test-name }}
@@ -1170,9 +1176,9 @@ jobs:
       REQUIRES_INSTALLED_ARTIFACTS: true
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -1180,7 +1186,7 @@ jobs:
           bash ./scripts/ci/build.sh
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.13.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (MySQL) ${{ matrix.test-name }}
@@ -1212,9 +1218,9 @@ jobs:
       REQUIRES_LOCAL_IMAGES: true
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -1228,7 +1234,7 @@ jobs:
           mvn -B install -pl :alfresco-governance-services-automation-community-rest-api -am -Pags -Pall-tas-tests -DskipTests
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.13.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -1260,7 +1266,7 @@ jobs:
         continue-on-error: true
       - name: "Summarize Report Portal"
         if: github.ref_name == 'master'
-        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.13.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -1302,9 +1308,9 @@ jobs:
       !contains(github.event.head_commit.message, '[force]')
     steps:
       - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |

.github/workflows/master_release.yml

@@ -34,12 +34,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.13.0
         with:
           username: ${{ env.GIT_USERNAME }}
           email: ${{ env.GIT_EMAIL }}
@@ -63,12 +63,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.1.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.13.0
         with:
           username: ${{ env.GIT_USERNAME }}
           email: ${{ env.GIT_EMAIL }}

.secrets.baseline

@@ -133,21 +133,21 @@
         "filename": ".github/workflows/ci.yml",
         "hashed_secret": "b86dc2f033a63f2b7b9e7d270ab806d2910d7572",
         "is_verified": false,
-        "line_number": 293
+        "line_number": 299
       },
       {
         "type": "Secret Keyword",
         "filename": ".github/workflows/ci.yml",
         "hashed_secret": "1bfb0e20f886150ba59b853bcd49dea893e00966",
         "is_verified": false,
-        "line_number": 368
+        "line_number": 374
       },
       {
         "type": "Secret Keyword",
         "filename": ".github/workflows/ci.yml",
         "hashed_secret": "128f14373ccfaff49e3664045d3a11b50cbb7b39",
         "is_verified": false,
-        "line_number": 902
+        "line_number": 908
       }
     ],
     ".github/workflows/master_release.yml": [
@@ -1377,7 +1377,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 118,
+        "line_number": 116,
         "is_secret": false
       }
     ],
@@ -1431,26 +1431,6 @@
         "is_secret": false
       }
     ],
-    "repository/src/test/java/org/alfresco/repo/lock/LockBehaviourImplTest.java": [
-      {
-        "type": "Secret Keyword",
-        "filename": "repository/src/test/java/org/alfresco/repo/lock/LockBehaviourImplTest.java",
-        "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
-        "is_verified": false,
-        "line_number": 112,
-        "is_secret": false
-      }
-    ],
-    "repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java": [
-      {
-        "type": "Secret Keyword",
-        "filename": "repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java",
-        "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
-        "is_verified": false,
-        "line_number": 103,
-        "is_secret": false
-      }
-    ],
     "repository/src/test/java/org/alfresco/repo/management/JmxDumpUtilTest.java": [
       {
         "type": "Secret Keyword",
@@ -1888,5 +1868,5 @@
       }
     ]
   },
-  "generated_at": "2024-10-09T09:32:52Z"
+  "generated_at": "2025-02-26T15:13:52Z"
 }

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>23.5.0.1</version>
+      <version>25.1.0.68-SNAPSHOT</version>
    </parent>
 
    <modules>

amps/ags/rm-automation/pom.xml

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

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

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>23.5.0.1</version>
+      <version>25.1.0.68-SNAPSHOT</version>
    </parent>
 
    <build>

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/rules/RuleDefinition.java

@@ -200,4 +200,3 @@ public class RuleDefinition
         return this;
     }
 }
-

amps/ags/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/FilesAPI.java

@@ -71,4 +71,3 @@ public class FilesAPI extends RMModelRequest<FilesAPI>
         ));
     }
 }
-

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

@@ -117,4 +117,3 @@ public class RecordCategoryAuditLogTest extends BaseRMRestTest {
         auditLog.clearAuditLog(getAdminUser().getUsername(), getAdminUser().getPassword());
     }
 }
-

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

@@ -144,5 +144,3 @@ public class CreateElectronicRecordsTests extends BaseRMRestTest {
     }
 
     }
-
-

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

@@ -234,4 +234,3 @@ public class MoveToRuleOnFoldersTest extends BaseRMRestTest{
         assertStatusCode(OK);
     }
 }
-

amps/ags/rm-community/pom.xml

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

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

@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.13
-POSTGRES_TAG=15.4
+SOLR6_TAG=2.0.15-A.1
+POSTGRES_TAG=16.6
 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmevent/rmevent.lib.ftl

@@ -35,4 +35,3 @@
 }
 </#escape>
 </#macro>
-

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/fileplanreport.get.js

@@ -219,4 +219,3 @@ function getRecordFolder(recordFolder, parentPath)
 
 // Start webscript
 main();
-

amps/ags/rm-community/rm-community-repo/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>23.5.0.1</version>
+      <version>25.1.0.68-SNAPSHOT</version>
    </parent>
 
    <properties>
@@ -427,7 +427,7 @@
                   <configuration>
                      <images>
                         <image>
-                           <name>postgres:15.4</name>
+                           <name>postgres:16.6</name>
                            <run>
                               <ports>
                                  <port>${postgresql.tests.port}:${postgresql.port}</port>

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/NamePathDataExtractor.java

@@ -190,4 +190,3 @@ public final class NamePathDataExtractor extends AbstractDataExtractor
         return Objects.hash(nodeService, filePlanService, ruleService);
     }
 }
-

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/RecordsManagementBootstrap.java

@@ -120,4 +120,3 @@ public class RecordsManagementBootstrap extends AbstractLifecycleBean
         // NOOP
     }
 }
-

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bulk/BulkOperation.java

@@ -43,4 +43,3 @@ public record BulkOperation(Query searchQuery, String operationType) implements
         }
     }
 }
-

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/AssocPolicy.java

@@ -88,4 +88,3 @@ public class AssocPolicy extends AbstractBasePolicy
     }
 
 }
-

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

@@ -141,5 +141,3 @@ public class NotifyOfRecordsDueForReviewJobExecuter extends RecordsManagementJob
     }  // end of execute method
 
 }
-
-

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v23/RMv23SavedSearchesPatch.java

@@ -103,4 +103,3 @@ public class RMv23SavedSearchesPatch extends AbstractModulePatch
         }
     }
 }
-

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/PropertyValuesOfChildrenQueryParams.java

@@ -58,4 +58,3 @@ public class PropertyValuesOfChildrenQueryParams
     }
 
 }
-

amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/util/CustomLocalDateDeserializer.java

@@ -71,4 +71,3 @@ public class CustomLocalDateDeserializer extends StdDeserializer<LocalDate>
        return  LOCAL_DATE_OPTIONAL_TIME_PARSER.parseLocalDate(str);
     }
 }
-

amps/ags/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMCaveatConfigScriptTest.java

@@ -926,4 +926,3 @@ public class RMCaveatConfigScriptTest extends BaseRMWebScriptTestCase
         }
     }
 }
-

amps/ags/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMConstraintScriptTest.java

@@ -105,5 +105,3 @@ public class RMConstraintScriptTest extends BaseRMWebScriptTestCase
     }
 
 }
-
-

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

@@ -3,8 +3,8 @@
 #
 
 # Version label
-version.major=23
-version.minor=5
+version.major=25
+version.minor=1
 version.revision=0
 version.label=
 

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v32/RMv32HoldReportUpdatePatchUnitTest.java

@@ -96,5 +96,3 @@ public class RMv32HoldReportUpdatePatchUnitTest
         verify(mockedContentWriter, times(1)).putContent((InputStream) any());
     }
 }
-
-

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java

@@ -33,14 +33,15 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAO;
-import org.alfresco.repo.domain.propval.PropertyStringValueEntity;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
+import org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAO;
+import org.alfresco.repo.domain.propval.PropertyStringValueEntity;
+
 /**
  * RM V3.3 Hold audit entries values patch unit test
  *
@@ -55,7 +56,6 @@ public class RMv33HoldAuditEntryValuesPatchUnitTest
     @InjectMocks
     private RMv33HoldAuditEntryValuesPatch patch;
 
-
     @Before
     public void setUp()
     {
@@ -93,15 +93,15 @@ public class RMv33HoldAuditEntryValuesPatchUnitTest
         verify(mockedRecordsManagementQueryDAO, times(1)).updatePropertyStringValueEntity(deleteHoldPropertyStringValueEntity);
 
         assertEquals("Add To Hold", addToHoldPropertyStringValueEntity.getStringValue());
-        assertEquals("add to hold", addToHoldPropertyStringValueEntity.getStringLower());
+        assertEquals("add to hold", addToHoldPropertyStringValueEntity.getStringEndLower());
         assertEquals(Long.valueOf(770_786_109L), addToHoldPropertyStringValueEntity.getStringCrc());
 
         assertEquals("Remove From Hold", removeFromHoldPropertyStringValueEntity.getStringValue());
-        assertEquals("remove from hold", removeFromHoldPropertyStringValueEntity.getStringLower());
+        assertEquals("remove from hold", removeFromHoldPropertyStringValueEntity.getStringEndLower());
         assertEquals(Long.valueOf(2_967_613_012L), removeFromHoldPropertyStringValueEntity.getStringCrc());
 
         assertEquals("Delete Hold", deleteHoldPropertyStringValueEntity.getStringValue());
-        assertEquals("delete hold", deleteHoldPropertyStringValueEntity.getStringLower());
+        assertEquals("delete hold", deleteHoldPropertyStringValueEntity.getStringEndLower());
         assertEquals(Long.valueOf(132_640_810L), deleteHoldPropertyStringValueEntity.getStringCrc());
     }
 
@@ -123,5 +123,3 @@ public class RMv33HoldAuditEntryValuesPatchUnitTest
         verify(mockedRecordsManagementQueryDAO, times(0)).updatePropertyStringValueEntity(any());
     }
 }
-
-

amps/ags/rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/impl/RMYamlUnitTest.java

@@ -47,4 +47,3 @@ public class RMYamlUnitTest extends BaseYamlUnitTest
         validateYamlFiles(getYamlFilesList(RM_COMMUNITY_YAML_FILES_PATH));
     }
 }
-

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

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

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

@@ -3315,7 +3315,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       aspectNames:
         type: array
@@ -3346,7 +3346,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string
@@ -3396,7 +3396,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string
@@ -3429,7 +3429,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string
@@ -3484,7 +3484,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string
@@ -3549,7 +3549,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       properties:
         type: object
@@ -3578,7 +3578,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string
@@ -3637,7 +3637,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string
@@ -3702,7 +3702,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       properties:
         type: object
@@ -3729,7 +3729,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string
@@ -3779,7 +3779,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string
@@ -3881,7 +3881,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string
@@ -3967,7 +3967,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string
@@ -4027,7 +4027,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string
@@ -4076,7 +4076,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string
@@ -4141,7 +4141,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       properties:
         type: object
@@ -4166,7 +4166,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string
@@ -4223,7 +4223,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string
@@ -4830,7 +4830,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string
@@ -4852,7 +4852,7 @@ definitions:
         type: string
         pattern: "^(?!(.*[\\\"\\*\\\\\\>\\<\\?\\/\\:\\|]+.*)|(.*[\\.]?.*[\\.]+$)|(.*[ ]+$))"
         description: |
-          The name must not contain spaces or the following special characters: * " < > \ / ? : and |.
+          The name must not contain spaces or the following special characters: * " `<` `>` \ / ? : and |.
           The character . must not be used at the end of the name.
       nodeType:
         type: string

amps/pom.xml

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

amps/share-services/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>23.5.0.1</version>
+        <version>25.1.0.68-SNAPSHOT</version>
     </parent>
 
     <properties>

amps/share-services/src/main/resources/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/unlock-document.post.json.js

@@ -23,10 +23,6 @@ function runAction(p_params)
       if (p_params.destNode.hasAspect("cm:lockable") && !p_params.destNode.hasAspect("trx:transferred"))
       {
          p_params.destNode.unlock();
-         if(p_params.destNode.hasAspect("gd2:editingInGoogle"))
-         {
-             p_params.destNode.removeAspect("gd2:editingInGoogle");
-         }
       }
 
       var resultId = originalDoc.name,

core/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>23.5.0.1</version>
+      <version>25.1.0.68-SNAPSHOT</version>
    </parent>
 
    <dependencies>
@@ -145,6 +145,12 @@
          <groupId>org.apache.httpcomponents</groupId>
          <artifactId>httpclient</artifactId>
       </dependency>
+      <dependency>
+         <groupId>org.awaitility</groupId>
+         <artifactId>awaitility</artifactId>
+         <version>${dependency.awaitility.version}</version>
+         <scope>test</scope>
+      </dependency>
    </dependencies>
 
    <build>

core/src/main/java/org/alfresco/util/transaction/TransactionListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2024 Alfresco Software Limited.
+ * Copyright (C) 2005-2025 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *

core/src/test/java/AllCoreUnitTestSuite.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Alfresco Software Limited.
+ * Copyright (C) 2005-2025 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -18,6 +18,9 @@
  */
 package org.alfresco.util;
 
+import static org.awaitility.Awaitility.await;
+
+import java.time.Duration;
 import java.util.Map.Entry;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
@@ -26,11 +29,10 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import junit.framework.TestCase;
-
 /**
  * Tests for our instance of {@link java.util.concurrent.ThreadPoolExecutor}
  *
@@ -39,7 +41,8 @@ import junit.framework.TestCase;
 public class DynamicallySizedThreadPoolExecutorTest extends TestCase
 {
 
-    private static Log logger = LogFactory.getLog(DynamicallySizedThreadPoolExecutorTest.class);
+    private static final Duration MAX_WAIT_TIMEOUT = Duration.ofSeconds(1);
+    private static final Log logger = LogFactory.getLog(DynamicallySizedThreadPoolExecutorTest.class);
     private static final int DEFAULT_KEEP_ALIVE_TIME = 90;
 
     @Override
@@ -48,7 +51,7 @@ public class DynamicallySizedThreadPoolExecutorTest extends TestCase
         SleepUntilAllWake.reset();
     }
 
-    public void testUpToCore() throws Exception
+    public void testUpToCore()
     {
         DynamicallySizedThreadPoolExecutor exec = createInstance(5, 10, DEFAULT_KEEP_ALIVE_TIME);
 
@@ -63,11 +66,11 @@ public class DynamicallySizedThreadPoolExecutorTest extends TestCase
         assertEquals(5, exec.getPoolSize());
 
         SleepUntilAllWake.wakeAll();
-        Thread.sleep(100);
+        waitForPoolSizeEquals(exec, 5);
         assertEquals(5, exec.getPoolSize());
     }
 
-    public void testPastCoreButNotHugeQueue() throws Exception
+    public void testPastCoreButNotHugeQueue()
     {
         DynamicallySizedThreadPoolExecutor exec = createInstance(5, 10, DEFAULT_KEEP_ALIVE_TIME);
 
@@ -96,13 +99,13 @@ public class DynamicallySizedThreadPoolExecutorTest extends TestCase
         assertEquals(7, exec.getQueue().size());
 
         SleepUntilAllWake.wakeAll();
-        Thread.sleep(100);
+        waitForPoolSizeEquals(exec, 5);
         assertEquals(5, exec.getPoolSize());
     }
 
     public void testToExpandQueue() throws Exception
     {
-        DynamicallySizedThreadPoolExecutor exec = createInstance(2,4,1);
+        DynamicallySizedThreadPoolExecutor exec = createInstance(2, 4, 5);
 
         assertEquals(0, exec.getPoolSize());
         assertEquals(0, exec.getQueue().size());
@@ -119,13 +122,13 @@ public class DynamicallySizedThreadPoolExecutorTest extends TestCase
 
         // Next should add one
         exec.execute(new SleepUntilAllWake());
-        Thread.sleep(20); // Let the new thread spin up
+        waitForPoolSizeEquals(exec, 3); // Let the new thread spin up
         assertEquals(3, exec.getPoolSize());
         assertEquals(3, exec.getQueue().size());
 
         // And again
         exec.execute(new SleepUntilAllWake());
-        Thread.sleep(20); // Let the new thread spin up
+        waitForPoolSizeEquals(exec, 4); // Let the new thread spin up
         assertEquals(4, exec.getPoolSize());
         assertEquals(3, exec.getQueue().size());
 
@@ -139,139 +142,10 @@ public class DynamicallySizedThreadPoolExecutorTest extends TestCase
         SleepUntilAllWake.wakeAll();
         Thread.sleep(100);
 
-        // All threads still running, as 1 second timeout
+        // All threads still running, as 5 second timeout
         assertEquals(4, exec.getPoolSize());
     }
 
-    public void offTestToExpandThenContract() throws Exception
-    {
-        DynamicallySizedThreadPoolExecutor exec = createInstance(2,4,1);
-        exec.setKeepAliveTime(30, TimeUnit.MILLISECONDS);
-        
-        assertEquals(0, exec.getPoolSize());
-        assertEquals(0, exec.getQueue().size());
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        assertEquals(2, exec.getPoolSize());
-        assertEquals(0, exec.getQueue().size());
-        
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        assertEquals(2, exec.getPoolSize());
-        assertEquals(3, exec.getQueue().size());
-        
-        // Next should add one
-        exec.execute(new SleepUntilAllWake());
-        Thread.sleep(20); // Let the new thread spin up
-        assertEquals(3, exec.getPoolSize());
-        assertEquals(3, exec.getQueue().size());
-
-        // And again
-        exec.execute(new SleepUntilAllWake());
-        Thread.sleep(20); // Let the new thread spin up
-        assertEquals(4, exec.getPoolSize());
-        assertEquals(3, exec.getQueue().size());
-        
-        // But no more will be added, as we're at max
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        assertEquals(4, exec.getPoolSize());
-        assertEquals(6, exec.getQueue().size());
-        
-        SleepUntilAllWake.wakeAll();
-        Thread.sleep(100);
-        
-        // Wait longer than the timeout without any work, which should
-        //  let all the extra threads go away
-        // (Depending on how closely your JVM follows the specification,
-        //  we may fall back to the core size which is correct, or we
-        //  may go to zero which is wrong, but hey, it's the JVM...)
-        logger.debug("Core pool size is " + exec.getCorePoolSize());
-        logger.debug("Current pool size is " + exec.getPoolSize());
-        logger.debug("Queue size is " + exec.getQueue().size());
-        assertTrue(
-                "Pool size should be 0-2 as everything is idle, was " + exec.getPoolSize(),
-                exec.getPoolSize() >= 0
-        );
-        assertTrue(
-                "Pool size should be 0-2 as everything is idle, was " + exec.getPoolSize(),
-                exec.getPoolSize() <= 2
-        );
-        
-        SleepUntilAllWake.reset();
-        
-        // Add 2 new jobs, will stay/ go to at 2 threads
-        assertEquals(0, exec.getQueue().size());
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        
-        // Let the idle threads grab them, then check
-        Thread.sleep(20);
-        assertEquals(2, exec.getPoolSize());
-        assertEquals(0, exec.getQueue().size());
-        
-        // 3 more, still at 2 threads
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        assertEquals(2, exec.getPoolSize());
-        assertEquals(3, exec.getQueue().size());
-        
-        // And again wait for it all
-        SleepUntilAllWake.wakeAll();
-        Thread.sleep(100);
-        assertEquals(2, exec.getPoolSize());
-
-        
-        // Now decrease the overall pool size
-        // Will rise and fall to there now
-        exec.setCorePoolSize(1);
-        
-        // Run a quick job, to ensure that the
-        //  "can I kill one yet" logic is applied
-        SleepUntilAllWake.reset();
-        exec.execute(new SleepUntilAllWake());
-        SleepUntilAllWake.wakeAll();
-        
-        Thread.sleep(100);
-        assertEquals(1, exec.getPoolSize());
-        assertEquals(0, exec.getQueue().size());
-        
-        SleepUntilAllWake.reset();
-        
-        
-        // Push enough on to go up to 4 active threads
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        exec.execute(new SleepUntilAllWake());
-        
-        Thread.sleep(20); // Let the new threads spin up
-        assertEquals(4, exec.getPoolSize());
-        assertEquals(6, exec.getQueue().size());
-        
-        // Wait for them all to finish, should drop back to 1 now
-        // (Or zero, if your JVM can't read the specification...)
-        SleepUntilAllWake.wakeAll();
-        Thread.sleep(100);
-        assertTrue(
-                "Pool size should be 0 or 1 as everything is idle, was " + exec.getPoolSize(),
-                exec.getPoolSize() >= 0
-        );
-        assertTrue(
-                "Pool size should be 0 or 1 as everything is idle, was " + exec.getPoolSize(),
-                exec.getPoolSize() <= 1
-        );
-    }
-
     private DynamicallySizedThreadPoolExecutor createInstance(int corePoolSize, int maximumPoolSize, int keepAliveTime)
     {
         // We need a thread factory
@@ -291,6 +165,11 @@ public class DynamicallySizedThreadPoolExecutorTest extends TestCase
                 new ThreadPoolExecutor.CallerRunsPolicy());
     }
 
+    private void waitForPoolSizeEquals(DynamicallySizedThreadPoolExecutor exec, int expectedSize)
+    {
+        await().atMost(MAX_WAIT_TIMEOUT).until(() -> exec.getPoolSize() == expectedSize);
+    }
+
     public static class SleepUntilAllWake implements Runnable
     {
         private static ConcurrentMap<String, Thread> sleeping = new ConcurrentHashMap<String, Thread>();
@@ -299,7 +178,8 @@ public class DynamicallySizedThreadPoolExecutorTest extends TestCase
         @Override
         public void run()
         {
-            if(allAwake) return;
+            if (allAwake)
+                return;
 
             // Track us, and wait for the bang
             logger.debug("Adding thread: " + Thread.currentThread().getName());
@@ -324,6 +204,7 @@ public class DynamicallySizedThreadPoolExecutorTest extends TestCase
                 t.getValue().interrupt();
             }
         }
+
         public static void reset()
         {
             logger.debug("Resetting.");

core/src/test/java/org/alfresco/util/transaction/SpringAwareUserTransactionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2023 Alfresco Software Limited.
+ * Copyright (C) 2005-2025 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -20,13 +20,11 @@ package org.alfresco.util.transaction;
 
 import java.util.NoSuchElementException;
 import java.util.Objects;
-
 import jakarta.transaction.RollbackException;
 import jakarta.transaction.Status;
 import jakarta.transaction.UserTransaction;
 
 import junit.framework.TestCase;
-
 import org.springframework.transaction.CannotCreateTransactionException;
 import org.springframework.transaction.NoTransactionException;
 import org.springframework.transaction.TransactionDefinition;
@@ -35,9 +33,8 @@ import org.springframework.transaction.support.AbstractPlatformTransactionManage
 import org.springframework.transaction.support.DefaultTransactionStatus;
 
 /**
- * @see org.alfresco.util.transaction.SpringAwareUserTransaction
- * 
  * @author Derek Hulley
+ * @see org.alfresco.util.transaction.SpringAwareUserTransaction
  */
 public class SpringAwareUserTransactionTest extends TestCase
 {
@@ -245,58 +242,6 @@ public class SpringAwareUserTransactionTest extends TestCase
         checkNoStatusOnThread();
     }
 
-    /**
-     * Test for leaked transactions (no guarantee it will succeed due to reliance
-     * on garbage collector), so disabled by default.
-     * 
-     * Also, if it succeeds, transaction call stack tracing will be enabled
-     * potentially hitting the performance of all subsequent tests.
-     * 
-     * @throws Exception
-     */
-    public void xtestLeakedTransactionLogging() throws Exception
-    {
-        assertFalse(SpringAwareUserTransaction.isCallStackTraced());
-        
-        TrxThread t1 = new TrxThread();
-        t1.start();
-        System.gc();
-        Thread.sleep(1000);
-
-        TrxThread t2 = new TrxThread();
-        t2.start();
-        System.gc();
-        Thread.sleep(1000);
-        
-        assertTrue(SpringAwareUserTransaction.isCallStackTraced());
-        
-        TrxThread t3 = new TrxThread();
-        t3.start();
-        System.gc();
-        Thread.sleep(3000);
-        System.gc();
-        Thread.sleep(3000);
-    }
-    
-    private class TrxThread extends Thread
-    {
-        public void run()
-        {
-            try
-            {
-                getTrx();
-            }
-            catch (Exception e) {}
-        }
-        
-        public void getTrx() throws Exception
-        {
-            UserTransaction txn = getTxn();
-            txn.begin();
-            txn = null;
-        }
-    }
-    
     public void testConnectionPoolException() throws Exception
     {
         testNoTxnStatus();

data-model/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.5.0.1</version>
+        <version>25.1.0.68-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -118,6 +118,18 @@
             <groupId>org.jibx</groupId>
             <artifactId>jibx-run</artifactId>
             <version>1.4.2</version>
+            <exclusions>
+                <!-- [ACS-5371] Excluded to avoid conflict in JDK9+ as it includes javax.xml-->
+                <exclusion>
+                    <groupId>xpp3</groupId>
+                    <artifactId>xpp3</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.kxml</groupId>
+            <artifactId>kxml2</artifactId>
+            <version>${dependency.kxml2.version}</version>
         </dependency>
         <dependency> 
             <groupId>com.fasterxml.jackson.core</groupId> 

data-model/src/main/java/org/alfresco/service/cmr/security/PermissionService.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Data model classes
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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 

data-model/src/test/java/org/alfresco/AllDataModelUnitTestSuite.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Repository
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

mmt/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.5.0.1</version>
+        <version>25.1.0.68-SNAPSHOT</version>
     </parent>
 
     <dependencies>

packaging/distribution/pom.xml

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

packaging/distribution/src/main/resources/licenses/notice.txt

@@ -146,6 +146,7 @@ libgif  http://giflib.sourceforge.net/
 libfreetype http://www.freetype.org/
 PostgreSQL  http://www.postgresql.org/
 PostgreSQL JDBC Driver  http://www.postgresql.org/
+kXML 2 	http://kxml.sourceforge.net/
 
 
 === CDDL 1.0 ===

packaging/docker-alfresco/Dockerfile

@@ -1,5 +1,5 @@
 # More infos about this image: https://github.com/Alfresco/alfresco-docker-base-tomcat
-FROM alfresco/alfresco-base-tomcat:tomcat10-jre17-rockylinux9@sha256:395664f9d9be0c9f73d3b722a58fd559ee7231609b263dfe19502617652740e3
+FROM alfresco/alfresco-base-tomcat:tomcat10-jre17-rockylinux9@sha256:9622418e142fb4fe1c5320666ad61ea292bc5c98f3dd0b550b6add33d18f659f
 
 # Set default docker_context.
 ARG resource_path=target

packaging/docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.5.0.1</version>
+        <version>25.1.0.68-SNAPSHOT</version>
     </parent>
 
     <properties>

packaging/pom.xml

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

packaging/tests/environment/.env

@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.13
-POSTGRES_TAG=15.4
+SOLR6_TAG=2.0.15-A.1
+POSTGRES_TAG=16.6
 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8

packaging/tests/pom.xml

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

packaging/tests/tas-cmis/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.5.0.1</version>
+        <version>25.1.0.68-SNAPSHOT</version>
     </parent>
 
     <organization>

packaging/tests/tas-email/pom.xml

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

packaging/tests/tas-integration/pom.xml

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

packaging/tests/tas-restapi/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>23.5.0.1</version>
+        <version>25.1.0.68-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -171,7 +171,7 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy</artifactId>
-            <version>3.0.22</version>
+            <version>3.0.23</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-json-->

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestAuthCodeModel.java

@@ -0,0 +1,49 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * 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.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.utility.model.TestModel;
+
+/**
+ * Authorization code implementation
+ */
+public class RestAuthCodeModel extends TestModel
+{
+    @JsonProperty
+    private String authorizationCode;
+
+    public String getAuthorizationCode()
+    {
+        return authorizationCode;
+    }
+
+    public void setAuthorizationCode(String authorizationCode)
+    {
+        this.authorizationCode = authorizationCode;
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestAuthKeyModel.java

@@ -0,0 +1,49 @@
+/*-
+ * #%L
+ * alfresco-tas-restapi
+ * %%
+ * 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.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.alfresco.utility.model.TestModel;
+
+/**
+ * Authorization key implementation
+ */
+public class RestAuthKeyModel extends TestModel
+{
+    @JsonProperty(required = true)
+    private String authorizationKey;
+
+    public String getAuthorizationKey()
+    {
+        return authorizationKey;
+    }
+
+    public void setAuthorizationKey(String authorizationKey)
+    {
+        this.authorizationKey = authorizationKey;
+    }
+}

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSizeDetailsModel.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Categories.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Files.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/Folders.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/ResourceManager.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/cache/MultiKeyResourceMap.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/NestedCategoriesCreator.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/RepoCategoryCreator.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/RepoCategoryModifier.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/category/SerialCategoriesCreator.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/MultiContentCreator.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/NestedFoldersCreator.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/PlainFileCreator.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/PlainFileModifier.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/RepoFolderCreator.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/RepoFolderModifier.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/SerialFilesCreator.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/content/SerialFoldersCreator.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ContentCreator.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ContentModifier.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Creator.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Modifier.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultiCreator.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultipleContentsCreator.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/MultipleResourcesCreator.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceCreator.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceIntroducer.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceModifier.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/ResourceRemover.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/repo/resource/general/Specifier.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Node.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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 

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/People.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2022 Alfresco Software Limited
+ * 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 
@@ -29,6 +29,12 @@ import static io.restassured.RestAssured.given;
 
 import java.io.File;
 
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.response.ValidatableResponse;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+
 import org.alfresco.rest.core.JsonBodyGenerator;
 import org.alfresco.rest.core.RestRequest;
 import org.alfresco.rest.core.RestResponse;
@@ -36,6 +42,8 @@ import org.alfresco.rest.core.RestWrapper;
 import org.alfresco.rest.exception.EmptyJsonResponseException;
 import org.alfresco.rest.exception.JsonToModelConversionException;
 import org.alfresco.rest.model.RestActivityModelsCollection;
+import org.alfresco.rest.model.RestAuthCodeModel;
+import org.alfresco.rest.model.RestAuthKeyModel;
 import org.alfresco.rest.model.RestFavoriteSiteModel;
 import org.alfresco.rest.model.RestGroupsModelsCollection;
 import org.alfresco.rest.model.RestNetworkModel;
@@ -56,12 +64,6 @@ import org.alfresco.utility.model.FileModel;
 import org.alfresco.utility.model.FolderModel;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.UserModel;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import io.restassured.response.ValidatableResponse;
 
 /**
  * Declares all Rest API under the /people path
@@ -97,9 +99,7 @@ public class People extends ModelRequest<People>
     }
 
     /**
-     * Retrieve list of activities for a specific person using GET call on "people/{personId}/activities"
-     * Please note that it retries to get the list of activities several times before returning the empty list. The list of activities are not displayed as
-     * they are created.
+     * Retrieve list of activities for a specific person using GET call on "people/{personId}/activities" Please note that it retries to get the list of activities several times before returning the empty list. The list of activities are not displayed as they are created.
      */
     public RestActivityModelsCollection getPersonActivitiesUntilEntriesCountIs(int expectedNoOfEntries)
     {
@@ -173,6 +173,15 @@ public class People extends ModelRequest<People>
         return restWrapper.processModel(RestPreferenceModel.class, request);
     }
 
+    /**
+     * Updates a specific preference of a specific person using PUT call on "people/{personId}/preferences/{preferenceName}"
+     */
+    public RestPreferenceModel updatePersonPreferenceInformation(String preferenceName, RestPreferenceModel preferenceModel)
+    {
+        RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, preferenceModel.toJson(), "people/{personId}/preferences/{preferenceName}", this.person.getUsername(), preferenceName);
+        return restWrapper.processModel(RestPreferenceModel.class, request);
+    }
+
     /**
      * Remove a specific site from favorite sites list of a person using DELETE call on "people/{personId}/favorite-sites/{siteId}"
      */
@@ -412,8 +421,7 @@ public class People extends ModelRequest<People>
     }
 
     /**
-     * Get people avatar image using GET call on '/people/{personId}/avatar Please note that it retries to get the
-     * renditions response several times because on the alfresco server the rendition can take a while to be created.
+     * Get people avatar image using GET call on '/people/{personId}/avatar Please note that it retries to get the renditions response several times because on the alfresco server the rendition can take a while to be created.
      */
     public RestResponse downloadAvatarContent()
     {
@@ -431,6 +439,40 @@ public class People extends ModelRequest<People>
         restWrapper.processEmptyModel(request);
     }
 
+    /**
+     * Deauthorize a user
+     */
+    public void deauthorizeUser()
+    {
+        RestRequest request = RestRequest.simpleRequest(HttpMethod.POST, "people/{personId}/deauthorize", this.person.getUsername(), restWrapper.getParameters());
+        restWrapper.processEmptyModel(request);
+    }
+
+    /**
+     * Reauthorizes a user.
+     */
+    public void reauthorizeUser(RestAuthKeyModel authKey)
+    {
+        var request = RestRequest.requestWithBody(HttpMethod.POST, authKey.toJson(), "people/{personId}/reauthorize", this.person.getUsername());
+        restWrapper.processEmptyModel(request);
+    }
+
+    /**
+     * Get the reauthorization code.
+     */
+    public RestAuthCodeModel getReauthorizationCode()
+    {
+        var request = RestRequest.simpleRequest(HttpMethod.POST, "people/{personId}/reauthorization-code", this.person.getUsername());
+        try
+        {
+            return restWrapper.processModel(RestAuthCodeModel.class, request);
+        }
+        catch (JsonToModelConversionException | EmptyJsonResponseException e)
+        {
+            return null;
+        }
+    }
+
     /**
      * Update avatar image PUT call on 'people/{nodeId}/children
      */
@@ -457,16 +499,7 @@ public class People extends ModelRequest<People>
     }
 
     /**
-     * Construct the Where clause of getFavorites
-     * You can use the where parameter to restrict the list in the response to entries of a specific kind. The where parameter takes a value. The value is a
-     * single predicate that can include one or more EXISTS conditions. The EXISTS condition uses a single operand to limit the list to include entries that
-     * include that one property. The property values are:-
-     * target/file
-     * target/folder
-     * target/site
-     * Usage:
-     * where.. targetFileExist().or().targetSiteExist().filterAnd().getFavorites(...)
-     * At this point this method is working only with @link {@link RestFavoritesApi#getFavorites(UserModel) method.
+     * Construct the Where clause of getFavorites You can use the where parameter to restrict the list in the response to entries of a specific kind. The where parameter takes a value. The value is a single predicate that can include one or more EXISTS conditions. The EXISTS condition uses a single operand to limit the list to include entries that include that one property. The property values are:- target/file target/folder target/site Usage: where.. targetFileExist().or().targetSiteExist().filterAnd().getFavorites(...) At this point this method is working only with @link {@link RestFavoritesApi#getFavorites(UserModel) method.
      * 
      * @author paul.brodner
      */

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/search/RestRequestQueryModel.java

@@ -2,7 +2,7 @@
  * #%L
  * alfresco-tas-restapi
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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 
@@ -119,4 +119,3 @@ public class RestRequestQueryModel extends TestModel implements IRestModel<RestR
         return Objects.hash(model, getLanguage(), getUserQuery(), getQuery());
     }
 }
- 

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/deauthorization/community/DeauthorizeSanityTests.java

@@ -0,0 +1,40 @@
+package org.alfresco.rest.people.deauthorization.community;
+
+import org.springframework.http.HttpStatus;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import org.alfresco.rest.RestTest;
+import org.alfresco.utility.model.TestGroup;
+import org.alfresco.utility.model.UserModel;
+import org.alfresco.utility.testrail.ExecutionType;
+import org.alfresco.utility.testrail.annotation.TestRail;
+
+/**
+ * Verifies API behavior in community edition. Should be excluded in enterprise edition.
+ */
+@Test
+public class DeauthorizeSanityTests extends RestTest
+{
+    private UserModel userModel;
+    private UserModel adminUser;
+
+    @BeforeClass(alwaysRun = true)
+    public void dataPreparation()
+    {
+        adminUser = dataUser.getAdminUser();
+        userModel = dataUser.createRandomTestUser();
+    }
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE}, executionType = ExecutionType.SANITY,
+            description = "Check if de-authorization is not implemented in Community Edition")
+    public void deauthorizationIsNotImplementedInCommunityEdition()
+    {
+        restClient.authenticateUser(adminUser).withCoreAPI().usingUser(userModel).deauthorizeUser();
+        restClient.assertStatusCodeIs(HttpStatus.NOT_IMPLEMENTED);
+
+        restClient.authenticateUser(userModel).withCoreAPI().usingUser(userModel).deauthorizeUser();
+        restClient.assertStatusCodeIs(HttpStatus.NOT_IMPLEMENTED);
+    }
+}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/deauthorization/community/ReauthorizeSanityTests.java

@@ -0,0 +1,65 @@
+package org.alfresco.rest.people.deauthorization.community;
+
+import org.springframework.http.HttpStatus;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import org.alfresco.rest.RestTest;
+import org.alfresco.rest.model.RestAuthKeyModel;
+import org.alfresco.utility.model.TestGroup;
+import org.alfresco.utility.model.UserModel;
+import org.alfresco.utility.testrail.ExecutionType;
+import org.alfresco.utility.testrail.annotation.TestRail;
+
+/**
+ * Verifies API behavior in community edition. Should be excluded in enterprise edition.
+ */
+@Test
+public class ReauthorizeSanityTests extends RestTest
+{
+    private UserModel userModel;
+    private UserModel adminUser;
+
+    @BeforeClass(alwaysRun = true)
+    public void dataPreparation()
+    {
+        adminUser = dataUser.getAdminUser();
+        userModel = dataUser.createRandomTestUser();
+    }
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE}, executionType = ExecutionType.SANITY,
+            description = "Check if reauthorization is not implemented in Community Edition")
+    public void reauthorizationIsNotImplementedInCommunityEdition()
+    {
+        // given
+        var key = new RestAuthKeyModel();
+        key.setAuthorizationKey("am9obnRlc3RAMTIzNDU=");
+
+        // when admin invokes API
+        restClient.authenticateUser(adminUser).withCoreAPI().usingUser(userModel).reauthorizeUser(key);
+        // then
+        restClient.assertStatusCodeIs(HttpStatus.NOT_IMPLEMENTED);
+
+        // when user invokes API
+        restClient.authenticateUser(userModel).withCoreAPI().usingUser(userModel).reauthorizeUser(key);
+        // then
+        restClient.assertStatusCodeIs(HttpStatus.NOT_IMPLEMENTED);
+    }
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.SANITY})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE}, executionType = ExecutionType.SANITY,
+            description = "Check if the reauthorization code is not implemented in Community Edition")
+    public void reauthorizationCodeIsNotImplementedInCommunityEdition()
+    {
+        // when admin invokes API
+        restClient.authenticateUser(adminUser).withCoreAPI().usingUser(userModel).getReauthorizationCode();
+        // then
+        restClient.assertStatusCodeIs(HttpStatus.NOT_IMPLEMENTED);
+
+        // when user invokes API
+        restClient.authenticateUser(userModel).withCoreAPI().usingUser(userModel).getReauthorizationCode();
+        // then
+        restClient.assertStatusCodeIs(HttpStatus.NOT_IMPLEMENTED);
+    }
+}

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceFullTests.java

@@ -1,5 +1,11 @@
 package org.alfresco.rest.people.preferences;
 
+import java.nio.file.Paths;
+
+import org.springframework.http.HttpStatus;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.rest.model.RestPreferenceModel;
@@ -9,11 +15,6 @@ import org.alfresco.utility.model.*;
 import org.alfresco.utility.report.Bug;
 import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
-import org.springframework.http.HttpStatus;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.nio.file.Paths;
 
 public class GetPeoplePreferenceFullTests extends RestTest
 {
@@ -186,4 +187,48 @@ public class GetPeoplePreferenceFullTests extends RestTest
         restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN);
         restClient.assertLastError().containsSummary(RestErrorModel.PERMISSION_WAS_DENIED);
     }
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Verify regular user is able to change own preferences")
+    public void regularUserIsAbleToChangeOwnPreference() throws Exception
+    {
+        var newUser = dataUser.createRandomTestUser();
+        var newSite = dataSite.usingUser(newUser).createPublicRandomSite();
+        var preferenceId = String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), newSite.getId());
+        var updatedPreferenceModel = new RestPreferenceModel();
+        updatedPreferenceModel.setId(preferenceId);
+        updatedPreferenceModel.setValue("");
+
+        dataSite.usingUser(newUser).usingSite(newSite).addSiteToFavorites();
+        restClient.authenticateUser(newUser).withCoreAPI().usingAuthUser()
+                .getPersonPreferenceInformation(preferenceId);
+        restClient.assertStatusCodeIs(HttpStatus.OK);
+
+        restClient.authenticateUser(newUser).withCoreAPI().usingAuthUser().updatePersonPreferenceInformation(preferenceId, updatedPreferenceModel);
+        restClient.assertStatusCodeIs(HttpStatus.OK);
+        var personPreferences = restClient.authenticateUser(newUser).withCoreAPI().usingAuthUser().getPersonPreferences();
+        personPreferences.assertThat().entriesListDoesNotContain("id", preferenceId);
+    }
+
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Verify admin is not able to change regular user preferences")
+    public void adminIsNotAbleToChangeRegularUserPreference() throws Exception
+    {
+        var newUser = dataUser.createRandomTestUser();
+        var newSite = dataSite.usingUser(newUser).createPublicRandomSite();
+        var preferenceId = String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), newSite.getId());
+        var updatedPreferenceModel = new RestPreferenceModel();
+        updatedPreferenceModel.setId(preferenceId);
+        updatedPreferenceModel.setValue("");
+
+        dataSite.usingUser(newUser).usingSite(newSite).addSiteToFavorites();
+        restClient.authenticateUser(newUser).withCoreAPI().usingAuthUser()
+                .getPersonPreferenceInformation(preferenceId);
+        restClient.assertStatusCodeIs(HttpStatus.OK);
+
+        restClient.authenticateUser(dataUser.getAdminUser()).withCoreAPI().usingUser(newUser).updatePersonPreferenceInformation(preferenceId, updatedPreferenceModel);
+        restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND);
+    }
 }

packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/people/preferences/GetPeoplePreferenceSanityTests.java

@@ -1,7 +1,10 @@
 package org.alfresco.rest.people.preferences;
 
+import org.springframework.http.HttpStatus;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
 import org.alfresco.rest.RestTest;
-import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.rest.model.RestPreferenceModel;
 import org.alfresco.utility.constants.PreferenceName;
 import org.alfresco.utility.constants.UserRole;
@@ -10,9 +13,6 @@ import org.alfresco.utility.model.TestGroup;
 import org.alfresco.utility.model.UserModel;
 import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
-import org.springframework.http.HttpStatus;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
 
 /**
  * Tests for Get a Peference (/people/{personId}/preferences/{preferenceName}) RestAPI call
@@ -61,6 +61,22 @@ public class GetPeoplePreferenceSanityTests extends RestTest
         restPreferenceModel.assertThat().field("id").is(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId())).and().field("value").is("true");
     }
 
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.SANITY})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.SANITY, description = "Verify collaborator user gets a specific preference with Rest API and response is successful (200)")
+    public void collaboratorUserUpdatesAPreferenceWithSuccess() throws Exception
+    {
+        UserModel collaboratorUser = dataUser.usingAdmin().createRandomTestUser();
+
+        var updatedRestPreferenceModel = new RestPreferenceModel();
+        updatedRestPreferenceModel.setId("user.preference");
+        updatedRestPreferenceModel.setValue("user.value");
+
+        restPreferenceModel = restClient.authenticateUser(collaboratorUser).withCoreAPI().usingAuthUser()
+                .updatePersonPreferenceInformation(updatedRestPreferenceModel.getId(), updatedRestPreferenceModel);
+        restClient.assertStatusCodeIs(HttpStatus.OK);
+        restPreferenceModel.assertThat().field("id").is("user.preference").and().field("value").is("user.value");
+    }
+
     @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES, TestGroup.SANITY})
     @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.SANITY, description = "Verify contributor user gets a specific preference with Rest API and response is successful (200)")
     public void contributorUserGetsAPreferenceWithSuccess() throws Exception

packaging/tests/tas-webdav/pom.xml

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

packaging/war/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>23.5.0.1</version>
+        <version>25.1.0.68-SNAPSHOT</version>
     </parent>
 
     <properties>

pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>alfresco-community-repo</artifactId>
-    <version>23.5.0.1</version>
+    <version>25.1.0.68-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -23,8 +23,8 @@
     </modules>
 
     <properties>
-        <acs.version.major>23</acs.version.major>
-        <acs.version.minor>5</acs.version.minor>
+        <acs.version.major>25</acs.version.major>
+        <acs.version.minor>1</acs.version.minor>
         <acs.version.revision>0</acs.version.revision>
         <acs.version.label />
         <amp.min.version>${acs.version.major}.0.0</amp.min.version>
@@ -51,51 +51,52 @@
         <dependency.alfresco-server-root.version>7.0.1</dependency.alfresco-server-root.version>
         <dependency.activiti-engine.version>5.23.0</dependency.activiti-engine.version>
         <dependency.activiti.version>5.23.0</dependency.activiti.version>
-        <dependency.alfresco-transform-core.version>5.1.5</dependency.alfresco-transform-core.version>
-        <dependency.alfresco-transform-service.version>4.1.5</dependency.alfresco-transform-service.version>
-        <dependency.alfresco-greenmail.version>7.0</dependency.alfresco-greenmail.version>
-        <dependency.acs-event-model.version>0.0.33</dependency.acs-event-model.version>
+        <dependency.alfresco-transform-core.version>5.1.7-A.4</dependency.alfresco-transform-core.version>
+        <dependency.alfresco-transform-service.version>4.1.7-A.1</dependency.alfresco-transform-service.version>
+        <dependency.alfresco-greenmail.version>7.1</dependency.alfresco-greenmail.version>
+        <dependency.acs-event-model.version>1.0.2</dependency.acs-event-model.version>
 
         <dependency.aspectj.version>1.9.22.1</dependency.aspectj.version>
-        <dependency.spring.version>6.1.14</dependency.spring.version>
-        <dependency.spring-security.version>6.3.4</dependency.spring-security.version>
+        <dependency.spring.version>6.2.2</dependency.spring.version>
+        <dependency.spring-security.version>6.3.7</dependency.spring-security.version>
         <dependency.antlr.version>3.5.3</dependency.antlr.version>
         <dependency.jackson.version>2.17.2</dependency.jackson.version>
-        <dependency.cxf.version>4.0.5</dependency.cxf.version>
+        <dependency.cxf.version>4.1.0</dependency.cxf.version>
         <dependency.opencmis.version>1.0.0-jakarta-1</dependency.opencmis.version>
-        <dependency.webscripts.version>9.4</dependency.webscripts.version>
-        <dependency.bouncycastle.version>1.78.1</dependency.bouncycastle.version>
+        <dependency.webscripts.version>10.0</dependency.webscripts.version>
+        <dependency.bouncycastle.version>1.79</dependency.bouncycastle.version>
         <dependency.mockito-core.version>5.14.1</dependency.mockito-core.version>
-        <dependency.assertj.version>3.26.3</dependency.assertj.version>
+        <dependency.assertj.version>3.27.3</dependency.assertj.version>
         <dependency.org-json.version>20240303</dependency.org-json.version>
         <dependency.commons-dbcp.version>2.12.0</dependency.commons-dbcp.version>
-        <dependency.commons-io.version>2.17.0</dependency.commons-io.version>
-        <dependency.gson.version>2.11.0</dependency.gson.version>
+        <dependency.commons-io.version>2.18.0</dependency.commons-io.version>
+        <dependency.gson.version>2.12.1</dependency.gson.version>
         <dependency.guava.version>33.3.1-jre</dependency.guava.version>
         <dependency.httpclient.version>4.5.14</dependency.httpclient.version>
         <dependency.httpcore.version>4.4.16</dependency.httpcore.version>
-        <dependency.httpcomponents-httpclient5.version>5.2.1</dependency.httpcomponents-httpclient5.version>
-        <dependency.httpcomponents-httpcore5.version>5.3</dependency.httpcomponents-httpcore5.version>
+        <dependency.httpcomponents-httpclient5.version>5.4.1</dependency.httpcomponents-httpclient5.version>
+        <dependency.httpcomponents-httpcore5.version>5.3.3</dependency.httpcomponents-httpcore5.version>
         <dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
         <dependency.xercesImpl.version>2.12.2</dependency.xercesImpl.version>
         <dependency.slf4j.version>2.0.16</dependency.slf4j.version>
-        <dependency.log4j.version>2.23.1</dependency.log4j.version>
-        <dependency.groovy.version>3.0.22</dependency.groovy.version>
+        <dependency.log4j.version>2.24.3</dependency.log4j.version>
+        <dependency.groovy.version>3.0.23</dependency.groovy.version>
         <dependency.tika.version>2.9.2</dependency.tika.version>
         <dependency.truezip.version>7.7.10</dependency.truezip.version>
         <dependency.poi.version>5.3.0</dependency.poi.version>
         <dependency.jboss.logging.version>3.5.0.Final</dependency.jboss.logging.version>
         <dependency.camel.version>4.6.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
-        <dependency.netty.version>4.1.113.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
-        <dependency.activemq.version>5.18.3</dependency.activemq.version>
+        <dependency.netty.version>4.1.118.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common -->
+        <dependency.activemq.version>5.18.6</dependency.activemq.version>
         <dependency.apache-compress.version>1.27.1</dependency.apache-compress.version>
         <dependency.awaitility.version>4.2.2</dependency.awaitility.version>
         <dependency.swagger-ui.version>4.1.3</dependency.swagger-ui.version>
-        <dependency.swagger-parser.version>1.0.71</dependency.swagger-parser.version>
+        <dependency.swagger-parser.version>1.0.73</dependency.swagger-parser.version>
         <dependency.maven-filtering.version>3.1.1</dependency.maven-filtering.version>
         <dependency.maven-artifact.version>3.8.6</dependency.maven-artifact.version>
         <dependency.jdom2.version>2.0.6.1</dependency.jdom2.version>
         <dependency.pooled-jms.version>3.1.6</dependency.pooled-jms.version>
+        <dependency.kxml2.version>2.3.0</dependency.kxml2.version>
 
         <dependency.jakarta-ee-jaxb-api.version>4.0.2</dependency.jakarta-ee-jaxb-api.version>
         <dependency.jakarta-ee-jaxb-impl.version>4.0.5</dependency.jakarta-ee-jaxb-impl.version>
@@ -111,18 +112,18 @@
         <dependency.jakarta-ee-json-api.version>2.1.3</dependency.jakarta-ee-json-api.version>
         <dependency.jakarta-ee-json-impl.version>1.1.7</dependency.jakarta-ee-json-impl.version>
         <dependency.jakarta-json-path.version>2.9.0</dependency.jakarta-json-path.version>
-        <dependency.json-smart.version>2.5.1</dependency.json-smart.version>
+        <dependency.json-smart.version>2.5.2</dependency.json-smart.version>
         <alfresco.googledrive.version>4.1.0</alfresco.googledrive.version>
         <alfresco.aos-module.version>3.2.0</alfresco.aos-module.version>
-        <alfresco.api-explorer.version>23.4.0</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
+        <alfresco.api-explorer.version>25.1.0-A1</alfresco.api-explorer.version> <!-- Also in alfresco-enterprise-share -->
 
         <alfresco.maven-plugin.version>2.2.0</alfresco.maven-plugin.version>
         <license-maven-plugin.version>2.4.0</license-maven-plugin.version>
-        <spotless-plugin.version>2.43.0</spotless-plugin.version>
+        <spotless-plugin.version>2.44.2</spotless-plugin.version>
         <!-- Do not match any files by default, but this can be overridden from the command line. -->
         <spotless-include-list>NO_AUTOMATED_FORMATTING</spotless-include-list>
 
-        <dependency.postgresql.version>42.7.4</dependency.postgresql.version>
+        <dependency.postgresql.version>42.7.5</dependency.postgresql.version>
         <dependency.mysql.version>8.0.30</dependency.mysql.version>
         <dependency.mysql-image.version>8</dependency.mysql-image.version>
         <dependency.mariadb.version>2.7.4</dependency.mariadb.version>
@@ -154,7 +155,7 @@
         <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
         <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
         <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>23.5.0.1</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
@@ -371,7 +372,7 @@
             <dependency>
                 <groupId>org.quartz-scheduler</groupId>
                 <artifactId>quartz</artifactId>
-                <version>2.3.2</version>
+                <version>2.5.0</version>
                 <!-- exclude c3p0 -->
                 <!-- see https://issues.alfresco.com/jira/browse/REPO-3447 -->
                 <exclusions>
@@ -414,7 +415,7 @@
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.17.1</version>
+                <version>1.18.0</version>
             </dependency>
             <dependency>
                 <groupId>commons-lang</groupId>
@@ -465,7 +466,7 @@
             <dependency>
                 <groupId>org.apache.xmlbeans</groupId>
                 <artifactId>xmlbeans</artifactId>
-                <version>5.2.1</version>
+                <version>5.2.2</version>
             </dependency>
             <dependency>
                 <groupId>org.json</groupId>
@@ -703,7 +704,7 @@
             <dependency>
                 <groupId>com.networknt</groupId>
                 <artifactId>json-schema-validator</artifactId>
-                <version>1.5.1</version>
+                <version>1.5.5</version>
             </dependency>
             <!-- upgrade dependency from TIKA -->
             <dependency>
@@ -793,7 +794,7 @@
             <dependency>
                 <groupId>joda-time</groupId>
                 <artifactId>joda-time</artifactId>
-                <version>2.13.0</version>
+                <version>2.13.1</version>
             </dependency>
 
             <!-- provided dependencies -->
@@ -950,7 +951,7 @@
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.18.34</version>
+                <version>1.18.36</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -1015,7 +1016,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>3.5.1</version>
+                    <version>3.5.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
@@ -1028,7 +1029,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.10.1</version>
+                    <version>3.11.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -1088,7 +1089,7 @@
                 <plugin>
                     <groupId>org.codehaus.cargo</groupId>
                     <artifactId>cargo-maven3-plugin</artifactId>
-                    <version>1.10.14</version>
+                    <version>1.10.16</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

remote-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>23.5.0.1</version>
+        <version>25.1.0.68-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.santuario</groupId>
             <artifactId>xmlsec</artifactId>
-            <version>4.0.2</version>
+            <version>4.0.3</version>
         </dependency>
         <!-- newer version, see REPO-3133 -->
         <dependency>
@@ -119,7 +119,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>11.0.15</version>
+            <version>11.0.24</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

remote-api/src/main/java/org/alfresco/rest/api/Preferences.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * 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 
@@ -31,6 +31,9 @@ import org.alfresco.rest.framework.resource.parameters.Paging;
 
 public interface Preferences
 {
-	public Preference getPreference(String personId, String preferenceName);
-	public CollectionWithPagingInfo<Preference> getPreferences(String personId, Paging paging);
+    Preference getPreference(String personId, String preferenceName);
+
+    CollectionWithPagingInfo<Preference> getPreferences(String personId, Paging paging);
+
+    Preference updatePreference(String personId, Preference preference);
 }

remote-api/src/main/java/org/alfresco/rest/api/SizeDetails.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2024 Alfresco Software Limited
+ * 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