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

Co-authored-by: Belal Ansari <belal.ansari@hyland.com>

.github/workflows/ci.yml

@@ -42,12 +42,17 @@ jobs:
       !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v8.16.0
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - id: changed-files
+        uses: Alfresco/alfresco-build-tools/.github/actions/github-list-changes@v6.1.0
+        with:
+          write-list-to-env: true
+      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v6.1.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
       - name: "Prepare maven cache and check compilation"
@@ -102,16 +107,12 @@ 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: "temp-dir-for-sast/reduced.war"
+          file: "packaging/war/target/alfresco.war"
           fail_build: true
           project_name: alfresco-community-repo
           issue_details: true
@@ -129,8 +130,6 @@ 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
 
@@ -147,7 +146,7 @@ jobs:
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
-      - uses: Alfresco/ya-pmd-scan@v4.1.0
+      - uses: Alfresco/ya-pmd-scan@v4.0.0
         with:
           classpath-build-command: "mvn test-compile -ntp -Pags -pl \"-:alfresco-community-repo-docker\""
 
@@ -268,7 +267,6 @@ jobs:
       - name: "Set transformers tag"
         run: echo "TRANSFORMERS_TAG=$(mvn help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)" >> $GITHUB_ENV
       - name: "Set up the environment"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
@@ -333,7 +331,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ['10.5', '10.6']
+        version: ['10.2.18', '10.4', '10.5']
     steps:
       - uses: actions/checkout@v4
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
@@ -394,8 +392,8 @@ jobs:
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
 
-  repository_mariadb_10_11_tests:
-    name: "Repository - MariaDB 10.11 tests"
+  repository_mariadb_10_6_tests:
+    name: "Repository - MariaDB 10.6 tests"
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
@@ -412,10 +410,10 @@ jobs:
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - name: "Run MariaDB 10.11 database"
+      - name: "Run MariaDB 10.6 database"
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile mariadb up -d
         env:
-          MARIADB_VERSION: 10.11
+          MARIADB_VERSION: 10.6
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0
@@ -511,7 +509,7 @@ jobs:
           RP_OPTS: ${{ github.ref_name == 'master' && steps.rp-prepare.outputs.mvn-opts || '' }}
         run: |
           eval "args=($RP_OPTS)"
-          mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.cj.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}"
+          mvn -B test -pl repository -am -Dtest=AllDBTestsTestSuite -DfailIfNoTests=false -Ddb.driver=com.mysql.jdbc.Driver -Ddb.name=alfresco -Ddb.url=jdbc:mysql://localhost:3307/alfresco -Ddb.username=alfresco -Ddb.password=alfresco "${args[@]}"
         continue-on-error: true
       - name: "Update GitHub Step Summary"
         if: github.ref_name == 'master'
@@ -536,8 +534,8 @@ jobs:
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
 
-  repository_postgresql_14_15_tests:
-    name: "Repository - PostgreSQL 14.15 tests"
+  repository_postgresql_13_12_tests:
+    name: "Repository - PostgreSQL 13.12 tests"
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
@@ -553,10 +551,10 @@ jobs:
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - name: "Run PostgreSQL 14.15 database"
+      - name: "Run PostgreSQL 13.12 database"
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
         env:
-          POSTGRES_VERSION: 14.15
+          POSTGRES_VERSION: 13.12
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0
@@ -606,16 +604,16 @@ jobs:
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
 
-  repository_postgresql_15_10_tests:
-    name: "Repository - PostgreSQL 15.10 tests"
+  repository_postgresql_14_9_tests:
+    name: "Repository - PostgreSQL 14.9 tests"
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
       (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) && github.event_name != 'pull_request' &&
-            !contains(github.event.head_commit.message, '[skip db]')) ||
-            contains(github.event.head_commit.message, '[db]')) &&
-            !contains(github.event.head_commit.message, '[skip tests]') &&
-            !contains(github.event.head_commit.message, '[force')
+      !contains(github.event.head_commit.message, '[skip db]')) ||
+      contains(github.event.head_commit.message, '[db]')) &&
+      !contains(github.event.head_commit.message, '[skip tests]') &&
+      !contains(github.event.head_commit.message, '[force')
     steps:
       - uses: actions/checkout@v4
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
@@ -623,10 +621,10 @@ jobs:
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - name: "Run PostgreSQL 15.10 database"
+      - name: "Run PostgreSQL 14.9 database"
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
         env:
-          POSTGRES_VERSION: 15.10
+          POSTGRES_VERSION: 14.9
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0
@@ -676,8 +674,8 @@ jobs:
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
 
-  repository_postgresql_16_6_tests:
-    name: "Repository - PostgreSQL 16.6 tests"
+  repository_postgresql_15_4_tests:
+    name: "Repository - PostgreSQL 15.4 tests"
     runs-on: ubuntu-latest
     needs: [prepare]
     if: >
@@ -693,10 +691,10 @@ jobs:
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - name: "Run PostgreSQL 16.6 database"
+      - name: "Run PostgreSQL 15.4 database"
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose-db.yaml --profile postgres up -d
         env:
-          POSTGRES_VERSION: 16.6
+          POSTGRES_VERSION: 15.4
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.16.0
@@ -877,7 +875,6 @@ jobs:
             echo "HOSTNAME_VERIFICATION_DISABLED=false" >> "$GITHUB_ENV"
           fi
       - name: "Set up the environment"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
       - name: "Prepare Report Portal"
         if: github.ref_name == 'master'
@@ -979,7 +976,6 @@ jobs:
           bash ./scripts/ci/init.sh
           bash ./scripts/ci/build.sh
       - name: "Set up the environment"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
           ${{ env.TAS_SCRIPTS }}/start-compose.sh ${{ env.TAS_ENVIRONMENT }}/docker-compose-minimal+transforms.yml
           ${{ env.TAS_SCRIPTS }}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
@@ -1057,7 +1053,7 @@ jobs:
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - name: "Run Postgres 16.6 database"
+      - 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'

.github/workflows/master_release.yml

@@ -35,7 +35,7 @@ jobs:
         with:
           persist-credentials: false
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0      
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
@@ -64,7 +64,7 @@ jobs:
         with:
           persist-credentials: false
       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0      
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh

.github/workflows/precommit_formatter.yml

@@ -1,32 +0,0 @@
-name: Pre-Commit formatter
-
-on:
-  push:
-    branches:
-      - precommit/**
-
-jobs:
-  format-code:
-    name: "Reformat code"
-    runs-on: ubuntu-latest
-    if: contains(github.event.head_commit.message, '[reformat code]')
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python ${{ inputs.python-version }}
-        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
-        with:
-          python-version: "3.9"
-      - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
-        continue-on-error: true
-        with:
-          extra_args: --all-files
-      - name: Update secrets baseline
-        run: pip install detect-secrets && detect-secrets scan --baseline .secrets.baseline
-      - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.16.0
-        with:
-          username: ${{ secrets.BOT_GITHUB_USERNAME }}
-          add-options: -u
-          commit-message: "Apply Pre-Commit code formatting"
-          skip-if-no-changes: true
-      - name: Push changes
-        run: git push

.secrets.baseline

@@ -133,21 +133,21 @@
         "filename": ".github/workflows/ci.yml",
         "hashed_secret": "b86dc2f033a63f2b7b9e7d270ab806d2910d7572",
         "is_verified": false,
-        "line_number": 295
+        "line_number": 293
       },
       {
         "type": "Secret Keyword",
         "filename": ".github/workflows/ci.yml",
         "hashed_secret": "1bfb0e20f886150ba59b853bcd49dea893e00966",
         "is_verified": false,
-        "line_number": 370
+        "line_number": 368
       },
       {
         "type": "Secret Keyword",
         "filename": ".github/workflows/ci.yml",
         "hashed_secret": "128f14373ccfaff49e3664045d3a11b50cbb7b39",
         "is_verified": false,
-        "line_number": 904
+        "line_number": 901
       }
     ],
     ".github/workflows/master_release.yml": [
@@ -247,7 +247,7 @@
         "filename": "core/src/main/java/org/alfresco/encryption/AlfrescoKeyStore.java",
         "hashed_secret": "a718763bca0f328b0e7ce2a98d9e79fc271bf827",
         "is_verified": false,
-        "line_number": 34,
+        "line_number": 35,
         "is_secret": false
       }
     ],
@@ -257,7 +257,7 @@
         "filename": "core/src/main/java/org/alfresco/httpclient/HttpClientFactory.java",
         "hashed_secret": "5d3c708390e5f51413e414393d4ad2a6d0e59a45",
         "is_verified": false,
-        "line_number": 128,
+        "line_number": 126,
         "is_secret": false
       }
     ],
@@ -423,7 +423,7 @@
         "filename": "packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/AuthParameterProviderFactory.java",
         "hashed_secret": "a28cecdb5056cf30135809b921e38a84deb6c345",
         "is_verified": false,
-        "line_number": 100,
+        "line_number": 102,
         "is_secret": false
       },
       {
@@ -431,7 +431,7 @@
         "filename": "packaging/tests/tas-cmis/src/main/java/org/alfresco/cmis/AuthParameterProviderFactory.java",
         "hashed_secret": "5e39d8e2991ef9705998de26b33f11be0f3cdcde",
         "is_verified": false,
-        "line_number": 101,
+        "line_number": 103,
         "is_secret": false
       }
     ],
@@ -539,7 +539,7 @@
         "filename": "packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestSitePersonMembershipRequestModelsCollection.java",
         "hashed_secret": "8b30a14989d7b8093ac29462fe29423d836625b4",
         "is_verified": false,
-        "line_number": 33,
+        "line_number": 39,
         "is_secret": false
       }
     ],
@@ -623,7 +623,7 @@
         "filename": "remote-api/src/main/java/org/alfresco/repo/web/scripts/tenant/AbstractTenantAdminWebScript.java",
         "hashed_secret": "889d2688743fdce6115117a5ba7dbc5f33e0ce03",
         "is_verified": false,
-        "line_number": 39,
+        "line_number": 38,
         "is_secret": false
       }
     ],
@@ -633,7 +633,7 @@
         "filename": "remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java",
         "hashed_secret": "43d52295ed5cb7e2b772f2b8be9695ddde971c49",
         "is_verified": false,
-        "line_number": 60,
+        "line_number": 62,
         "is_secret": false
       },
       {
@@ -641,7 +641,7 @@
         "filename": "remote-api/src/main/java/org/alfresco/web/app/servlet/AlfrescoX509ServletFilter.java",
         "hashed_secret": "1bd5147ff91b8b1220d2f1ffde850ebabbc5ec8c",
         "is_verified": false,
-        "line_number": 61,
+        "line_number": 63,
         "is_secret": false
       }
     ],
@@ -671,7 +671,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/repo/remoteticket/RemoteAlfrescoTicketServiceTest.java",
         "hashed_secret": "a926a50b320cea0d6c008a04322627400fe33f55",
         "is_verified": false,
-        "line_number": 73,
+        "line_number": 74,
         "is_secret": false
       }
     ],
@@ -681,7 +681,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/repo/web/scripts/node/NodeWebScripTest.java",
         "hashed_secret": "a926a50b320cea0d6c008a04322627400fe33f55",
         "is_verified": false,
-        "line_number": 96,
+        "line_number": 95,
         "is_secret": false
       }
     ],
@@ -691,7 +691,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/repo/web/scripts/servlet/RemoteAuthenticatorFactoryAdminConsoleAccessTest.java",
         "hashed_secret": "4ffa743f28fc949c19e65ab045d7906d0609a2c2",
         "is_verified": false,
-        "line_number": 268,
+        "line_number": 269,
         "is_secret": false
       }
     ],
@@ -701,7 +701,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/repo/web/scripts/solr/SOLRAuthenticationFilterTest.java",
         "hashed_secret": "76ed0a056aa77060de25754586440cff390791d0",
         "is_verified": false,
-        "line_number": 59,
+        "line_number": 63,
         "is_secret": false
       }
     ],
@@ -711,7 +711,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/repo/webdav/LockMethodTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 108,
+        "line_number": 109,
         "is_secret": false
       }
     ],
@@ -731,7 +731,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 111,
+        "line_number": 120,
         "is_secret": false
       }
     ],
@@ -741,7 +741,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/RepoService.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 412,
+        "line_number": 418,
         "is_secret": false
       }
     ],
@@ -751,7 +751,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestCMIS.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 175,
+        "line_number": 182,
         "is_secret": false
       }
     ],
@@ -761,7 +761,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java",
         "hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4",
         "is_verified": false,
-        "line_number": 595,
+        "line_number": 592,
         "is_secret": false
       },
       {
@@ -769,7 +769,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java",
         "hashed_secret": "53dad674827218e94c8fe9c1984c8dd9db512a17",
         "is_verified": false,
-        "line_number": 731,
+        "line_number": 728,
         "is_secret": false
       },
       {
@@ -777,7 +777,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java",
         "hashed_secret": "be66cf01c56d963de61462f37a43df2305367216",
         "is_verified": false,
-        "line_number": 1434,
+        "line_number": 1429,
         "is_secret": false
       },
       {
@@ -785,7 +785,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java",
         "hashed_secret": "283d47a9338ed1100b5fe2a5aff2d1f7c799bfd0",
         "is_verified": false,
-        "line_number": 1435,
+        "line_number": 1430,
         "is_secret": false
       },
       {
@@ -793,7 +793,7 @@
         "filename": "remote-api/src/test/java/org/alfresco/rest/api/tests/TestPeople.java",
         "hashed_secret": "425a715491af2bbec1eef2def6fa8d79c3050401",
         "is_verified": false,
-        "line_number": 1457,
+        "line_number": 1452,
         "is_secret": false
       }
     ],
@@ -883,7 +883,7 @@
         "filename": "repository/src/main/java/org/alfresco/heartbeat/jobs/LockingJob.java",
         "hashed_secret": "b003370e1497c5003e21f1ec5da89e3d2d819506",
         "is_verified": false,
-        "line_number": 59,
+        "line_number": 60,
         "is_secret": false
       },
       {
@@ -891,7 +891,7 @@
         "filename": "repository/src/main/java/org/alfresco/heartbeat/jobs/LockingJob.java",
         "hashed_secret": "fc99e6a90240c45f46ed33a4d96a3dbecef41c60",
         "is_verified": false,
-        "line_number": 60,
+        "line_number": 61,
         "is_secret": false
       }
     ],
@@ -901,7 +901,7 @@
         "filename": "repository/src/main/java/org/alfresco/heartbeat/jobs/NonLockingJob.java",
         "hashed_secret": "b003370e1497c5003e21f1ec5da89e3d2d819506",
         "is_verified": false,
-        "line_number": 54,
+        "line_number": 52,
         "is_secret": false
       }
     ],
@@ -911,7 +911,7 @@
         "filename": "repository/src/main/java/org/alfresco/repo/admin/patch/impl/AdminUserPatch.java",
         "hashed_secret": "87a754b00f7ee047d496808125d6259104e9382a",
         "is_verified": false,
-        "line_number": 62,
+        "line_number": 60,
         "is_secret": false
       }
     ],
@@ -931,7 +931,7 @@
         "filename": "repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java",
         "hashed_secret": "a172ffc990129fe6f68b50f6037c54a1894ee3fd",
         "is_verified": false,
-        "line_number": 205,
+        "line_number": 204,
         "is_secret": false
       },
       {
@@ -939,7 +939,7 @@
         "filename": "repository/src/main/java/org/alfresco/repo/remoteconnector/RemoteConnectorServiceImpl.java",
         "hashed_secret": "a172ffc990129fe6f68b50f6037c54a1894ee3fd",
         "is_verified": false,
-        "line_number": 205,
+        "line_number": 204,
         "is_secret": false
       }
     ],
@@ -949,7 +949,7 @@
         "filename": "repository/src/main/java/org/alfresco/repo/security/authentication/ResetPasswordServiceImpl.java",
         "hashed_secret": "e25df0eeed8d8eb4e198c3464c7bf747bc26eff8",
         "is_verified": false,
-        "line_number": 91,
+        "line_number": 92,
         "is_secret": false
       }
     ],
@@ -959,7 +959,7 @@
         "filename": "repository/src/main/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java",
         "hashed_secret": "304de25a3d73b68ad408ca3843356b5cf67f6f14",
         "is_verified": false,
-        "line_number": 89,
+        "line_number": 93,
         "is_secret": false
       }
     ],
@@ -969,7 +969,7 @@
         "filename": "repository/src/main/java/org/alfresco/repo/transfer/TransferServiceImpl2.java",
         "hashed_secret": "9ae9f2be7702b726809545808a8a9ba2e5a38410",
         "is_verified": false,
-        "line_number": 129,
+        "line_number": 130,
         "is_secret": false
       }
     ],
@@ -1303,7 +1303,7 @@
         "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 86,
+        "line_number": 88,
         "is_secret": false
       },
       {
@@ -1311,7 +1311,7 @@
         "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java",
         "hashed_secret": "c464af817287343305cbd6493c593885695df531",
         "is_verified": false,
-        "line_number": 90,
+        "line_number": 92,
         "is_secret": false
       },
       {
@@ -1319,7 +1319,7 @@
         "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java",
         "hashed_secret": "8ad8572a0b3fc4cb3afc1baaebc97a2cae58eb8c",
         "is_verified": false,
-        "line_number": 91,
+        "line_number": 93,
         "is_secret": false
       },
       {
@@ -1327,7 +1327,7 @@
         "filename": "repository/src/test/java/org/alfresco/filesys/FTPServerTest.java",
         "hashed_secret": "915692b4d7465b0084354173d552ac90145dc315",
         "is_verified": false,
-        "line_number": 92,
+        "line_number": 94,
         "is_secret": false
       }
     ],
@@ -1337,7 +1337,7 @@
         "filename": "repository/src/test/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java",
         "hashed_secret": "8c85434f6f339a24b808810bd95629d0f5856355",
         "is_verified": false,
-        "line_number": 1257,
+        "line_number": 1280,
         "is_secret": false
       }
     ],
@@ -1347,7 +1347,7 @@
         "filename": "repository/src/test/java/org/alfresco/opencmis/CMISTest.java",
         "hashed_secret": "9d4e1e23bd5b727046a9e3b4b7db57bd8d6ee684",
         "is_verified": false,
-        "line_number": 4001,
+        "line_number": 4134,
         "is_secret": false
       }
     ],
@@ -1357,7 +1357,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/coci/CheckOutCheckInServiceImplTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 141,
+        "line_number": 140,
         "is_secret": false
       }
     ],
@@ -1367,7 +1367,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/i18n/MessageServiceImplTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 101,
+        "line_number": 102,
         "is_secret": false
       }
     ],
@@ -1377,7 +1377,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 116,
+        "line_number": 118,
         "is_secret": false
       }
     ],
@@ -1387,7 +1387,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 66,
+        "line_number": 68,
         "is_secret": false
       }
     ],
@@ -1397,7 +1397,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 111,
+        "line_number": 116,
         "is_secret": false
       }
     ],
@@ -1407,7 +1407,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/imap/LoadTester.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 79,
+        "line_number": 80,
         "is_secret": false
       }
     ],
@@ -1417,7 +1417,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/imap/RemoteLoadTester.java",
         "hashed_secret": "678721c0433c8cf5c9069a0e70784cf1839e866b",
         "is_verified": false,
-        "line_number": 55,
+        "line_number": 58,
         "is_secret": false
       }
     ],
@@ -1427,7 +1427,27 @@
         "filename": "repository/src/test/java/org/alfresco/repo/invitation/site/InviteSenderTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 108,
+        "line_number": 109,
+        "is_secret": false
+      }
+    ],
+    "repository/src/test/java/org/alfresco/repo/lock/LockBehaviourImplTest.java": [
+      {
+        "type": "Secret Keyword",
+        "filename": "repository/src/test/java/org/alfresco/repo/lock/LockBehaviourImplTest.java",
+        "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
+        "is_verified": false,
+        "line_number": 112,
+        "is_secret": false
+      }
+    ],
+    "repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java": [
+      {
+        "type": "Secret Keyword",
+        "filename": "repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java",
+        "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
+        "is_verified": false,
+        "line_number": 103,
         "is_secret": false
       }
     ],
@@ -1463,7 +1483,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java",
         "hashed_secret": "9e10e28cb9c3e381c13d13fa97dd97148982cdaa",
         "is_verified": false,
-        "line_number": 590,
+        "line_number": 595,
         "is_secret": false
       }
     ],
@@ -1473,7 +1493,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/notification/NotificationServiceImplSystemTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 75,
+        "line_number": 74,
         "is_secret": false
       }
     ],
@@ -1483,7 +1503,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java",
         "hashed_secret": "c60646de4c4893cf860a12ecb7ba4f5317b1a1d0",
         "is_verified": false,
-        "line_number": 62,
+        "line_number": 61,
         "is_secret": false
       },
       {
@@ -1491,7 +1511,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java",
         "hashed_secret": "c60646de4c4893cf860a12ecb7ba4f5317b1a1d0",
         "is_verified": false,
-        "line_number": 62,
+        "line_number": 61,
         "is_secret": false
       },
       {
@@ -1499,7 +1519,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/oauth1/OAuth1CredentialsStoreServiceTest.java",
         "hashed_secret": "ad8a621976e9a19cc78af501a84638a04fca9b83",
         "is_verified": false,
-        "line_number": 66,
+        "line_number": 65,
         "is_secret": false
       }
     ],
@@ -1509,7 +1529,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/oauth2/OAuth2CredentialsStoreServiceTest.java",
         "hashed_secret": "c60646de4c4893cf860a12ecb7ba4f5317b1a1d0",
         "is_verified": false,
-        "line_number": 64,
+        "line_number": 70,
         "is_secret": false
       }
     ],
@@ -1519,7 +1539,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/rendition2/AbstractRenditionIntegrationTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 128,
+        "line_number": 130,
         "is_secret": false
       }
     ],
@@ -1529,7 +1549,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 1317,
+        "line_number": 1328,
         "is_secret": false
       }
     ],
@@ -1539,7 +1559,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/AuthenticationServiceImplTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 69,
+        "line_number": 68,
         "is_secret": false
       }
     ],
@@ -1549,7 +1569,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/AuthenticationTest.java",
         "hashed_secret": "607e729c2f77c4e821e68e26b4c1f5a4398624e9",
         "is_verified": false,
-        "line_number": 2121,
+        "line_number": 2129,
         "is_secret": false
       }
     ],
@@ -1559,7 +1579,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/AuthorizationTest.java",
         "hashed_secret": "9d4e1e23bd5b727046a9e3b4b7db57bd8d6ee684",
         "is_verified": false,
-        "line_number": 36,
+        "line_number": 37,
         "is_secret": false
       }
     ],
@@ -1569,7 +1589,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/CompositePasswordEncoderTest.java",
         "hashed_secret": "4360136f24381dcec1d35d79fbf7dac4b54dfe97",
         "is_verified": false,
-        "line_number": 310,
+        "line_number": 301,
         "is_secret": false
       }
     ],
@@ -1579,7 +1599,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBeanTest.java",
         "hashed_secret": "c4b66dbe168ad1d2b19119494a0da063801bc3bb",
         "is_verified": false,
-        "line_number": 82,
+        "line_number": 83,
         "is_secret": false
       },
       {
@@ -1587,7 +1607,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/IdentityServiceFacadeFactoryBeanTest.java",
         "hashed_secret": "c5aad1895e1dcff195992938f1bcc9954d575ac9",
         "is_verified": false,
-        "line_number": 91,
+        "line_number": 92,
         "is_secret": false
       }
     ],
@@ -1597,7 +1617,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/LazyInstantiatingIdentityServiceFacadeUnitTest.java",
         "hashed_secret": "12e59296b0d17c1ceb345a7adca98574c835ba24",
         "is_verified": false,
-        "line_number": 46,
+        "line_number": 45,
         "is_secret": false
       }
     ],
@@ -1607,7 +1627,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/security/authentication/identityservice/SpringBasedIdentityServiceFacadeUnitTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 47,
+        "line_number": 46,
         "is_secret": false
       }
     ],
@@ -1627,7 +1647,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/HttpClientTransmitterImplTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 73,
+        "line_number": 75,
         "is_secret": false
       }
     ],
@@ -1637,7 +1657,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceCallbackTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 658,
+        "line_number": 664,
         "is_secret": false
       }
     ],
@@ -1647,7 +1667,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceImplTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 202,
+        "line_number": 203,
         "is_secret": false
       },
       {
@@ -1655,7 +1675,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceImplTest.java",
         "hashed_secret": "ad782ecdac770fc6eb9a62e44f90873fb97fb26b",
         "is_verified": false,
-        "line_number": 512,
+        "line_number": 513,
         "is_secret": false
       },
       {
@@ -1663,7 +1683,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceImplTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 3593,
+        "line_number": 3687,
         "is_secret": false
       }
     ],
@@ -1673,7 +1693,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java",
         "hashed_secret": "8be3c943b1609fffbfc51aad666d0a04adf83c9d",
         "is_verified": false,
-        "line_number": 2510,
+        "line_number": 2682,
         "is_secret": false
       },
       {
@@ -1681,7 +1701,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 3517,
+        "line_number": 3772,
         "is_secret": false
       }
     ],
@@ -1691,7 +1711,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/manifest/ManifestIntegrationTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 114,
+        "line_number": 115,
         "is_secret": false
       }
     ],
@@ -1701,7 +1721,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/transfer/manifest/TransferManifestTest.java",
         "hashed_secret": "5395ebfd174b0a5617e6f409dfbb3e064e3fdf0a",
         "is_verified": false,
-        "line_number": 126,
+        "line_number": 127,
         "is_secret": false
       }
     ],
@@ -1711,7 +1731,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/version/BaseVersionStoreTest.java",
         "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
         "is_verified": false,
-        "line_number": 144,
+        "line_number": 149,
         "is_secret": false
       }
     ],
@@ -1731,7 +1751,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/version/VersionServiceImplTest.java",
         "hashed_secret": "dee17075a8c96d9c57c15d56b1f64e5abc1caf0b",
         "is_verified": false,
-        "line_number": 121,
+        "line_number": 122,
         "is_secret": false
       }
     ],
@@ -1741,7 +1761,7 @@
         "filename": "repository/src/test/java/org/alfresco/util/test/junitrules/AlfrescoTenant.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 73,
+        "line_number": 67,
         "is_secret": false
       }
     ],
@@ -1751,7 +1771,7 @@
         "filename": "repository/src/test/java/org/alfresco/util/test/testusers/TestUserComponentImpl.java",
         "hashed_secret": "f73e110427648014568f7144031a6d48060eab0a",
         "is_verified": false,
-        "line_number": 63,
+        "line_number": 55,
         "is_secret": false
       }
     ],
@@ -1868,5 +1888,5 @@
       }
     ]
   },
-  "generated_at": "2025-03-17T14:00:53Z"
+  "generated_at": "2025-03-31T12:42:09Z"
 }

CONTRIBUTING.md

@@ -10,9 +10,7 @@ pre-commit install
 When you make a commit then these hooks will run and check the modified files. If it makes changes then you can review them and then `git commit` again to accept the changes.
 
 #### Code Quality
-This project uses `spotless` that enforces `alfresco-formatter.xml` to ensure code quality. 
-The code style definition file is taken always form the `master` branch of `alfresco-community-repo`. 
-All downstream projects use this code style definition file as well. 
+This project uses `spotless` that enforces `alfresco-formatter.xml` to ensure code quality.
 
 To check code-style violations you can use:
 ```bash

README.md

@@ -126,3 +126,4 @@ Please use [**this guide**](CONTRIBUTING.md) to make a contribution to the proje
 
 - [Alfresco Content Services Documentation](https://docs.alfresco.com/content-services/latest/)
 - [Alfresco Platform](https://www.hyland.com/en/products/alfresco-platform)
+

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>25.2.0.2</version>
+      <version>23.3.14.2</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>25.2.0.2</version>
+      <version>23.3.14.2</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>25.2.0.2</version>
+      <version>23.3.14.2</version>
    </parent>
 
    <build>
@@ -98,7 +98,7 @@
       <dependency>
          <groupId>com.github.docker-java</groupId>
          <artifactId>docker-java</artifactId>
-         <version>3.4.0</version>
+         <version>3.3.6</version>
          <exclusions>
             <exclusion>
                <groupId>org.bouncycastle</groupId>

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

@@ -127,7 +127,7 @@ public abstract class BaseAPI
 
     /**
      * Helper method to extract the property value for the given nodeRef and property name
-     *
+     * 
      * @param result
      * @param nodeRef
      * @param propertyName

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

@@ -28,7 +28,7 @@ package org.alfresco.rest.rm.community.model.user;
 
 /**
  * Constants for RM user capabilities
- *
+ * 
  * @author Kristijan Conkas
  * @since 2.6
  */

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

@@ -40,7 +40,7 @@ import org.alfresco.rest.core.v0.BaseAPI;
 
 /**
  * The v0 REST API for nodes
- *
+ * 
  * @author jcule
  * @since 2.7EA1
  */
@@ -58,7 +58,7 @@ public class NodeAPI extends BaseAPI
 
     /**
      * Get the node metadata using the using the node data webscript: Document List v2 Component
-     *
+     * 
      * @param username
      * @param password
      * @param nodeId

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

@@ -142,7 +142,7 @@ public class SearchAPI extends BaseAPI
 
     /**
      * Search as a user for nodes on site "rm" matching query, using SearchAPI.RM_DEFAULT_RECORD_FILTERS and sorted by sortby and returns the property value for the given nodeRef and property name
-     *
+     * 
      * @param username
      * @param password
      * @param query
@@ -238,7 +238,7 @@ public class SearchAPI extends BaseAPI
 
     /**
      * Helper method to extract list of names from search result.
-     *
+     * 
      * @param searchResult
      * @return list of document or record names in search result
      * @throws FileNotFoundException
@@ -249,7 +249,7 @@ public class SearchAPI extends BaseAPI
      */
     /**
      * Helper method to extract list of names from search result.
-     *
+     * 
      * @param searchResult
      * @return
      */
@@ -260,7 +260,7 @@ public class SearchAPI extends BaseAPI
 
     /**
      * Helper method to extract list of property values from search result for the given nodeRef.
-     *
+     * 
      * @param searchResult
      * @param nodeRef
      * @param propertyName

amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/AddToHoldsBulkV1Tests.java

@@ -134,6 +134,16 @@ public class AddToHoldsBulkV1Tests extends BaseRMRestTest
                 .until(() -> getRestAPIFactory().getSearchAPI(null).search(searchRequest).getPagination()
                         .getTotalItems() == NUMBER_OF_FILES);
 
+        RestRequestQueryModel ancestorReq = getContentFromFolderAndAllSubfoldersQuery(rootFolder.getNodeRefWithoutVersion());
+        SearchRequest ancestorSearchRequest = new SearchRequest();
+        ancestorSearchRequest.setQuery(ancestorReq);
+
+        STEP("Wait until paths are indexed.");
+        // to improve stability on CI - seems that sometimes during big load we need to wait longer for the condition
+        await().atMost(120, TimeUnit.SECONDS)
+                .until(() -> getRestAPIFactory().getSearchAPI(null).search(ancestorSearchRequest).getPagination()
+                        .getTotalItems() == NUMBER_OF_FILES);
+
         holdBulkOperation = HoldBulkOperation.builder()
                 .query(queryReq)
                 .op(HoldBulkOperationType.ADD).build();

amps/ags/rm-community/documentation/destruction/README.md

@@ -23,7 +23,7 @@ Recorded content can be explicitly destroyed whilst maintaining the original nod
 * License: Alfresco Community
 * Issue Tracker Link: [JIRA RM](https://issues.alfresco.com/jira/projects/RM/summary)
 * Contribution Model: Alfresco Closed Source
-* Documentation: [docs.alfresco.com (Records Management)](https://support.hyland.com/r/Alfresco/Alfresco-Governance-Services-Community-Edition/23.4/Alfresco-Governance-Services-Community-Edition/Introduction)
+* Documentation: [docs.alfresco.com (Records Management)](http://docs.alfresco.com/rm2.4/concepts/welcome-rm.html)
 
 *** 
 

amps/ags/rm-community/documentation/overview.md

@@ -21,18 +21,18 @@ RM is split into two main parts - a repository integration and a Share integrati
 * [Community License](../LICENSE.txt)
 * [Enterprise License](../../rm-enterprise/LICENSE.txt) (this file will only be present in clones of the Enterprise repository)
 * [Issue Tracker Link](https://issues.alfresco.com/jira/projects/RM)
-* [Community Documentation Link](https://support.hyland.com/r/Alfresco/Alfresco-Governance-Services-Community-Edition/23.4/Alfresco-Governance-Services-Community-Edition/Introduction)
-* [Enterprise Documentation Link](https://support.hyland.com/r/Alfresco/Alfresco-Governance-Services/23.4/Alfresco-Governance-Services/Introduction)
+* [Community Documentation Link](http://docs.alfresco.com/rm-community/concepts/welcome-rm.html)
+* [Enterprise Documentation Link](http://docs.alfresco.com/rm/concepts/welcome-rm.html)
 * [Contribution Model](../../CONTRIBUTING.md)
 
 *** 
 
 ### Prerequisite Knowledge
-An understanding of Alfresco Content Services is assumed. The following pages from the [developer documentation](https://support.hyland.com/r/Alfresco/Alfresco-Content-Services-Community-Edition/23.4/Alfresco-Content-Services-Community-Edition/Develop) give useful background information:
+An understanding of Alfresco Content Services is assumed. The following pages from the [developer documentation](http://docs.alfresco.com/5.2/concepts/dev-for-developers.html) give useful background information:
 
-* [ACS Architecture](https://support.hyland.com/r/Alfresco/Alfresco-Content-Services/23.4/Alfresco-Content-Services/Develop/Software-Architecture)
-* [Platform Extensions](https://support.hyland.com/r/Alfresco/Alfresco-Content-Services/23.4/Alfresco-Content-Services/Develop/Extension-Points-Overview)
-* [Share Extensions](https://support.hyland.com/r/Alfresco/Alfresco-Content-Services/23.4/Alfresco-Content-Services/Develop/Share-UI-Extension-Points)
+* [ACS Architecture](http://docs.alfresco.com/5.2/concepts/dev-arch-overview.html)
+* [Platform Extensions](http://docs.alfresco.com/5.2/concepts/dev-platform-extensions.html)
+* [Share Extensions](http://docs.alfresco.com/5.2/concepts/dev-extensions-share.html)
 
 *** 
 
@@ -44,12 +44,12 @@ The RM Share module communicates with the repository module via REST APIs. Inter
 * A DAO layer responsible for CRUD operations against the database.
 
 #### REST API
-The REST API endpoints fall into two main types - v0 (Webscripts) and v1. The [v0 API](https://support.hyland.com/r/Alfresco/Alfresco-Content-Services/23.4/Alfresco-Content-Services/Develop/In-Process-Platform-Extension-Points/Web-Scripts) is older and not recommended for integrations. The [v1 API](https://support.hyland.com/r/Alfresco/Alfresco-Content-Services/23.4/Alfresco-Content-Services/Develop/REST-API-Guide) is newer but isn't yet feature complete. If you are running RM locally then the GS API Explorer will be available at [this link](http://localhost:8080/gs-api-explorer/).
+The REST API endpoints fall into two main types - v0 (Webscripts) and v1. The [v0 API](http://docs.alfresco.com/5.2/references/dev-extension-points-webscripts.html) is older and not recommended for integrations. The [v1 API](http://docs.alfresco.com/5.1/pra/1/topics/pra-welcome-aara.html) is newer but isn't yet feature complete. If you are running RM locally then the GS API Explorer will be available at [this link](http://localhost:8080/gs-api-explorer/).
 
 Internally the GS v1 REST API is built on the [Alfresco v1 REST API framework](https://community.alfresco.com/community/ecm/blog/2016/10/11/v1-rest-api-part-1-introduction). It aims to be consistent with this in terms of behaviour and naming.
 
 #### Java Public API
-The Java service layer is fronted by a [Java Public API](https://support.hyland.com/r/Alfresco/Alfresco-Content-Services/23.4/Alfresco-Content-Services/Develop/Reference/Java-Foundation-API), which we will ensure backward compatible with previous releases. Before we remove any methods there will first be a release containing that method deprecated to allow third party integrations to migrate to a new method.  The Java Public API also includes a set of POJO objects which are needed to communicate with the services. It is easy to identify classes that are part of the Java Public API as they are annotated `@AlfrescoPublicApi`.
+The Java service layer is fronted by a [Java Public API](http://docs.alfresco.com/5.2/concepts/java-public-api-list.html), which we will ensure backward compatible with previous releases. Before we remove any methods there will first be a release containing that method deprecated to allow third party integrations to migrate to a new method.  The Java Public API also includes a set of POJO objects which are needed to communicate with the services. It is easy to identify classes that are part of the Java Public API as they are annotated `@AlfrescoPublicApi`.
 
 Each Java service will have at least four beans defined for it:
 
@@ -61,7 +61,7 @@ Each Java service will have at least four beans defined for it:
 #### DAOs
 The DAOs are not part of the Java Public API, but handle CRUD operations against RM stored data. We have some custom queries to improve performance for particularly heavy operations.
 
-We use standard Alfresco [data modelling](https://support.hyland.com/r/Alfresco/Alfresco-Content-Services/23.4/Alfresco-Content-Services/Develop/In-Process-Platform-Extension-Points/Content-Model-Extension-Point) to store RM metadata. We extend the [Alfresco patching mechanism](https://support.hyland.com/r/Alfresco/Alfresco-Content-Services/23.4/Alfresco-Content-Services/Develop/In-Process-Platform-Extension-Points/Patches) to provide community and enterprise schema upgrades.
+We use standard Alfresco [data modelling](http://docs.alfresco.com/5.2/references/dev-extension-points-content-model.html) to store RM metadata. We extend the [Alfresco patching mechanism](http://docs.alfresco.com/5.2/references/dev-extension-points-patch.html) to provide community and enterprise schema upgrades.
 
 ***
 

amps/ags/rm-community/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>25.2.0.2</version>
+      <version>23.3.14.2</version>
    </parent>
 
    <modules>

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

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

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

@@ -119,6 +119,11 @@ rm.patch.v35.holdNewChildAssocPatch.batchSize=1000
 rm.haspermissionmap.read=Read
 rm.haspermissionmap.write=WriteProperties,AddChildren,ReadContent
 
+# Extended Permissions
+# Enable matching the given username with the correct casing username when retrieving an IPR group.
+# Only needs to be used if there are owners that don't have the username in the correct casing.
+rm.extendedSecurity.enableUsernameNormalization=false
+
 #
 # Extended auto-version behaviour.  If true and other auto-version properties are satisfied, then
 # a document will be auto-versioned when its type is changed.

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/notify-records-due-for-review-email.ftl

@@ -147,4 +147,4 @@
          </tr>
       </table>
    </body>
-</html>
+</html>

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/onCreate_supersedes.js

@@ -33,9 +33,9 @@ function main()
 {
    // Log debug message
    logger.log("Record " + node.name + " has been superseded.  Sending notification");
-
+   
    // Send notification
    rmService.sendSupersededNotification(node);
 }
 
-main();
+main();

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/record-rejected-email.ftl

@@ -143,4 +143,4 @@
          </tr>
       </table>
    </body>
-</html>
+</html>

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/record-superseded-email.ftl

@@ -141,4 +141,4 @@
          </tr>
       </table>
    </body>
-</html>
+</html>

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/bootstrap/content/rma_isClosed.js

@@ -35,4 +35,4 @@ function main()
    logger.log("Sample RM script. No-op run on node " + node.name);
 }
 
-main();
+main();

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_destructionReport.html.ftl

@@ -139,4 +139,4 @@
          </tr>
       </table>
    </body>
-</html>
+</html>

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_holdReport.html.ftl

@@ -148,4 +148,4 @@
          </tr>
       </table>
    </body>
-</html>
+</html>

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_transferReport.html.ftl

@@ -110,4 +110,4 @@
          ${transferNode.properties["declaredOn"]?string(message("file.report.date.format"))?html}
       </#if>
    </div>
-</#macro>
+</#macro>

amps/ags/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml

@@ -611,6 +611,7 @@
         <property name="authorityService" ref="authorityService"/>
         <property name="permissionService" ref="permissionService"/>
         <property name="transactionService" ref="transactionService"/>
+        <property name="enableUsernameNormalization" value="${rm.extendedSecurity.enableUsernameNormalization}" />
     </bean>
 
     <bean id="ExtendedSecurityService" class="org.springframework.aop.framework.ProxyFactoryBean">

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-classes.get.json.ftl

@@ -24,4 +24,4 @@
  along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  #L%
 -->
-<#include "classes.get.json.ftl">
+<#include "classes.get.json.ftl">

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/repository/dictionary/rm-properties.get.json.ftl

@@ -24,4 +24,4 @@
  along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  #L%
 -->
-<#include "properties.get.json.ftl">
+<#include "properties.get.json.ftl">

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.delete.json.ftl

@@ -24,4 +24,4 @@
  along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  #L%
 -->
-{}
+{}

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-authorities.post.json.ftl

@@ -24,4 +24,4 @@
  along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  #L%
 -->
-{}
+{}

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/repository/roles/rm-dynamicauthorities.get.json.ftl

@@ -27,4 +27,4 @@
 {
     "responsestatus" : "${responsestatus?json_string}",
     "message" : "${message?json_string}"
-}
+}

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actionconditiondefinitions.get.json.ftl

@@ -24,4 +24,4 @@
  along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  #L%
 -->
-<#include "actionconditiondefinitions.get.json.ftl">
+<#include "actionconditiondefinitions.get.json.ftl">

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/repository/rule/rm-actiondefinitions.get.json.ftl

@@ -24,4 +24,4 @@
  along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  #L%
 -->
-<#include "actiondefinitions.get.json.ftl">
+<#include "actiondefinitions.get.json.ftl">

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/repository/schedules/rm-updaterecordschedule.get.json.ftl

@@ -27,4 +27,4 @@
 {
     "responsestatus" : "${responsestatus?json_string}",
     "message" : "${message?json_string}"
-}
+}

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/repository/substitutionsuggestions/rm-substitutionsuggestions.get.json.ftl

@@ -31,4 +31,4 @@
 		"${substitution}"<#if substitution_has_next>,</#if>
 	</#list>
 	]
-}
+}

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/repository/version/rm-version.get.js

@@ -99,10 +99,10 @@ function main()
             {
                version = versionHistory[i];
                p = getPerson(version.creator);
-
+               
                recordNodeRef = version.getVersionProperty("recordNodeRef");
                isRecordedVersionDestroyed = version.getVersionProperty("RecordedVersionDestroyed");
-
+               
                versions[versions.length] =
                {
                   nodeRef: version.node.nodeRef.toString(),
@@ -148,4 +148,4 @@ function main()
    model.versions = versions;
 }
 
-main();
+main();

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/repository/version/rm-version.get.json.ftl

@@ -45,4 +45,4 @@
    }<#if (v_has_next)>,</#if>
 </#list>
 ]
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.delete.json.ftl

@@ -30,4 +30,4 @@
 {
    "data": <@emailmapLib.emailmapJSON emailmap=emailmap />
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.get.json.ftl

@@ -30,4 +30,4 @@
 {
    "data": <@emailmapLib.emailmapJSON emailmap=emailmap />
 }
-</#escape>
+</#escape>

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

@@ -37,4 +37,4 @@
       ]
    }
 </#escape>
-</#macro>
+</#macro>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmap.post.json.ftl

@@ -30,4 +30,4 @@
 {
    "data": <@emailmapLib.emailmapJSON emailmap=emailmap />
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/emailmapkeys.get.json.ftl

@@ -36,4 +36,4 @@
       ]
    }
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint-utils.js

@@ -41,4 +41,4 @@ function existsTitle(caveatConfig, title)
    }
 
    return alreadyExists;
-}
+}

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.js

@@ -26,19 +26,19 @@
  */
 /**
  * Delete the rm constraint list
- */
+ */ 
 function main()
 {
    // Get the shortname
    var shortName = url.extension;
-
+   
    // Get the constraint
    var constraint = caveatConfig.getConstraint(shortName);
-
+   
    if (constraint != null)
    {
       caveatConfig.deleteConstraintList(shortName);
-
+      
       // Pass the constraint name to the template
       model.constraintName = shortName;
    }
@@ -50,4 +50,4 @@ function main()
    }
 }
 
-main();
+main();

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.delete.json.ftl

@@ -28,4 +28,4 @@
 {
    "data": { }
 }
-</#escape>
+</#escape>

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

@@ -26,15 +26,15 @@
  */
 /**
  * Get the detail of the rm constraint
- */
+ */ 
 function main()
 {
    // Get the shortname
    var shortName = url.extension;
-
+   
    // Get the constraint
    var constraint = caveatConfig.getConstraint(shortName);
-
+   
    if (constraint != null)
    {
       // Pass the constraint detail to the template
@@ -48,4 +48,4 @@ function main()
    }
 }
 
-main();
+main();

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.get.json.ftl

@@ -31,4 +31,4 @@
 	"data": <@rmconstraintLib.constraintJSON constraint=constraint />
         
 }
-</#escape>
+</#escape>

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

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

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.json.ftl

@@ -34,4 +34,4 @@
       "message" : "${msg(errorMessage, title)}"
    </#if>
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraint.put.json.js

@@ -84,4 +84,4 @@ function main()
    }
 }
 
-main();
+main();

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

@@ -26,14 +26,14 @@
  */
 /**
  * List the names of the rm constraints
- */
+ */ 
 function main()
 {
    var wel = true;
    var withEmptyLists = args["withEmptyLists"];
    // Pass the information to the template
    if (withEmptyLists != null && withEmptyLists === 'false')
-   {
+   {		
 	  model.constraints = caveatConfig.constraintsWithoutEmptyList;
    }
    else
@@ -42,4 +42,4 @@ function main()
    }
 }
 
-main();
+main();

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.get.json.ftl

@@ -36,4 +36,4 @@
 		</#list>
 	]
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.json.ftl

@@ -34,4 +34,4 @@
 	   "message" : "${msg(errorMessage, title)}"
 	</#if>
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/rmconstraints.post.json.js

@@ -78,4 +78,4 @@ function main()
    model.constraint = caveatConfig.createConstraint(name, title, allowedValues);
 }
 
-main();
+main();

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

@@ -26,15 +26,15 @@
  */
 /**
  * Get the detail of the rm constraint
- */
+ */ 
 function main()
 {
    var urlElements = url.extension.split("/");
    var shortName = urlElements[0];
-
+   
    // Get the constraint
    var constraint = caveatConfig.getConstraint(shortName);
-
+   
    if (constraint != null)
    {
       // Pass the constraint detail to the template
@@ -48,4 +48,4 @@ function main()
    }
 }
 
-main();
+main();

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.get.json.ftl

@@ -30,4 +30,4 @@
 {
 	"data":  <@rmconstraintLib.constraintWithValuesJSON constraint=constraint />
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.json.ftl

@@ -30,4 +30,4 @@
 {
 	"data": <@rmconstraintLib.constraintWithValuesJSON constraint=constraint />
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraint.post.json.js

@@ -26,33 +26,33 @@
  */
 /**
  * Update the details of a value in an rm constraint
- */
+ */ 
 function main()
 {
    var urlElements = url.extension.split("/");
    var shortName = urlElements[0];
-
+   
    var values = null;
-
+   
    if (json.has("values"))
    {
       values = json.getJSONArray("values");
    }
-
+   
    if (values == null)
    {
       status.setCode(status.STATUS_BAD_REQUEST, "Values missing");
       return;
    }
-
+  
    // Get the constraint
    var constraint = caveatConfig.getConstraint(shortName);
-
+   
    if (constraint != null)
    {
-      constraint.updateValues(values);
+      constraint.updateValues(values); 
       model.constraint = caveatConfig.getConstraint(shortName);
-      model.constraintName = shortName;
+      model.constraintName = shortName; 
    }
    else
    {
@@ -62,4 +62,4 @@ function main()
    }
 }
 
-main();
+main();

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.js

@@ -26,13 +26,13 @@
  */
 /**
  * Delete the rm constraint list
- */
+ */ 
 function main()
 {
    var urlElements = url.extension.split("/");
    var shortName = urlElements[0];
    var authorityName = urlElements[1];
-
+   
    if (shortName == null)
    {
       status.setCode(status.STATUS_BAD_REQUEST, "shortName missing");
@@ -43,16 +43,16 @@ function main()
       status.setCode(status.STATUS_BAD_REQUEST, "value missing");
       return;
    }
-
+   
    // Get the constraint
    var constraint = caveatConfig.getConstraint(shortName);
-
+   
    if (constraint != null)
    {
       caveatConfig.deleteRMConstraintListValue(shortName, valueName);
-
+      
       var constraint = caveatConfig.getConstraint(shortName);
-
+      
       // Pass the constraint name to the template
       model.constraint = constraint;
    }
@@ -64,4 +64,4 @@ function main()
    }
 }
 
-main();
+main();

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.delete.json.ftl

@@ -30,4 +30,4 @@
 {
 	"data": <@rmconstraintLib.constraintWithValuesJSON constraint=constraint />
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.js

@@ -26,28 +26,28 @@
  */
 /**
  * Get the detail of the rm constraint
- */
+ */ 
 function main()
 {
    var urlElements = url.extension.split("/");
    var shortName = decodeURIComponent(urlElements[0]);
    var valueName = decodeURIComponent(urlElements[2])
-
+   
    // Get the constraint
    var constraint = caveatConfig.getConstraint(shortName);
-
+   
    if (constraint != null)
    {
       // Pass the constraint detail to the template
       var value = constraint.getValue(valueName);
-
+      
       if(value == null)
       {
          // Return 404
          status.setCode(404, "Constraint List: " + shortName + " value: " + valueName + "does not exist");
          return;
       }
-
+      
       model.value = value;
       model.constraint = constraint;
    }
@@ -59,4 +59,4 @@ function main()
    }
 }
 
-main();
+main();

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmconstraint/values/rmconstraintvalue.get.json.ftl

@@ -30,4 +30,4 @@
 {
 	"data":  <@rmconstraintLib.constraintWithValueJSON constraint=constraint value=value/>
 }
-</#escape>
+</#escape>

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

@@ -24,4 +24,4 @@
  along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  #L%
 -->
-{}
+{}

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

@@ -31,4 +31,4 @@
 	"data":
     <@rmEventLib.eventJSON event=event />
 }
-</#escape>
+</#escape>

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

@@ -34,4 +34,5 @@
     "eventType":"${event.type}"
 }
 </#escape>
-</#macro>
+</#macro>
+

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

@@ -31,4 +31,4 @@
 	"data":
     <@rmEventLib.eventJSON event=event />
 }
-</#escape>
+</#escape>

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

@@ -36,4 +36,4 @@
 		</#list>
 	}
 }
-</#escape>
+</#escape>

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

@@ -32,4 +32,4 @@
 	<@rmEventLib.eventJSON event=event />
 	}
 }
-</#escape>
+</#escape>

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

@@ -39,4 +39,4 @@
 		</#list>
 	}
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.delete.json.ftl

@@ -24,4 +24,4 @@
  along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  #L%
 -->
-{}
+{}

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.get.json.ftl

@@ -31,4 +31,4 @@
 	"data":
 	<@rmRoleLib.roleJSON role=role />
 }
-</#escape>
+</#escape>

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

@@ -62,4 +62,4 @@
    </#if>
 }
 </#escape>
-</#macro>
+</#macro>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmrole.put.json.ftl

@@ -31,4 +31,4 @@
 	"data":
 	<@rmRoleLib.roleJSON role=role />
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.get.json.ftl

@@ -36,4 +36,4 @@
 		</#list>
 	}
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/admin/rmrole/rmroles.post.json.ftl

@@ -31,4 +31,4 @@
 	"data":
 	<@rmRoleLib.roleJSON role=role />
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/applydodcertmodelfixes.get.json.ftl

@@ -28,4 +28,4 @@
 {
     "success": ${success?string}
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/applyfixmob1573.get.json.ftl

@@ -28,4 +28,4 @@
 {
     "success": ${success?string}
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/bootstraptestdata.get.json.ftl

@@ -28,4 +28,4 @@
 {
     "success": ${success?string}
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/capability/capabilities.get.json.ftl

@@ -56,4 +56,4 @@
       ]
       </#if>
    }
-}
+}

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/customisable.get.json.ftl

@@ -37,4 +37,4 @@
 		</#list>
 	]
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.delete.json.ftl

@@ -31,4 +31,4 @@
 		"customProperty": "${propertyqname}"
 	}
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.post.json.ftl

@@ -30,4 +30,4 @@
       "url": "${url!""}",
       "message": "${errorMessage!""}"
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinition.put.json.ftl

@@ -30,4 +30,4 @@
     "url": "${url!""}",
     "message": "${errorMessage!""}"
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinitions.get.json.ftl

@@ -66,4 +66,4 @@
       }
    }
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/customref.delete.json.ftl

@@ -26,4 +26,4 @@
 -->
 {
     "success": ${success?string}
-}
+}

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/customref.post.json.ftl

@@ -28,4 +28,4 @@
 {
     "success": ${success?string}
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.post.json.ftl

@@ -33,4 +33,4 @@
         "url": "${url?string}"
     }
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinition.put.json.ftl

@@ -29,4 +29,4 @@
     "refId": "${refId}",
     "url": "${url}"
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/customrefdefinitions.get.json.ftl

@@ -39,4 +39,4 @@
         ]
 	}
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/customrefs.get.json.ftl

@@ -50,4 +50,4 @@
 		]
 	}
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/dataset.post.json.ftl

@@ -29,4 +29,4 @@
    "success": ${success?string},
    "message": "${message}"
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/datasets.get.json.ftl

@@ -38,4 +38,4 @@
          </#list>
       ]
    }
-}
+}

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.delete.json.ftl

@@ -24,4 +24,4 @@
  along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  #L%
 -->
-<#include "dispositionschedule.get.json.ftl">
+<#include "dispositionschedule.get.json.ftl">

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

@@ -42,4 +42,4 @@
 		"eligibleOnFirstCompleteEvent": ${action.eligibleOnFirstCompleteEvent?string}
 	}
 </#escape>
-</#macro>
+</#macro>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinition.put.json.ftl

@@ -28,4 +28,4 @@
 {
 	"data":
 	<@actionDefLib.actionJSON action=action/>
-}
+}

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionactiondefinitions.post.json.ftl

@@ -28,4 +28,4 @@
 {
 	"data":
 	<@actionDefLib.actionJSON action=action/>
-}
+}

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionlifecycle.get.json.ftl

@@ -63,4 +63,4 @@
       </#if>
    }
 }
-</#escape>
+</#escape>

amps/ags/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionproperties.get.json.ftl

@@ -37,4 +37,4 @@
 		  </#list>
 	  ]
    }
-}
+}