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

* [MNT-24542] fix class cast exception

* pre-commit-issue

* removed else part

* address review comments

* fix-conflict

.github/workflows/ci.yml

@@ -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.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
       - 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.2.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.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/github-download-file@v8.2.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.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/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.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
       - 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.2.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.2.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.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
       - 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.2.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.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -334,9 +340,9 @@ jobs:
         version: ['10.2.18', '10.4', '10.5']
     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.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
       - 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.2.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.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -405,9 +411,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.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
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run MariaDB 10.6 database"
@@ -416,7 +422,7 @@ jobs:
           MARIADB_VERSION: 10.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.2.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.2.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.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
       - 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.2.0
         id: rp-prepare
         with:
           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
@@ -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.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -546,9 +552,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.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
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run PostgreSQL 13.12 database"
@@ -557,7 +563,7 @@ jobs:
           POSTGRES_VERSION: 13.12
       - 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.2.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.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -616,9 +622,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.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
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run PostgreSQL 14.9 database"
@@ -627,7 +633,7 @@ jobs:
           POSTGRES_VERSION: 14.9
       - 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.2.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.2.0
         id: rp-summarize
         with:
           tests-outcome: ${{ steps.run-tests.outcome }}
@@ -686,9 +692,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.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
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run PostgreSQL 15.4 database"
@@ -697,7 +703,7 @@ jobs:
           POSTGRES_VERSION: 15.4
       - 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.2.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.2.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.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
       - 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.2.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.2.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.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
       - 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.2.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.2.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.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
       - 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.2.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.2.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.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
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Run Postgres 15.4 database"
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d
       - name: "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.2.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.2.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.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
       - 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.2.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.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
       - 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.2.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.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
       - 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.2.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.2.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.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
       - 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.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
       - 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.2.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.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
       - 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.2.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": [
@@ -1888,5 +1888,5 @@
       }
     ]
   },
-  "generated_at": "2024-10-09T09:32:52Z"
+  "generated_at": "2024-12-19T08:58:42Z"
 }

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.23</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.23</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.23</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.23</version>
    </parent>
 
    <modules>

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.23</version>
    </parent>
 
    <properties>

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.23</version>
     </parent>
 
     <build>

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.23</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.23</version>
     </parent>
 
     <properties>

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.23</version>
    </parent>
 
    <dependencies>

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

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.23</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.23</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.23</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/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.23</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.23</version>
     </parent>
 
     <modules>

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.23</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.23</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.23</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.23</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.23</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/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;
@@ -56,12 +62,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 +97,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 +171,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}"
      */
@@ -379,7 +386,7 @@ public class People extends ModelRequest<People>
     public RestNetworkModel getNetwork(UserModel tenant)
     {
         Utility.checkObjectIsInitialized(tenant.getDomain(), "tenant.getDomain()");
-        String personId = tenant.getUsername().contains("-me-@")? "-me-" : tenant.getUsername();
+        String personId = tenant.getUsername().contains("-me-@") ? "-me-" : tenant.getUsername();
         RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/networks/{networkId}?{parameters}", personId, tenant.getDomain(), restWrapper.getParameters());
         return restWrapper.processModel(RestNetworkModel.class, request);
     }
@@ -412,8 +419,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()
     {
@@ -456,17 +462,8 @@ public class People extends ModelRequest<People>
         return new WhereClause(this);
     }
 
-/**
-     * 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/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
 {
@@ -29,38 +30,38 @@ public class GetPeoplePreferenceFullTests extends RestTest
         dataSite.usingUser(userModel).usingSite(siteModel).addSiteToFavorites();
     }
 
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE,TestGroup.PREFERENCES }, executionType = ExecutionType.REGRESSION, 
-        description = "Check that properties parameter is applied")
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Check that properties parameter is applied")
     public void propertiesParameterIsAppliedWhenRetrievingPreference() throws Exception
     {
         restPreferenceModel = restClient.authenticateUser(userModel).withParams("properties=id").withCoreAPI().usingUser(userModel)
                 .getPersonPreferenceInformation(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId()));
         restClient.assertStatusCodeIs(HttpStatus.OK);
         restPreferenceModel.assertThat().field("id").is(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId()))
-            .and().field("value").isNull();
+                .and().field("value").isNull();
 
         restPreferenceModel = restClient.authenticateUser(userModel).withParams("properties=id,value").withCoreAPI().usingUser(userModel)
                 .getPersonPreferenceInformation(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId()));
         restClient.assertStatusCodeIs(HttpStatus.OK);
         restPreferenceModel.assertThat().field("id").is(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId()))
-            .and().field("value").is("true");
-     }
+                .and().field("value").is("true");
+    }
 
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE,TestGroup.PREFERENCES }, executionType = ExecutionType.REGRESSION, 
-        description = "Validate ID element in get site preference response")
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Validate ID element in get site preference response")
     public void validateIdElementInGetSitePreferenceResponse() throws Exception
     {
         restPreferenceModel = restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser()
                 .getPersonPreferenceInformation(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId()));
         restPreferenceModel.assertThat().field("id").is(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId()))
-            .and().field("value").is("true");
-     }
+                .and().field("value").is("true");
+    }
 
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API,TestGroup.PEOPLE, TestGroup.PREFERENCES }, executionType = ExecutionType.REGRESSION, 
-        description = "Validate ID element in get folder preference response")
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Validate ID element in get folder preference response")
     public void validateIdElementInGetFolderPreferenceResponse() throws Exception
     {
         FolderModel folderFavorite = new FolderModel("favoriteFolder");
@@ -70,12 +71,12 @@ public class GetPeoplePreferenceFullTests extends RestTest
         restPreferenceModel = restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser()
                 .getPersonPreferenceInformation(PreferenceName.FOLDERS_FAVORITES_PREFIX.toString());
         restPreferenceModel.assertThat().field("id").is(PreferenceName.FOLDERS_FAVORITES_PREFIX)
-            .and().field("value").is(Utility.removeLastSlash(Utility.buildPath("workspace://SpacesStore", folderFavorite.getNodeRef())));
-     }
+                .and().field("value").is(Utility.removeLastSlash(Utility.buildPath("workspace://SpacesStore", folderFavorite.getNodeRef())));
+    }
 
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API,TestGroup.PEOPLE, TestGroup.PREFERENCES }, executionType = ExecutionType.REGRESSION, 
-        description = "Validate ID element in get file preference response")
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Validate ID element in get file preference response")
     public void validateIdElementInGetFilePreferenceResponse() throws Exception
     {
         FileModel fileFavorite = new FileModel("favoriteFile", FileType.TEXT_PLAIN);
@@ -85,12 +86,12 @@ public class GetPeoplePreferenceFullTests extends RestTest
         restPreferenceModel = restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser()
                 .getPersonPreferenceInformation(PreferenceName.DOCUMENTS_FAVORITES_PREFIX.toString());
         restPreferenceModel.assertThat().field("id").is(PreferenceName.DOCUMENTS_FAVORITES_PREFIX)
-            .and().field("value").is(Utility.removeLastSlash(Utility.buildPath("workspace://SpacesStore", fileFavorite.getNodeRefWithoutVersion())));
-     }
+                .and().field("value").is(Utility.removeLastSlash(Utility.buildPath("workspace://SpacesStore", fileFavorite.getNodeRefWithoutVersion())));
+    }
 
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE,TestGroup.PREFERENCES }, executionType = ExecutionType.REGRESSION, 
-        description = "Get preference of an user that has no preferences")
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Get preference of an user that has no preferences")
     public void getPreferenceForUserWithoutPreferences() throws Exception
     {
         UserModel newUser = dataUser.createRandomTestUser();
@@ -112,11 +113,11 @@ public class GetPeoplePreferenceFullTests extends RestTest
         restClient.assertLastError().containsSummary(
                 String.format("The relationship resource was not found for the" + " entity with id: %s and a relationship id of %s", newUser.getUsername(),
                         PreferenceName.SITES_FAVORITES_PREFIX.toString()));
-     }
+    }
 
-    @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE,TestGroup.PREFERENCES }, executionType = ExecutionType.REGRESSION, 
-        description = "Change one preference for an user then perform get call")
+    @Test(groups = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION})
+    @TestRail(section = {TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.PREFERENCES}, executionType = ExecutionType.REGRESSION,
+            description = "Change one preference for an user then perform get call")
     @Bug(id = "REPO-1922")
     public void changePreferenceThenPerformGetPreferenceCall() throws Exception
     {
@@ -160,11 +161,11 @@ public class GetPeoplePreferenceFullTests extends RestTest
         restClient.assertLastError().containsSummary(
                 String.format("The relationship resource was not found for the" + " entity with id: %s and a relationship id of %s", newUser.getUsername(),
                         PreferenceName.FOLDERS_FAVORITES_PREFIX.toString()));
-     }
+    }
 
-    @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 able to get preference of another user")
+    @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 able to get preference of another user")
     public void adminIsAbleToGetOtherUserPreference() throws Exception
     {
         restPreferenceModel = restClient.authenticateUser(dataUser.getAdminUser()).withCoreAPI().usingUser(userModel)
@@ -173,9 +174,9 @@ public class GetPeoplePreferenceFullTests 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.REGRESSION })
-    @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE,TestGroup.PREFERENCES }, executionType = ExecutionType.REGRESSION, 
-        description = "Verify regular user is not able to get preference of admin user")
+    @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 not able to get preference of admin user")
     public void regularUserIsNotAbleToGetAdminPreference() throws Exception
     {
         SiteModel newSite = dataSite.usingUser(dataUser.getAdminUser()).createPublicRandomSite();
@@ -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
@@ -33,8 +33,8 @@ public class GetPeoplePreferenceSanityTests extends RestTest
         siteModel = dataSite.usingUser(userModel).createPublicRandomSite();
     }
 
-    @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 manager user gets a specific preference with Rest API and response is successful (200)")
+    @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 manager user gets a specific preference with Rest API and response is successful (200)")
     public void managerUserGetsAPreferenceWithSuccess() throws Exception
     {
         UserModel managerUser = dataUser.usingAdmin().createRandomTestUser();
@@ -47,8 +47,8 @@ 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)")
+    @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 collaboratorUserGetsAPreferenceWithSuccess() throws Exception
     {
         UserModel collaboratorUser = dataUser.usingAdmin().createRandomTestUser();
@@ -61,8 +61,24 @@ 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 contributor user gets a specific preference with Rest API and response is successful (200)")
+    @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
     {
         UserModel contributorUser = dataUser.usingAdmin().createRandomTestUser();
@@ -75,8 +91,8 @@ 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 consumer user gets a specific preference with Rest API and response is successful (200)")
+    @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 consumer user gets a specific preference with Rest API and response is successful (200)")
     public void consumerUserGetsAPreferenceWithSuccess() throws Exception
     {
         UserModel consumerUser = dataUser.usingAdmin().createRandomTestUser();
@@ -84,13 +100,13 @@ public class GetPeoplePreferenceSanityTests extends RestTest
         dataSite.usingUser(consumerUser).usingSite(siteModel).addSiteToFavorites();
 
         restPreferenceModel = restClient.authenticateUser(consumerUser).withCoreAPI().usingAuthUser()
-                .getPersonPreferenceInformation(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(),siteModel.getId()));
+                .getPersonPreferenceInformation(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(), siteModel.getId()));
         restClient.assertStatusCodeIs(HttpStatus.OK);
-        restPreferenceModel.assertThat().field("id").is(String.format(PreferenceName.SITES_FAVORITES_PREFIX.toString(),siteModel.getId())).and().field("value").is("true");
+        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 admin user gets a specific preference with Rest API and response is successful (200)")
+    @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 admin user gets a specific preference with Rest API and response is successful (200)")
     public void adminUserGetsAPreferenceWithSuccess() throws Exception
     {
         UserModel adminUser = dataUser.getAdminUser();
@@ -102,9 +118,9 @@ 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 manager user is NOT Authorized to get a specific preference with Rest API when authentication fails (401)")
-//    @Bug(id = "MNT-16904", description = "fails only on environment with tenants")
+    @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 manager user is NOT Authorized to get a specific preference with Rest API when authentication fails (401)")
+    // @Bug(id = "MNT-16904", description = "fails only on environment with tenants")
     public void managerUserNotAuthorizedFailsToGetsAPreference() throws Exception
     {
         UserModel managerUser = dataUser.usingAdmin().createRandomTestUser();

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.23</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.23</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.23</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>
@@ -54,7 +54,7 @@
         <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.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>
@@ -64,38 +64,39 @@
         <dependency.cxf.version>4.0.5</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.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.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.commons-io.version>2.18.0</dependency.commons-io.version>
         <dependency.gson.version>2.11.0</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-httpclient5.version>5.4.1</dependency.httpcomponents-httpclient5.version>
         <dependency.httpcomponents-httpcore5.version>5.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.2</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.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.72</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>
@@ -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>25.1.0.23</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>
@@ -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.4</version>
             </dependency>
             <!-- upgrade dependency from TIKA -->
             <dependency>
@@ -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>

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.23</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

remote-api/src/main/java/org/alfresco/rest/api/impl/AuditImpl.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 
@@ -85,7 +85,7 @@ public class AuditImpl implements Audit
 
     // list of equals filter's auditEntry (via where clause)
     private final static Set<String> LIST_AUDIT_ENTRY_EQUALS_QUERY_PROPERTIES = new HashSet<>(
-            Arrays.asList(new String[] { CREATED_BY_USER, VALUES_KEY, VALUES_VALUE }));
+            Arrays.asList(new String[]{CREATED_BY_USER, VALUES_KEY, VALUES_VALUE}));
 
     // map of sort parameters for the moment one createdAt
     private final static Map<String, String> SORT_PARAMS_TO_NAMES;
@@ -295,23 +295,29 @@ public class AuditImpl implements Audit
         }
         else
         {
-            if (hasMoreItems) {
-                if (q != null) {
+            if (hasMoreItems)
+            {
+                if (q != null)
+                {
                     // filtering via "where" clause
                     AuditEntryQueryWalker propertyWalker = new AuditEntryQueryWalker();
                     QueryHelper.walk(q, propertyWalker);
                     totalItems = getAuditEntriesCountByAppAndProperties(auditApplication, propertyWalker);
-                } else {
+                }
+                else
+                {
                     totalItems = getAuditEntriesCountByApp(auditApplication);
                 }
-            } else {
+            }
+            else
+            {
                 totalItems = totalRetrievedItems;
             }
         }
 
         entriesAudit = (skipCount >= totalRetrievedItems)
-                        ? Collections.emptyList()
-                        : entriesAudit.subList(skipCount, end);
+                ? Collections.emptyList()
+                : entriesAudit.subList(skipCount, end);
         return CollectionWithPagingInfo.asPaged(paging, entriesAudit, hasMoreItems, totalItems);
     }
 
@@ -475,8 +481,7 @@ public class AuditImpl implements Audit
         final Map<String, UserInfo> mapUserInfo = new HashMap<>(10);
 
         // create the callback for auditQuery method
-        final AuditQueryCallback callback = new AuditQueryCallback()
-        {
+        final AuditQueryCallback callback = new AuditQueryCallback() {
             public boolean valuesRequired()
             {
                 return ((includeParam != null) && (includeParam.contains(PARAM_INCLUDE_VALUES)));
@@ -545,8 +550,7 @@ public class AuditImpl implements Audit
         final List<AuditEntry> results = new ArrayList<>();
 
         // create the callback for auditQuery method
-        final AuditQueryCallback callback = new AuditQueryCallback()
-        {
+        final AuditQueryCallback callback = new AuditQueryCallback() {
             public boolean valuesRequired()
             {
                 return ((includeParam != null) && (includeParam.contains(PARAM_INCLUDE_VALUES)));
@@ -710,8 +714,7 @@ public class AuditImpl implements Audit
     @Override
     public CollectionWithPagingInfo<AuditEntry> listAuditEntriesByNodeId(String nodeId, Parameters parameters)
     {
-        AuthenticationUtil.runAs(new RunAsWork<Void>()
-        {
+        AuthenticationUtil.runAs(new RunAsWork<Void>() {
             public Void doWork() throws Exception
             {
                 checkEnabled();
@@ -772,8 +775,7 @@ public class AuditImpl implements Audit
         final List<AuditEntry> results = new ArrayList<>();
 
         String auditAppId = "alfresco-access";
-        String auditApplicationName = AuthenticationUtil.runAs(new RunAsWork<String>()
-        {
+        String auditApplicationName = AuthenticationUtil.runAs(new RunAsWork<String>() {
             public String doWork() throws Exception
             {
                 return findAuditAppByIdOr404(auditAppId).getName();
@@ -781,8 +783,7 @@ public class AuditImpl implements Audit
         }, AuthenticationUtil.getSystemUserName());
 
         // create the callback for auditQuery method
-        final AuditQueryCallback callback = new AuditQueryCallback()
-        {
+        final AuditQueryCallback callback = new AuditQueryCallback() {
             public boolean valuesRequired()
             {
                 return ((includeParam != null) && (includeParam.contains(PARAM_INCLUDE_VALUES)));
@@ -808,8 +809,7 @@ public class AuditImpl implements Audit
         Long toTime = propertyWalker.getToTime();
         validateWhereBetween(nodeRef.getId(), fromTime, toTime);
 
-        AuthenticationUtil.runAs(new RunAsWork<Object>()
-        {
+        AuthenticationUtil.runAs(new RunAsWork<Object>() {
             public Object doWork() throws Exception
             {
                 // QueryParameters
@@ -820,7 +820,7 @@ public class AuditImpl implements Audit
                 pathParams.setFromTime(fromTime);
                 pathParams.setToTime(toTime);
                 pathParams.setApplicationName(auditApplicationName);
-                pathParams.addSearchKey("/"+auditAppId+"/transaction/path", nodePath);
+                pathParams.addSearchKey("/" + auditAppId + "/transaction/path", nodePath);
                 auditService.auditQuery(callback, pathParams, limit);
 
                 AuditQueryParameters copyFromPathParams = new AuditQueryParameters();
@@ -830,7 +830,7 @@ public class AuditImpl implements Audit
                 copyFromPathParams.setFromTime(fromTime);
                 copyFromPathParams.setToTime(toTime);
                 copyFromPathParams.setApplicationName(auditApplicationName);
-                copyFromPathParams.addSearchKey("/"+auditAppId+"/transaction/copy/from/path", nodePath);
+                copyFromPathParams.addSearchKey("/" + auditAppId + "/transaction/copy/from/path", nodePath);
                 auditService.auditQuery(callback, copyFromPathParams, limit);
 
                 AuditQueryParameters moveFromPathParams = new AuditQueryParameters();
@@ -840,7 +840,7 @@ public class AuditImpl implements Audit
                 moveFromPathParams.setFromTime(fromTime);
                 moveFromPathParams.setToTime(toTime);
                 moveFromPathParams.setApplicationName(auditApplicationName);
-                moveFromPathParams.addSearchKey("/"+auditAppId+"/transaction/move/from/path", nodePath);
+                moveFromPathParams.addSearchKey("/" + auditAppId + "/transaction/move/from/path", nodePath);
                 auditService.auditQuery(callback, moveFromPathParams, limit);
 
                 return null;
@@ -857,7 +857,7 @@ public class AuditImpl implements Audit
 
         public AuditEntriesByNodeIdQueryWalker()
         {
-            super(new HashSet<>(Arrays.asList(new String[] { CREATED_BY_USER })), null);
+            super(new HashSet<>(Arrays.asList(new String[]{CREATED_BY_USER})), null);
         }
 
         @Override
@@ -904,19 +904,22 @@ public class AuditImpl implements Audit
     public int getAuditEntriesCountByApp(AuditService.AuditApplication auditApplication)
     {
         final String applicationName = auditApplication.getKey().substring(1);
+
         return auditService.getAuditEntriesCountByApp(applicationName);
     }
 
     public int getAuditEntriesCountByAppAndProperties(AuditService.AuditApplication auditApplication, AuditEntryQueryWalker propertyWalker)
     {
+        final String applicationName = auditApplication.getName();
+
         AuditQueryParameters parameters = new AuditQueryParameters();
-        parameters.setApplicationName(auditApplication.getName());
+        parameters.setApplicationName(applicationName);
         parameters.setFromTime(propertyWalker.getFromTime());
         parameters.setToTime(propertyWalker.getToTime());
         parameters.setFromId(propertyWalker.getFromId());
         parameters.setToId(propertyWalker.getToId());
         parameters.setUser(propertyWalker.getCreatedByUser());
 
-        return auditService.getAuditEntriesCountByAppAndProperties(parameters);
+        return auditService.getAuditEntriesCountByAppAndProperties(applicationName, parameters);
     }
 }

remote-api/src/main/java/org/alfresco/rest/api/impl/PreferencesImpl.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 
@@ -27,7 +27,9 @@ package org.alfresco.rest.api.impl;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.alfresco.query.PagingResults;
 import org.alfresco.rest.api.People;
@@ -47,45 +49,66 @@ import org.alfresco.util.Pair;
  */
 public class PreferencesImpl implements Preferences
 {
-	private People people;
+    private People people;
     private PreferenceService preferenceService;
 
-	public void setPeople(People people)
-	{
-		this.people = people;
-	}
+    public void setPeople(People people)
+    {
+        this.people = people;
+    }
 
-	public void setPreferenceService(PreferenceService preferenceService)
-	{
-		this.preferenceService = preferenceService;
-	}
+    public void setPreferenceService(PreferenceService preferenceService)
+    {
+        this.preferenceService = preferenceService;
+    }
 
-	public Preference getPreference(String personId, String preferenceName)
-	{
-		personId = people.validatePerson(personId);
-		Serializable preferenceValue = preferenceService.getPreference(personId, preferenceName);
-		if(preferenceValue != null)
-		{
-			return new Preference(preferenceName, preferenceValue);
-		}
-		else
-		{
-			throw new RelationshipResourceNotFoundException(personId, preferenceName);
-		}
-	}
+    @Override
+    public Preference getPreference(String personId, String preferenceName)
+    {
+        personId = people.validatePerson(personId);
+        Serializable preferenceValue = preferenceService.getPreference(personId, preferenceName);
+        if (preferenceValue != null)
+        {
+            return new Preference(preferenceName, preferenceValue);
+        }
+        else
+        {
+            throw new RelationshipResourceNotFoundException(personId, preferenceName);
+        }
+    }
 
-	public CollectionWithPagingInfo<Preference> getPreferences(String personId, Paging paging)
-	{
-		personId = people.validatePerson(personId);
+    @Override
+    public CollectionWithPagingInfo<Preference> getPreferences(String personId, Paging paging)
+    {
+        personId = people.validatePerson(personId);
 
-		PagingResults<Pair<String, Serializable>> preferences = preferenceService.getPagedPreferences(personId, null, Util.getPagingRequest(paging));
-		List<Preference> ret = new ArrayList<Preference>(preferences.getPage().size());
-		for(Pair<String, Serializable> prefEntity : preferences.getPage())
-		{
-			Preference pref = new Preference(prefEntity.getFirst(), prefEntity.getSecond());
-			ret.add(pref);
-		}
+        PagingResults<Pair<String, Serializable>> preferences = preferenceService.getPagedPreferences(personId, null, Util.getPagingRequest(paging));
+        List<Preference> ret = new ArrayList<>(preferences.getPage().size());
+        for (Pair<String, Serializable> prefEntity : preferences.getPage())
+        {
+            Preference pref = new Preference(prefEntity.getFirst(), prefEntity.getSecond());
+            ret.add(pref);
+        }
 
         return CollectionWithPagingInfo.asPaged(paging, ret, preferences.hasMoreItems(), preferences.getTotalResultCount().getFirst());
-	}
+    }
+
+    @Override
+    public Preference updatePreference(String personId, Preference preference)
+    {
+        personId = people.validatePerson(personId, true);
+        final Map<String, Serializable> preferencesToSet;
+        if (preference.getValue() == null || "".equals(preference.getValue()))
+        {
+            preferencesToSet = new HashMap<>(1);
+            preferencesToSet.put(preference.getName(), null);
+        }
+        else
+        {
+            preferencesToSet = Map.of(preference.getName(), preference.getValue());
+        }
+
+        preferenceService.setPreferences(personId, preferencesToSet);
+        return new Preference(preference.getName(), preferenceService.getPreference(personId, preference.getName()));
+    }
 }

remote-api/src/main/java/org/alfresco/rest/api/impl/SizeDetailsImpl.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

remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeSizeDetailsRelation.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

remote-api/src/main/java/org/alfresco/rest/api/people/PersonPreferencesRelation.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 
@@ -25,69 +25,81 @@
  */
 package org.alfresco.rest.api.people;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.InitializingBean;
+
 import org.alfresco.rest.api.Preferences;
 import org.alfresco.rest.api.model.Preference;
 import org.alfresco.rest.framework.WebApiDescription;
+import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
 import org.alfresco.rest.framework.resource.RelationshipResource;
 import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
 import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
 import org.alfresco.rest.framework.resource.parameters.Parameters;
 import org.alfresco.util.ParameterCheck;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.InitializingBean;
 
 @RelationshipResource(name = "preferences", entityResource = PeopleEntityResource.class, title = "Person Preferences")
-public class PersonPreferencesRelation implements RelationshipResourceAction.Read<Preference>, RelationshipResourceAction.ReadById<Preference>, InitializingBean
+public class PersonPreferencesRelation implements RelationshipResourceAction.Read<Preference>, RelationshipResourceAction.ReadById<Preference>, RelationshipResourceAction.Update<Preference>, InitializingBean
 {
     private static final Log logger = LogFactory.getLog(PersonPreferencesRelation.class);
 
     private Preferences preferences;
 
-	public void setPreferences(Preferences preferences)
-	{
-		this.preferences = preferences;
-	}
+    public void setPreferences(Preferences preferences)
+    {
+        this.preferences = preferences;
+    }
 
-	@Override
+    @Override
     public void afterPropertiesSet()
     {
         ParameterCheck.mandatory("preferences", this.preferences);
     }
 
-	/**
-	 * Returns a paged list of preferences for the user personId.
-	 * 
-	 * If personId does not exist, NotFoundException (status 404).
-	 * 
-	 * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Read#readAll(java.lang.String, org.alfresco.rest.framework.resource.parameters.Parameters)
-	 */
+    /**
+     * Returns a paged list of preferences for the user personId.
+     * 
+     * If personId does not exist, NotFoundException (status 404).
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.Read#readAll(java.lang.String, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
     @Override
     @WebApiDescription(title = "A paged list of the persons preferences.")
     public CollectionWithPagingInfo<Preference> readAll(String personId, Parameters parameters)
-	{
-    	return preferences.getPreferences(personId, parameters.getPaging());
-	}
+    {
+        return preferences.getPreferences(personId, parameters.getPaging());
+    }
 
-	/**
-	 * Returns information regarding the preference 'preferenceName' for user personId.
-	 * 
-	 * If personId does not exist, NotFoundException (status 404).
-	 * 
-	 * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.ReadById#readById(String, String, org.alfresco.rest.framework.resource.parameters.Parameters)
-	 */
+    /**
+     * Returns information regarding the preference 'preferenceName' for user personId.
+     * 
+     * If personId does not exist, NotFoundException (status 404).
+     * 
+     * @see org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction.ReadById#readById(String, String, org.alfresco.rest.framework.resource.parameters.Parameters)
+     */
     @Override
     @WebApiDescription(title = "Preference value for preference 'preferenceName' for person 'personId'.")
     public Preference readById(String personId, String preferenceName, Parameters parameters)
-	{
+    {
         // fix for REPO-855
-		String url = parameters.getRequest().getURL();
-		if(url.matches(".*workspace://SpacesStore/.*")){
+        String url = parameters.getRequest().getURL();
+        if (url.matches(".*workspace://SpacesStore/.*"))
+        {
             preferenceName += url.substring(url.indexOf("//SpacesStore/"));
         }
-		//
+        //
 
-    	return preferences.getPreference(personId, preferenceName);
-	}
+        return preferences.getPreference(personId, preferenceName);
+    }
 
+    @Override
+    public Preference update(String personId, Preference preference, Parameters parameters)
+    {
+        if (preference.getName() == null || preference.getName().isBlank())
+        {
+            throw new InvalidArgumentException();
+        }
+        return preferences.updatePreference(personId, preference);
+    }
 }

remote-api/src/main/java/org/alfresco/rest/framework/core/exceptions/UnprocessableContentException.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 

remote-api/src/main/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPut.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Remote API
  * %%
- * Copyright (C) 2005 - 2020 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 
@@ -30,6 +30,15 @@ import java.io.InputStream;
 import java.util.Locale;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
+import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.rest.framework.core.ResourceLocator;
 import org.alfresco.rest.framework.core.ResourceMetadata;
@@ -47,14 +56,7 @@ import org.alfresco.rest.framework.resource.parameters.Params;
 import org.alfresco.rest.framework.resource.parameters.Params.RecognizedParams;
 import org.alfresco.rest.framework.tools.RecognizedParamsExtractor;
 import org.alfresco.rest.framework.tools.RequestReader;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.extensions.webscripts.WebScriptRequest;
-import org.springframework.extensions.webscripts.WrappingWebScriptRequest;
-import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
+
 /**
  * Handles the HTTP PUT for a Resource, equivalent to CRUD Update
  * 
@@ -64,13 +66,13 @@ public class ResourceWebScriptPut extends AbstractResourceWebScript implements P
         RecognizedParamsExtractor, RequestReader
 {
 
-    private static Log logger = LogFactory.getLog(ResourceWebScriptPut.class);
+    private static final Log logger = LogFactory.getLog(ResourceWebScriptPut.class);
 
     public ResourceWebScriptPut()
     {
-       super();
-       setHttpMethod(HttpMethod.PUT);
-       setParamsExtractor(this);
+        super();
+        setHttpMethod(HttpMethod.PUT);
+        setParamsExtractor(this);
     }
 
     @Override
@@ -86,81 +88,87 @@ public class ResourceWebScriptPut extends AbstractResourceWebScript implements P
 
         switch (resourceMeta.getType())
         {
-            case ENTITY:
-                if (StringUtils.isBlank(entityId))
-                {
-                    throw new UnsupportedResourceOperationException("PUT is executed against the instance URL");                  
-                } else
-                {
+        case ENTITY:
+            if (StringUtils.isBlank(entityId))
+            {
+                throw new UnsupportedResourceOperationException("PUT is executed against the instance URL");
+            }
+            else
+            {
 
-                    Object putEnt = extractJsonContent(req, assistant.getJsonHelper(), resourceMeta.getObjectType(operation));
-                    return Params.valueOf(entityId,params,putEnt, req);
-                }
-            case RELATIONSHIP:
-                if (StringUtils.isBlank(relationshipId))
+                Object putEnt = extractJsonContent(req, assistant.getJsonHelper(), resourceMeta.getObjectType(operation));
+                return Params.valueOf(entityId, params, putEnt, req);
+            }
+        case RELATIONSHIP:
+            if (StringUtils.isBlank(relationshipId))
+            {
+                throw new UnsupportedResourceOperationException("PUT is executed against the instance URL");
+            }
+            Object putRel = extractJsonContent(req, assistant.getJsonHelper(), resourceMeta.getObjectType(operation));
+            if (StringUtils.isNotBlank(relationship2Id))
+            {
+                ResourceWebScriptHelper.setUniqueId(putRel, relationship2Id);
+                return Params.valueOf(false, entityId, relationshipId, relationship2Id,
+                        putRel, null, null, params, null, req);
+            }
+            else
+            {
+                ResourceWebScriptHelper.setUniqueId(putRel, relationshipId);
+                return Params.valueOf(entityId, relationshipId, params, putRel, req);
+            }
+        case PROPERTY:
+            final String resourceName = resourceVars.get(ResourceLocator.RELATIONSHIP_RESOURCE);
+            final String propertyName = resourceVars.get(ResourceLocator.PROPERTY);
+
+            if (StringUtils.isNotBlank(entityId) && StringUtils.isNotBlank(resourceName))
+            {
+                if (StringUtils.isNotBlank(propertyName))
                 {
-                    throw new UnsupportedResourceOperationException("PUT is executed against the instance URL");                  
-                }
-                Object putRel = extractJsonContent(req, assistant.getJsonHelper(), resourceMeta.getObjectType(operation));
-                if (StringUtils.isNotBlank(relationship2Id))
-                {
-                    ResourceWebScriptHelper.setUniqueId(putRel, relationship2Id);
-                    return Params.valueOf(false, entityId, relationshipId, relationship2Id,
-                            putRel, null, null, params, null, req);
+                    return Params.valueOf(entityId, relationshipId, null, getStream(req), propertyName, params, getContentInfo(req), req);
                 }
                 else
                 {
-                    ResourceWebScriptHelper.setUniqueId(putRel,relationshipId);
-                    return Params.valueOf(entityId, params, putRel, req);
+                    return Params.valueOf(entityId, null, null, getStream(req), resourceName, params, getContentInfo(req), req);
                 }
-            case PROPERTY:
-                final String resourceName = resourceVars.get(ResourceLocator.RELATIONSHIP_RESOURCE);
-                final String propertyName = resourceVars.get(ResourceLocator.PROPERTY);
 
-                if (StringUtils.isNotBlank(entityId) && StringUtils.isNotBlank(resourceName))
-                {
-                    if (StringUtils.isNotBlank(propertyName))
-                    {
-                        return Params.valueOf(entityId, relationshipId, null, getStream(req), propertyName, params, getContentInfo(req), req);
-                    }
-                    else
-                    {
-                        return Params.valueOf(entityId, null, null, getStream(req), resourceName, params, getContentInfo(req), req);
-                    }
-
-                }
-                //Fall through to unsupported.
-            default:
-                throw new UnsupportedResourceOperationException("PUT not supported for this request.");
+            }
+            // Fall through to unsupported.
+        default:
+            throw new UnsupportedResourceOperationException("PUT not supported for this request.");
         }
     }
 
-	/**
+    /**
      * Returns the basic content info from the request.
-     * @param req WebScriptRequest
+     * 
+     * @param req
+     *            WebScriptRequest
      * @return BasicContentInfo
      */
-    private BasicContentInfo getContentInfo(WebScriptRequest req) {
+    private BasicContentInfo getContentInfo(WebScriptRequest req)
+    {
 
-		String encoding = "UTF-8";
-		String contentType = MimetypeMap.MIMETYPE_BINARY;
+        String encoding = "UTF-8";
+        String contentType = MimetypeMap.MIMETYPE_BINARY;
 
-		if (StringUtils.isNotEmpty(req.getContentType()))
-		{
-			MediaType media = MediaType.parseMediaType(req.getContentType());
-			contentType = media.getType()+'/'+media.getSubtype();
-			if (media.getCharset() != null)
-			{
-				encoding = media.getCharset().toString();
-			}			
-		}
+        if (StringUtils.isNotEmpty(req.getContentType()))
+        {
+            MediaType media = MediaType.parseMediaType(req.getContentType());
+            contentType = media.getType() + '/' + media.getSubtype();
+            if (media.getCharset() != null)
+            {
+                encoding = media.getCharset().toString();
+            }
+        }
 
         return new ContentInfoImpl(contentType, encoding, -1, Locale.getDefault());
-	}
+    }
 
-	/**
+    /**
      * Returns the input stream for the request
-     * @param req WebScriptRequest
+     * 
+     * @param req
+     *            WebScriptRequest
      * @return InputStream
      */
     private InputStream getStream(WebScriptRequest req)
@@ -189,8 +197,11 @@ public class ResourceWebScriptPut extends AbstractResourceWebScript implements P
 
     /**
      * Executes the action on the resource
-     * @param resource ResourceWithMetadata
-     * @param params parameters to use
+     * 
+     * @param resource
+     *            ResourceWithMetadata
+     * @param params
+     *            parameters to use
      * @return anObject the result of the execute
      */
     @Override
@@ -198,87 +209,87 @@ public class ResourceWebScriptPut extends AbstractResourceWebScript implements P
     {
         switch (resource.getMetaData().getType())
         {
-            case ENTITY:
-                if (EntityResourceAction.Update.class.isAssignableFrom(resource.getResource().getClass()))
+        case ENTITY:
+            if (EntityResourceAction.Update.class.isAssignableFrom(resource.getResource().getClass()))
+            {
+                if (resource.getMetaData().isDeleted(EntityResourceAction.Update.class))
                 {
-                    if (resource.getMetaData().isDeleted(EntityResourceAction.Update.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    EntityResourceAction.Update<Object> updateEnt = (EntityResourceAction.Update<Object>) resource.getResource();
-                    Object result = updateEnt.update(params.getEntityId(), params.getPassedIn(), params);
-                    return result;
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-                else
+                EntityResourceAction.Update<Object> updateEnt = (EntityResourceAction.Update<Object>) resource.getResource();
+                Object result = updateEnt.update(params.getEntityId(), params.getPassedIn(), params);
+                return result;
+            }
+            else
+            {
+                if (resource.getMetaData().isDeleted(EntityResourceAction.UpdateWithResponse.class))
                 {
-                    if (resource.getMetaData().isDeleted(EntityResourceAction.UpdateWithResponse.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    EntityResourceAction.UpdateWithResponse<Object> updateEnt = (EntityResourceAction.UpdateWithResponse<Object>) resource.getResource();
-                    Object result = updateEnt.update(params.getEntityId(), params.getPassedIn(), params, withResponse);
-                    return result;
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-            case RELATIONSHIP:
-                if (RelationshipResourceAction.UpdateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                EntityResourceAction.UpdateWithResponse<Object> updateEnt = (EntityResourceAction.UpdateWithResponse<Object>) resource.getResource();
+                Object result = updateEnt.update(params.getEntityId(), params.getPassedIn(), params, withResponse);
+                return result;
+            }
+        case RELATIONSHIP:
+            if (RelationshipResourceAction.UpdateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+            {
+                if (resource.getMetaData().isDeleted(RelationshipResourceAction.UpdateWithResponse.class))
                 {
-                    if (resource.getMetaData().isDeleted(RelationshipResourceAction.UpdateWithResponse.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    RelationshipResourceAction.UpdateWithResponse<Object> relationUpdater = (RelationshipResourceAction.UpdateWithResponse<Object>) resource.getResource();
-                    Object relResult = relationUpdater.update(params.getEntityId(), params.getPassedIn(), params, withResponse);
-                    return relResult;
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-                else
+                RelationshipResourceAction.UpdateWithResponse<Object> relationUpdater = (RelationshipResourceAction.UpdateWithResponse<Object>) resource.getResource();
+                Object relResult = relationUpdater.update(params.getEntityId(), params.getPassedIn(), params, withResponse);
+                return relResult;
+            }
+            else
+            {
+                if (resource.getMetaData().isDeleted(RelationshipResourceAction.Update.class))
                 {
-                    if (resource.getMetaData().isDeleted(RelationshipResourceAction.Update.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    RelationshipResourceAction.Update<Object> relationUpdater = (RelationshipResourceAction.Update<Object>) resource.getResource();
-                    Object relResult = relationUpdater.update(params.getEntityId(), params.getPassedIn(), params);
-                    return relResult;
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-            case PROPERTY:
-                if (BinaryResourceAction.Update.class.isAssignableFrom(resource.getResource().getClass()))
+                RelationshipResourceAction.Update<Object> relationUpdater = (RelationshipResourceAction.Update<Object>) resource.getResource();
+                Object relResult = relationUpdater.update(params.getEntityId(), params.getPassedIn(), params);
+                return relResult;
+            }
+        case PROPERTY:
+            if (BinaryResourceAction.Update.class.isAssignableFrom(resource.getResource().getClass()))
+            {
+                if (resource.getMetaData().isDeleted(BinaryResourceAction.Update.class))
                 {
-                    if (resource.getMetaData().isDeleted(BinaryResourceAction.Update.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    BinaryResourceAction.Update<Object> binUpdater = (BinaryResourceAction.Update<Object>) resource.getResource();
-                    return binUpdater.updateProperty(params.getEntityId(), params.getContentInfo(), params.getStream(), params);
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-                if (BinaryResourceAction.UpdateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                BinaryResourceAction.Update<Object> binUpdater = (BinaryResourceAction.Update<Object>) resource.getResource();
+                return binUpdater.updateProperty(params.getEntityId(), params.getContentInfo(), params.getStream(), params);
+            }
+            if (BinaryResourceAction.UpdateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+            {
+                if (resource.getMetaData().isDeleted(BinaryResourceAction.UpdateWithResponse.class))
                 {
-                    if (resource.getMetaData().isDeleted(BinaryResourceAction.UpdateWithResponse.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    BinaryResourceAction.UpdateWithResponse<Object> binUpdater = (BinaryResourceAction.UpdateWithResponse<Object>) resource.getResource();
-                    return binUpdater.updateProperty(params.getEntityId(), params.getContentInfo(), params.getStream(), params, withResponse);
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-                if (RelationshipResourceBinaryAction.Update.class.isAssignableFrom(resource.getResource().getClass()))
+                BinaryResourceAction.UpdateWithResponse<Object> binUpdater = (BinaryResourceAction.UpdateWithResponse<Object>) resource.getResource();
+                return binUpdater.updateProperty(params.getEntityId(), params.getContentInfo(), params.getStream(), params, withResponse);
+            }
+            if (RelationshipResourceBinaryAction.Update.class.isAssignableFrom(resource.getResource().getClass()))
+            {
+                if (resource.getMetaData().isDeleted(RelationshipResourceBinaryAction.Update.class))
                 {
-                    if (resource.getMetaData().isDeleted(RelationshipResourceBinaryAction.Update.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    RelationshipResourceBinaryAction.Update<Object> binUpdater = (RelationshipResourceBinaryAction.Update<Object>) resource.getResource();
-                    return binUpdater.updateProperty(params.getEntityId(), params.getRelationshipId(), params.getContentInfo(), params.getStream(), params);
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-                if (RelationshipResourceBinaryAction.UpdateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+                RelationshipResourceBinaryAction.Update<Object> binUpdater = (RelationshipResourceBinaryAction.Update<Object>) resource.getResource();
+                return binUpdater.updateProperty(params.getEntityId(), params.getRelationshipId(), params.getContentInfo(), params.getStream(), params);
+            }
+            if (RelationshipResourceBinaryAction.UpdateWithResponse.class.isAssignableFrom(resource.getResource().getClass()))
+            {
+                if (resource.getMetaData().isDeleted(RelationshipResourceBinaryAction.UpdateWithResponse.class))
                 {
-                    if (resource.getMetaData().isDeleted(RelationshipResourceBinaryAction.UpdateWithResponse.class))
-                    {
-                        throw new DeletedResourceException("(UPDATE) "+resource.getMetaData().getUniqueId());
-                    }
-                    RelationshipResourceBinaryAction.UpdateWithResponse<Object> binUpdater = (RelationshipResourceBinaryAction.UpdateWithResponse<Object>) resource.getResource();
-                    return binUpdater.updateProperty(params.getEntityId(), params.getRelationshipId(), params.getContentInfo(), params.getStream(), params, withResponse);
+                    throw new DeletedResourceException("(UPDATE) " + resource.getMetaData().getUniqueId());
                 }
-            default:
-                throw new UnsupportedResourceOperationException("PUT not supported for Actions");
+                RelationshipResourceBinaryAction.UpdateWithResponse<Object> binUpdater = (RelationshipResourceBinaryAction.UpdateWithResponse<Object>) resource.getResource();
+                return binUpdater.updateProperty(params.getEntityId(), params.getRelationshipId(), params.getContentInfo(), params.getStream(), params, withResponse);
+            }
+        default:
+            throw new UnsupportedResourceOperationException("PUT not supported for Actions");
         }
     }
 

remote-api/src/test/java/org/alfresco/AppContext04TestSuite.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

remote-api/src/test/java/org/alfresco/rest/api/impl/SizeDetailsImplTest.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

remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.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

remote-api/src/test/java/org/alfresco/rest/api/tests/TestUserPreferences.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 static org.junit.Assert.fail;
 
 import java.util.*;
 
+import org.apache.commons.httpclient.HttpStatus;
+import org.junit.Test;
+
 import org.alfresco.repo.tenant.TenantUtil;
 import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
 import org.alfresco.rest.api.tests.RepoService.TestNetwork;
@@ -42,73 +45,68 @@ import org.alfresco.rest.api.tests.client.PublicApiException;
 import org.alfresco.rest.api.tests.client.RequestContext;
 import org.alfresco.rest.api.tests.client.data.Preference;
 import org.alfresco.util.GUID;
-import org.apache.commons.httpclient.HttpStatus;
-import org.junit.Test;
 
 public class TestUserPreferences extends EnterpriseTestApi
 {
-	@Test
-	public void testUserPreferences() throws Exception
-	{
-		Iterator<TestNetwork> networksIt = getTestFixture().getNetworksIt();
-		assertTrue(networksIt.hasNext());
-		final TestNetwork network1 = networksIt.next();
-		assertTrue(networksIt.hasNext());
-		final TestNetwork network2 = networksIt.next();
+    @Test
+    public void testUserPreferences() throws Exception
+    {
+        Iterator<TestNetwork> networksIt = getTestFixture().getNetworksIt();
+        assertTrue(networksIt.hasNext());
+        final TestNetwork network1 = networksIt.next();
+        assertTrue(networksIt.hasNext());
+        final TestNetwork network2 = networksIt.next();
 
-		final List<TestPerson> people = new ArrayList<TestPerson>(3);
+        final List<TestPerson> people = new ArrayList<TestPerson>(3);
 
-		// create users and some preferences
-		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
-		{
-			@Override
-			public Void doWork() throws Exception
-			{
-				TestPerson person = network1.createUser();
-				people.add(person);
-				person = network1.createUser();
-				people.add(person);
-				return null;
-			}
-		}, network1.getId());
+        // create users and some preferences
+        TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>() {
+            @Override
+            public Void doWork() throws Exception
+            {
+                TestPerson person = network1.createUser();
+                people.add(person);
+                person = network1.createUser();
+                people.add(person);
+                return null;
+            }
+        }, network1.getId());
 
-		TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>()
-		{
-			@Override
-			public Void doWork() throws Exception
-			{
-				TestPerson person = network2.createUser();
-				people.add(person);
-				return null;
-			}
-		}, network2.getId());
+        TenantUtil.runAsSystemTenant(new TenantRunAsWork<Void>() {
+            @Override
+            public Void doWork() throws Exception
+            {
+                TestPerson person = network2.createUser();
+                people.add(person);
+                return null;
+            }
+        }, network2.getId());
 
-		final TestPerson person1 = people.get(0);
-		final TestPerson person2 = people.get(1);
-		final TestPerson person3 = people.get(2);
+        final TestPerson person1 = people.get(0);
+        final TestPerson person2 = people.get(1);
+        final TestPerson person3 = people.get(2);
 
         final List<Preference> expectedPreferences = new ArrayList<Preference>();
         expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference2", String.valueOf(true)));
         expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference1", String.valueOf(true)));
         expectedPreferences.add(new Preference("org.alfresco.share.documentList.sortAscending", String.valueOf(true)));
         expectedPreferences.add(new Preference("org.alfresco.share.documentList.testPreference3", String.valueOf(true)));
-		// new preference name for issue REPO-855
-		expectedPreferences.add(new Preference("org.alfresco.ext.folders.favourites.workspace://SpacesStore/4e3d0779-388a-4b94-91e1-eab588a7da3d.createdAt", String.valueOf(true)));
+        // new preference name for issue REPO-855
+        expectedPreferences.add(new Preference("org.alfresco.ext.folders.favourites.workspace://SpacesStore/4e3d0779-388a-4b94-91e1-eab588a7da3d.createdAt", String.valueOf(true)));
 
-		TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
-		{
-			@Override
-			public Void doWork() throws Exception
-			{
-				for(Preference pref : expectedPreferences)
-				{
-					// TODO add preferences thru api
-					repoService.addPreference(person1.getId(), pref.getId(), pref.getValue());
-				}
+        TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>() {
+            @Override
+            public Void doWork() throws Exception
+            {
+                for (Preference pref : expectedPreferences)
+                {
+                    // TODO add preferences thru api
+                    repoService.addPreference(person1.getId(), pref.getId(), pref.getValue());
+                }
 
-	    		return null;
-			}
-		}, person1.getId(), network1.getId());
+                return null;
+            }
+        }, person1.getId(), network1.getId());
 
         Collections.sort(expectedPreferences);
 
@@ -120,297 +118,294 @@ public class TestUserPreferences extends EnterpriseTestApi
         // unknown user
         try
         {
-	        int skipCount = 0;
-	        int maxItems = 2;
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
-	        peopleProxy.getPreferences(GUID.generate(), createParams(paging, null));
+            int skipCount = 0;
+            int maxItems = 2;
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+            peopleProxy.getPreferences(GUID.generate(), createParams(paging, null));
 
-        	fail();
+            fail();
         }
-        catch(PublicApiException e)
+        catch (PublicApiException e)
         {
-        	assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
         }
 
         // test paging
         {
-	        int skipCount = 0;
-	        int maxItems = 2;
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
-	        ListResponse<Preference> resp = peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
-	        checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            int skipCount = 0;
+            int maxItems = 2;
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+            ListResponse<Preference> resp = peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
+            checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
         }
 
         {
-	        int skipCount = 2;
-	        int maxItems = 10;
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
-	        ListResponse<Preference> resp = peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
-	        checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            int skipCount = 2;
+            int maxItems = 10;
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+            ListResponse<Preference> resp = peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
+            checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
         }
 
         // "-me-" user
         {
-	        int skipCount = 0;
-	        int maxItems = 2;
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
-	        ListResponse<Preference> resp = peopleProxy.getPreferences(org.alfresco.rest.api.People.DEFAULT_USER, createParams(paging, null));
-	        checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            int skipCount = 0;
+            int maxItems = 2;
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+            ListResponse<Preference> resp = peopleProxy.getPreferences(org.alfresco.rest.api.People.DEFAULT_USER, createParams(paging, null));
+            checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
         }
 
-		// invalid user - 404
+        // invalid user - 404
         try
         {
-	        int skipCount = 2;
-	        int maxItems = 10;
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
-	        peopleProxy.getPreferences("invalid.user", createParams(paging, null));
-			fail("");
+            int skipCount = 2;
+            int maxItems = 10;
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+            peopleProxy.getPreferences("invalid.user", createParams(paging, null));
+            fail("");
         }
-        catch(PublicApiException e)
+        catch (PublicApiException e)
         {
-        	assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
         }
 
-		// user from another account - 401
+        // user from another account - 401
         try
         {
-	        int skipCount = 0;
-	        int maxItems = 2;
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person3.getId()));
-	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
-//	        ListResponse<Preference> resp = peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
-//	        checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
-	        peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
-	        fail();
+            int skipCount = 0;
+            int maxItems = 2;
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person3.getId()));
+            Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+            // ListResponse<Preference> resp = peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
+            // checkList(expectedPreferences.subList(skipCount, skipCount + paging.getExpectedPaging().getCount()), paging.getExpectedPaging(), resp);
+            peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
+            fail();
         }
-        catch(PublicApiException e)
+        catch (PublicApiException e)
         {
-        	assertEquals(e.getHttpResponse().getStatusCode(), HttpStatus.SC_UNAUTHORIZED);
+            assertEquals(e.getHttpResponse().getStatusCode(), HttpStatus.SC_UNAUTHORIZED);
         }
 
-		// another user from the same account - 403
+        // another user from the same account - 403
         try
         {
-	        int skipCount = 0;
-	        int maxItems = 2;
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
-	        Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
-	        peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
-	        fail();
+            int skipCount = 0;
+            int maxItems = 2;
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+            Paging paging = getPaging(skipCount, maxItems, expectedPreferences.size(), expectedPreferences.size());
+            peopleProxy.getPreferences(person1.getId(), createParams(paging, null));
+            fail();
         }
-        catch(PublicApiException e)
+        catch (PublicApiException e)
         {
-        	assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());        	
+            assertEquals(HttpStatus.SC_FORBIDDEN, e.getHttpResponse().getStatusCode());
         }
 
         // get a single preference
         // Test Case: cloud-1493
 
         {
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-	        Preference pref = expectedPreferences.get(0);
-        	Preference ret = peopleProxy.getPreference(person1.getId(), pref.getId());
-        	pref.expected(ret);
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            Preference pref = expectedPreferences.get(0);
+            Preference ret = peopleProxy.getPreference(person1.getId(), pref.getId());
+            pref.expected(ret);
         }
 
         // unknown person id
         try
         {
-	        Preference pref = expectedPreferences.get(0);
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
-        	peopleProxy.getPreference(GUID.generate(), pref.getId());
-        	fail();
+            Preference pref = expectedPreferences.get(0);
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person2.getId()));
+            peopleProxy.getPreference(GUID.generate(), pref.getId());
+            fail();
         }
-        catch(PublicApiException e)
+        catch (PublicApiException e)
         {
-        	assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
         }
 
         // unknown preference id
         try
         {
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-        	peopleProxy.getPreference(person1.getId(), GUID.generate());
-        	fail();
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            peopleProxy.getPreference(person1.getId(), GUID.generate());
+            fail();
         }
-        catch(PublicApiException e)
+        catch (PublicApiException e)
         {
-        	assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
+            assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
         }
 
         // Invalid methods
         // Test case: cloud-1968
         try
         {
-	        Preference pref = expectedPreferences.get(0);
+            Preference pref = expectedPreferences.get(0);
 
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-        	peopleProxy.create("people", person1.getId(), "preferences", pref.getId(), pref.toJSON().toString(), "Unable to POST to a preference");
-        	fail();
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            peopleProxy.create("people", person1.getId(), "preferences", pref.getId(), pref.toJSON().toString(), "Unable to POST to a preference");
+            fail();
         }
-        catch(PublicApiException e)
+        catch (PublicApiException e)
         {
-        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+        }
+
+        {
+            Preference updatedPref = new Preference("preference.to.update", "updated.value");
+
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            Preference response = peopleProxy.updatePreference(person1.getId(), updatedPref);
+
+            assertEquals(updatedPref.getId(), response.getId());
+            assertEquals(updatedPref.getValue(), response.getValue());
         }
 
         try
         {
-	        Preference pref = expectedPreferences.get(0);
+            Preference pref = expectedPreferences.get(0);
 
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-        	peopleProxy.update("people", person1.getId(), "preferences", pref.getId(), pref.toJSON().toString(), "Unable to PUT a preference");
-        	fail();
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            peopleProxy.remove("people", person1.getId(), "preferences", pref.getId(), "Unable to DELETE a preference");
+            fail();
         }
-        catch(PublicApiException e)
+        catch (PublicApiException e)
         {
-        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
         }
 
         try
         {
-	        Preference pref = expectedPreferences.get(0);
+            Preference pref = expectedPreferences.get(0);
 
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-        	peopleProxy.remove("people", person1.getId(), "preferences", pref.getId(), "Unable to DELETE a preference");
-        	fail();
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            peopleProxy.create("people", person1.getId(), "preferences", null, pref.toJSON().toString(), "Unable to POST to preferences");
+            fail();
         }
-        catch(PublicApiException e)
+        catch (PublicApiException e)
         {
-        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
         }
 
         try
         {
-	        Preference pref = expectedPreferences.get(0);
+            Preference pref = expectedPreferences.get(0);
 
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-        	peopleProxy.create("people", person1.getId(), "preferences", null, pref.toJSON().toString(), "Unable to POST to preferences");
-        	fail();
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            peopleProxy.update("people", person1.getId(), "preferences", null, pref.toJSON().toString(), "Unable to PUT preferences");
+            fail();
         }
-        catch(PublicApiException e)
+        catch (PublicApiException e)
         {
-        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
         }
 
         try
         {
-	        Preference pref = expectedPreferences.get(0);
-
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-        	peopleProxy.update("people", person1.getId(), "preferences", null, pref.toJSON().toString(), "Unable to PUT preferences");
-        	fail();
+            publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            peopleProxy.remove("people", person1.getId(), "preferences", null, "Unable to DELETE preferences");
+            fail();
         }
-        catch(PublicApiException e)
+        catch (PublicApiException e)
         {
-        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
+            assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
         }
 
-        try
         {
-	        publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-        	peopleProxy.remove("people", person1.getId(), "preferences", null, "Unable to DELETE preferences");
-        	fail();
-        }
-        catch(PublicApiException e)
-        {
-        	assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
-        }
-
-		{
-			// REPO-1061, REPO-890
-			try
-			{
-				String skipCount = "a";
-				String maxItems = "hi";
-				HashMap<String, String> params = new HashMap<String, String>();
-				params.put("skipCount", skipCount);
-				params.put("maxItems", maxItems);
-				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-				peopleProxy.getPreferences(person1.getId(), params);
-				fail();
-			}
-			catch (PublicApiException e)
-			{
-				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
-			}
-
-			try
-			{
-				String skipCount = "a";
-				String maxItems = "null";
-				HashMap<String, String> params = new HashMap<String, String>();
-				params.put("skipCount", skipCount);
-				params.put("maxItems", maxItems);
-				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-				peopleProxy.getPreferences(person1.getId(), params);
-				fail();
-			}
-			catch (PublicApiException e)
-			{
-				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
-			}
-
-			try
-			{
-				String maxItems = "Red";
-				HashMap<String, String> params = new HashMap<String, String>();
-				params.put("maxItems", maxItems);
-				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+            // REPO-1061, REPO-890
+            try
+            {
+                String skipCount = "a";
+                String maxItems = "hi";
+                HashMap<String, String> params = new HashMap<String, String>();
+                params.put("skipCount", skipCount);
+                params.put("maxItems", maxItems);
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
                 peopleProxy.getPreferences(person1.getId(), params);
-				fail();
-			}
-			catch (PublicApiException e)
-			{
-				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
-			}
+                fail();
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
 
-			try
-			{
-				String skipCount = "yuck";
-				HashMap<String, String> params = new HashMap<String, String>();
-				params.put("skipCount", skipCount);
-				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-				peopleProxy.getPreferences(person1.getId(), params);
-				fail();
-			}
-			catch (PublicApiException e)
-			{
-				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
-			}
+            try
+            {
+                String skipCount = "a";
+                String maxItems = "null";
+                HashMap<String, String> params = new HashMap<String, String>();
+                params.put("skipCount", skipCount);
+                params.put("maxItems", maxItems);
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+                peopleProxy.getPreferences(person1.getId(), params);
+                fail();
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
 
-			try
-			{
-				String skipCount = "-1";
-				HashMap<String, String> params = new HashMap<String, String>();
-				params.put("skipCount", skipCount);
-				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-				peopleProxy.getPreferences(person1.getId(), params);
-				fail();
-			}
-			catch (PublicApiException e)
-			{
-				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
-			}
+            try
+            {
+                String maxItems = "Red";
+                HashMap<String, String> params = new HashMap<String, String>();
+                params.put("maxItems", maxItems);
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+                peopleProxy.getPreferences(person1.getId(), params);
+                fail();
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
 
-			try
-			{
-				String maxItems = "0";
-				HashMap<String, String> params = new HashMap<String, String>();
-				params.put("maxItems", maxItems);
-				publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
-				peopleProxy.getPreferences(person1.getId(), params);
-				fail();
-			}
-			catch (PublicApiException e)
-			{
-				assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
-			}
-		}
-	}
+            try
+            {
+                String skipCount = "yuck";
+                HashMap<String, String> params = new HashMap<String, String>();
+                params.put("skipCount", skipCount);
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+                peopleProxy.getPreferences(person1.getId(), params);
+                fail();
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
+
+            try
+            {
+                String skipCount = "-1";
+                HashMap<String, String> params = new HashMap<String, String>();
+                params.put("skipCount", skipCount);
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+                peopleProxy.getPreferences(person1.getId(), params);
+                fail();
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
+
+            try
+            {
+                String maxItems = "0";
+                HashMap<String, String> params = new HashMap<String, String>();
+                params.put("maxItems", maxItems);
+                publicApiClient.setRequestContext(new RequestContext(network1.getId(), person1.getId()));
+                peopleProxy.getPreferences(person1.getId(), params);
+                fail();
+            }
+            catch (PublicApiException e)
+            {
+                assertEquals(HttpStatus.SC_BAD_REQUEST, e.getHttpResponse().getStatusCode());
+            }
+        }
+    }
 }