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

backport MNT-24776 to 23.N

.github/workflows/ci.yml

@@ -47,6 +47,10 @@ 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
+      - id: changed-files
+        uses: Alfresco/alfresco-build-tools/.github/actions/github-list-changes@v8.16.0
+        with:
+          write-list-to-env: true
       - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v8.16.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
@@ -102,16 +106,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 +129,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
 
@@ -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
@@ -1057,7 +1055,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

@@ -34,12 +34,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.13.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/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
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.16.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@v8.13.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.13.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/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
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.13.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.16.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": 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": 902
       }
     ],
     ".github/workflows/master_release.yml": [
@@ -1273,7 +1273,7 @@
         "filename": "repository/src/main/resources/alfresco/repository.properties",
         "hashed_secret": "84551ae5442affc9f1a2d3b4c86ae8b24860149d",
         "is_verified": false,
-        "line_number": 770,
+        "line_number": 771,
         "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
       }
     ],
@@ -1431,6 +1431,26 @@
         "is_secret": false
       }
     ],
+    "repository/src/test/java/org/alfresco/repo/lock/LockBehaviourImplTest.java": [
+      {
+        "type": "Secret Keyword",
+        "filename": "repository/src/test/java/org/alfresco/repo/lock/LockBehaviourImplTest.java",
+        "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
+        "is_verified": false,
+        "line_number": 112,
+        "is_secret": false
+      }
+    ],
+    "repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java": [
+      {
+        "type": "Secret Keyword",
+        "filename": "repository/src/test/java/org/alfresco/repo/lock/LockServiceImplTest.java",
+        "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
+        "is_verified": false,
+        "line_number": 103,
+        "is_secret": false
+      }
+    ],
     "repository/src/test/java/org/alfresco/repo/management/JmxDumpUtilTest.java": [
       {
         "type": "Secret Keyword",
@@ -1519,7 +1539,7 @@
         "filename": "repository/src/test/java/org/alfresco/repo/rendition2/AbstractRenditionIntegrationTest.java",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 127,
+        "line_number": 130,
         "is_secret": false
       }
     ],
@@ -1868,5 +1888,5 @@
       }
     ]
   },
-  "generated_at": "2025-05-13T13:17:41Z"
+  "generated_at": "2025-05-15T21:47:13Z"
 }

amps/ags/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>25.1.2.1</version>
+      <version>23.6.0.21</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.1.2.1</version>
+      <version>23.6.0.21</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.1.2.1</version>
+      <version>23.6.0.21</version>
    </parent>
 
    <build>

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

@@ -59,4 +59,4 @@ public class RMRestProperties extends RestProperties
 
     @Value ("${docker.host}")
     private String dockerHost;
-}
+}

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

@@ -177,4 +177,4 @@ public class RMRestWrapper
     {
         return restWrapper.processHtmlResponse(simpleRequest);
     }
-}
+}

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

@@ -265,4 +265,4 @@ public class RestAPIFactory
     {
         return getGSCoreAPI(userModel).usingRetentionScheduleAPI();
     }
-}
+}

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

@@ -91,4 +91,4 @@ public class SearchRequestBuilder extends SearchRequest
         return this;
     }
 
-}
+}

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

@@ -118,4 +118,4 @@ public class APIUtils
         }
         return null;
     }
-}
+}

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

@@ -832,4 +832,4 @@ public abstract class BaseAPI
     {
         return FILE_PLAN_PATH;
     }
-}
+}

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

@@ -46,4 +46,4 @@ public enum RMEvents
     {
         return eventName;
     }
-}
+}

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

@@ -86,4 +86,4 @@ public class AuditEntry extends TestModel
     @JsonProperty (required = true)
     private String timestamp;
 
-}
+}

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

@@ -59,4 +59,4 @@ public enum AuditEvents
         this.event = event;
         this.eventDisplayName = displayName;
     }
-}
+}

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

@@ -58,4 +58,4 @@ public class IdNamePair
 
     @JsonProperty (required = true)
     private String nodeType;
-}
+}

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

@@ -48,4 +48,4 @@ import org.alfresco.utility.model.TestModel;
 public class Owner extends TestModel
 {
 
-}
+}

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

@@ -59,4 +59,4 @@ public class Path extends TestModel
 
     @JsonProperty (required = true)
     private List<IdNamePair> elements;
-}
+}

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

@@ -50,4 +50,4 @@ public class ReviewPeriod
 
     @JsonProperty (required = true)
     private String expression;
-}
+}

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

@@ -60,4 +60,4 @@ public enum CustomDefinitions
     {
         return definition;
     }
-}
+}

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

@@ -96,4 +96,4 @@ public class FilePlan extends TestModel
 
     @JsonProperty
     private Path path;
-}
+}

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

@@ -79,4 +79,4 @@ public class FilePlanProperties extends TestModel
 
     @JsonProperty (PROPERTIES_DESCRIPTION)
     private String description;
-}
+}

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

@@ -37,4 +37,4 @@ public class FilePlanComponentAlias
     public static final String FILE_PLAN_ALIAS = "-filePlan-";
     public static final String TRANSFERS_ALIAS = "-transfers-";
     public static final String UNFILED_RECORDS_CONTAINER_ALIAS = "-unfiled-";
-}
+}

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

@@ -65,4 +65,4 @@ public class FilePlanComponentAspects
 
     // WORM Lock aspect
     public static final String ASPECT_WORM_LOCK = "rme:wormLock";
-}
+}

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

@@ -135,4 +135,4 @@ public class FilePlanComponentFields
     public static final String PROPERTIES_STORE = "cm:storeName";
     /** WORM Unlock Date */
     public static final String PROPERTIES_WORM_UNLOCK_DATE = "rme:wormUnlockDate";
-}
+}

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

@@ -45,4 +45,4 @@ public class FilePlanComponentType
     public static final String FOLDER_TYPE = "cm:folder";
     public static final String CONTENT_TYPE = "cm:content";
     public static final String NON_ELECTRONIC_RECORD_TYPE = "rma:nonElectronicDocument";
-}
+}

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

@@ -38,4 +38,4 @@ import lombok.NoArgsConstructor;
 public class BulkBodyCancel
 {
     private String reason;
-}
+}

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

@@ -80,4 +80,4 @@ public class Hold extends TestModel
     {
         return Objects.hash(id, name, description, reason);
     }
-}
+}

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

@@ -56,4 +56,4 @@ public class HoldBulkOperation extends TestModel
     @JsonProperty(required = true)
     private HoldBulkOperationType op;
 
-}
+}

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

@@ -47,4 +47,4 @@ public class HoldBulkOperationEntry
     private String bulkStatusId;
 
     private long totalItems;
-}
+}

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

@@ -64,4 +64,4 @@ public class HoldBulkStatus extends TestModel
     private String cancellationReason;
 
     private HoldBulkOperation holdBulkOperation;
-}
+}

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

@@ -35,4 +35,4 @@ import org.alfresco.rest.core.RestModels;
  */
 public class HoldBulkStatusCollection extends RestModels<HoldBulkStatusEntry, HoldBulkStatusCollection>
 {
-}
+}

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

@@ -43,4 +43,4 @@ import org.alfresco.rest.core.RestModels;
 public class HoldBulkStatusEntry extends RestModels<HoldBulkStatus, HoldBulkStatusEntry>
 {
     private HoldBulkStatus entry;
-}
+}

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

@@ -49,4 +49,4 @@ public class HoldChild extends TestModel
 {
     @JsonProperty(required = true)
     private String id;
-}
+}

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

@@ -35,4 +35,4 @@ import org.alfresco.rest.core.RestModels;
  */
 public class HoldChildCollection extends RestModels<HoldChildEntry, HoldChildCollection>
 {
-}
+}

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

@@ -49,4 +49,4 @@ public class HoldChildEntry extends RestModels<Hold, HoldChildEntry>
 {
     @JsonProperty
     private HoldChild entry;
-}
+}

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

@@ -35,4 +35,4 @@ import org.alfresco.rest.core.RestModels;
  */
 public class HoldCollection extends RestModels<HoldEntry, HoldCollection>
 {
-}
+}

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

@@ -49,4 +49,4 @@ public class HoldDeletionReason extends TestModel
 {
     @JsonProperty
     private String reason;
-}
+}

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

@@ -49,4 +49,4 @@ public class HoldDeletionReasonEntry extends RestModels<HoldDeletionReason, Hold
 {
     @JsonProperty
     private HoldDeletionReason entry;
-}
+}

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

@@ -49,4 +49,4 @@ public class HoldEntry extends RestModels<Hold, HoldEntry>
 {
     @JsonProperty
     private Hold entry;
-}
+}

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

@@ -53,4 +53,4 @@ public class HoldEntry extends TestModel
 
     @JsonProperty (required = true)
     private String nodeRef;
-}
+}

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

@@ -126,4 +126,4 @@ public class Record extends TestModel implements IRestModel<RestNodeModel>
     {
         return model;
     }
-}
+}

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

@@ -51,4 +51,4 @@ public class RecordBodyFile extends TestModel
 {
     @JsonProperty
     private String targetParentId;
-}
+}

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

@@ -61,4 +61,4 @@ public class RecordContent extends TestModel
 
     @JsonProperty (required = true)
     private String encoding;
-}
+}

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

@@ -269,4 +269,4 @@ public class RecordProperties extends TestModel
 
     @JsonProperty(PROPERTIES_WORM_UNLOCK_DATE)
     private Date wormUnlockDate;
-}
+}

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

@@ -100,4 +100,4 @@ public class RecordCategory extends TestModel
 
     @JsonProperty
     private Path path;
-}
+}

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

@@ -111,4 +111,4 @@ public class RecordCategoryChild extends TestModel
 
     @JsonProperty
     private String relativePath;
-}
+}

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

@@ -38,4 +38,4 @@ import org.alfresco.rest.core.RestModels;
 public class RecordCategoryChildCollection extends RestModels<RecordCategoryChildEntry, RecordCategoryChildCollection>
 {
 
-}
+}

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

@@ -45,4 +45,4 @@ public class RecordCategoryChildEntry extends RestModels<RecordCategory, RecordC
 {
     @JsonProperty
     private RecordCategoryChild entry;
-}
+}

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

@@ -140,4 +140,4 @@ public class RecordCategoryChildProperties extends TestModel
     @JsonProperty (PROPERTIES_OWNER)
     private Owner owner;
 
-}
+}

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

@@ -38,4 +38,4 @@ import org.alfresco.rest.core.RestModels;
 public class RecordCategoryCollection extends RestModels<RecordCategoryEntry, RecordCategoryCollection>
 {
 
-}
+}

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

@@ -47,4 +47,4 @@ public class RecordCategoryEntry extends RestModels<FilePlan, RecordCategoryEntr
 {
     @JsonProperty
     private RecordCategory entry;
-}
+}

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

@@ -97,4 +97,4 @@ public class RecordCategoryProperties extends TestModel
 
     @JsonProperty (PROPERTIES_CLASSIFICATION)
     private List<String> classification;
-}
+}

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

@@ -49,4 +49,4 @@ public enum RetentionPeriodProperty
     {
         return periodProperty;
     }
-}
+}

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

@@ -97,4 +97,4 @@ public class RecordFolder extends TestModel
 
     @JsonProperty
     private Path path;
-}
+}

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

@@ -38,4 +38,4 @@ import org.alfresco.rest.core.RestModels;
 public class RecordFolderCollection extends RestModels<RecordFolderEntry, RecordFolderCollection>
 {
 
-}
+}

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

@@ -52,4 +52,4 @@ public class RecordFolderEntry extends RestModels<RecordFolder, RecordFolderEntr
 {
     @JsonProperty
     private Record entry;
-}
+}

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

@@ -131,4 +131,4 @@ public class RecordFolderProperties extends TestModel
     @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS)
     private String recordSearchDispositionInstructions;
 
-}
+}

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

@@ -55,4 +55,4 @@ public class RetentionSchedule extends TestModel
     public void setIsRecordLevel(boolean recordLevel) {
         isRecordLevel = recordLevel;
     }
-}
+}

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

@@ -47,4 +47,4 @@ public class RetentionScheduleActionDefinition
     private boolean retainRecordMetadataAfterDestruction;
     private String location;
     private int index;
-}
+}

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

@@ -29,4 +29,4 @@ package org.alfresco.rest.rm.community.model.retentionschedule;
 import org.alfresco.rest.core.RestModels;
 public class RetentionScheduleCollection extends RestModels<RetentionScheduleEntry, RetentionScheduleCollection>
 {
-}
+}

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

@@ -34,4 +34,4 @@ public class RetentionScheduleEntry extends RestModels<RetentionSchedule, Retent
 {
     @JsonProperty
     private RetentionSchedule entry;
-}
+}

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

@@ -30,4 +30,4 @@ import org.alfresco.rest.core.RestModels;
 
 public class RetentionScheduleStepCollection extends RestModels<RetentionScheduleStepEntry, RetentionScheduleStepCollection>
 {
-}
+}

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

@@ -35,4 +35,4 @@ public class RetentionScheduleStepEntry extends RestModels<RetentionScheduleActi
 {
     @JsonProperty
     private RetentionScheduleActionDefinition entry;
-}
+}

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

@@ -63,4 +63,4 @@ public enum ActionsOnRule
     {
         return actionValue;
     }
-}
+}

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

@@ -45,4 +45,4 @@ public enum ConditionsOnRule
     {
             return whenConditionValue;
     }
-}
+}

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

@@ -199,4 +199,5 @@ public class RuleDefinition
         this.actions = actions;
         return this;
     }
-}
+}
+

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

@@ -59,4 +59,4 @@ public class RMSite extends RestSiteModel
         this.setDescription(description);
         this.compliance = compliance;
     }
-}
+}

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

@@ -36,4 +36,4 @@ public enum RMSiteCompliance
 {
     STANDARD,
     DOD5015
-}
+}

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

@@ -49,4 +49,4 @@ public class RMSiteFields
     public static final String DESCRIPTION = "description";
     public static final String VISIBILITY ="visibility";
     public static final String ROLE = "role";
-}
+}

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

@@ -85,4 +85,4 @@ public class Transfer extends TestModel
     /************************/
     @JsonProperty
     private List<String> allowableOperations;
-}
+}

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

@@ -107,4 +107,4 @@ public class TransferChild extends TestModel
 
     @JsonProperty
     private Path path;
-}
+}

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

@@ -37,4 +37,4 @@ import org.alfresco.rest.core.RestModels;
 public class TransferChildCollection extends RestModels<TransferChildEntry, TransferChildCollection>
 {
 
-}
+}

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

@@ -52,4 +52,4 @@ public class TransferChildEntry extends RestModels<Transfer, TransferChildEntry>
 {
     @JsonProperty
     private TransferChild entry;
-}
+}

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

@@ -216,4 +216,4 @@ public class TransferChildProperties extends TestModel
 
     @JsonProperty (PROPERTIES_OWNER)
     private Owner owner;
-}
+}

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

@@ -37,4 +37,4 @@ import org.alfresco.rest.core.RestModels;
 public class TransferCollection extends RestModels<TransferEntry, TransferCollection>
 {
 
-}
+}

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

@@ -53,4 +53,4 @@ public class TransferEntry extends RestModels<TransferContainer, TransferEntry>
 {
     @JsonProperty
     private Transfer entry;
-}
+}

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

@@ -81,4 +81,4 @@ public class TransferProperties extends TestModel
 
     @JsonProperty (PROPERTIES_ACCESSION_INDICATOR)
     private Boolean accessionIndicator;
-}
+}

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

@@ -91,4 +91,4 @@ public class TransferContainer extends TestModel
     /************************/
     @JsonProperty
     private List<String> allowableOperations;
-}
+}

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

@@ -69,4 +69,4 @@ public class TransferContainerProperties extends TestModel
     @JsonProperty (PROPERTIES_COUNT)
     private Integer count;
 
-}
+}

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

@@ -94,4 +94,4 @@ public class UnfiledContainer extends TestModel
 
     @JsonProperty
     private Path path;
-}
+}

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

@@ -115,4 +115,4 @@ public class UnfiledContainerChild extends TestModel
 
     @JsonProperty
     private Boolean isCompleted;
-}
+}

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

@@ -38,4 +38,4 @@ import org.alfresco.rest.core.RestModels;
 public class UnfiledContainerChildCollection extends RestModels<UnfiledContainerChildEntry, UnfiledContainerChildCollection>
 {
 
-}
+}

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

@@ -45,4 +45,4 @@ public class UnfiledContainerChildEntry extends RestModels<UnfiledContainer, Unf
 {
     @JsonProperty
     private UnfiledContainerChild entry;
-}
+}

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

@@ -191,4 +191,4 @@ public class UnfiledContainerChildProperties extends TestModel
 
     @JsonProperty (PROPERTIES_OWNER)
     private Owner owner;
-}
+}

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

@@ -62,4 +62,4 @@ public class UnfiledContainerProperties extends TestModel
 
     @JsonProperty (required = true, value = PROPERTIES_ROOT_NODE_REF)
     private String rootNodeRef;
-}
+}

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

@@ -110,4 +110,4 @@ public class UnfiledRecordFolder extends TestModel
 
     @JsonProperty
     private Boolean isCompleted;
-}
+}

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

@@ -39,4 +39,4 @@ public class UserCapabilities
     public static final String VIEW_RECORDS_CAP = "ViewRecords";
     /** The id of the declare records capability. */
     public static final String DECLARE_RECORDS_CAP = "DeclareRecords";
-}
+}

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

@@ -44,4 +44,4 @@ public enum UserPermissions
     {
         this.permissionId = permissionId;
     }
-}
+}

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

@@ -52,4 +52,4 @@ public enum UserRoles
     }
 
 
-}
+}

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

@@ -55,4 +55,4 @@ public abstract class RMModelRequest<Request> extends ModelRequest<Request>
         super(rmRestWrapper.getRestWrapper());
         setRmRestWrapper(rmRestWrapper);
     }
-}
+}

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

@@ -199,4 +199,4 @@ public class GSCoreAPI extends RMModelRequest
     {
         return new RetentionScheduleAPI(getRmRestWrapper());
     }
-}
+}

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

@@ -131,4 +131,4 @@ public class ActionsExecutionAPI extends RMModelRequest
                                  .executeAction(ActionsOnRule.WORM_LOCK.getActionValue(), targetNode,
                                          ImmutableMap.of("retentionPeriod", String.valueOf(retentionPeriod)));
     }
-}
+}

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

@@ -285,4 +285,4 @@ public class FilePlanAPI extends RMModelRequest
     {
         return getHolds(filePlanId, EMPTY);
     }
-}
+}

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

@@ -70,4 +70,5 @@ public class FilesAPI extends RMModelRequest<FilesAPI>
             getRmRestWrapper().getParameters()
         ));
     }
-}
+}
+

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

@@ -443,4 +443,4 @@ public class HoldsAPI extends RMModelRequest
 
         cancelBulkOperation(holdId, bulkStatusId, bulkBodyCancel, EMPTY);
     }
-}
+}

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

@@ -163,4 +163,4 @@ public class RMSiteAPI extends RMModelRequest
         getSite();
         return getRmRestWrapper().getStatusCode().equals(String.valueOf(OK.value()));
     }
-}
+}

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

@@ -240,4 +240,4 @@ public class RMUserAPI extends RMModelRequest
 
         return (response.getStatusCode() == OK.value());
     }
-}
+}

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

@@ -239,4 +239,4 @@ public class RecordCategoryAPI extends RMModelRequest
                 parameters
         ));
     }
-}
+}

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

@@ -297,4 +297,4 @@ public class RecordFolderAPI extends RMModelRequest
                 parameters
         ));
     }
-}
+}