[maven-release-plugin] prepare release V3.2.0.3

MNT-21585 - Having EVERYONE in original ACL causes IPR duplication (#…

.travis.settings.xml

@@ -0,0 +1,68 @@
+<settings>
+   <profiles>
+      <profile>
+         <id>alfresco-internal</id>
+         <activation>
+            <activeByDefault>true</activeByDefault>
+         </activation>
+         <repositories>
+            <repository>
+               <id>alfresco-internal</id>
+               <releases>
+                  <enabled>true</enabled>
+               </releases>
+               <snapshots>
+                  <enabled>true</enabled>
+               </snapshots>
+               <name>Alfresco Internal Repository</name>
+               <url>https://artifacts.alfresco.com/nexus/content/groups/internal</url>
+            </repository>
+         </repositories>
+         <pluginRepositories>
+            <pluginRepository>
+               <id>alfresco-internal</id>
+               <name>Alfresco Internal Repository</name>
+               <url>https://artifacts.alfresco.com/nexus/content/groups/internal</url>
+            </pluginRepository>
+            <pluginRepository>
+               <id>alfresco-public</id>
+               <name>Alfresco Public Repository</name>
+               <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+            </pluginRepository>
+            <pluginRepository>
+               <id>alfresco-private</id>
+               <name>Alfresco Private Repository</name>
+               <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
+            </pluginRepository>
+         </pluginRepositories>
+      </profile>
+   </profiles>
+
+   <servers>
+      <server>
+         <id>docker.io</id>
+         <username>${env.DOCKERHUB_USERNAME}</username>
+         <password>${env.DOCKERHUB_PASSWORD}</password>
+      </server>
+      <server>
+         <id>quay.io</id>
+         <username>${env.QUAY_USERNAME}</username>
+         <password>${env.QUAY_PASSWORD}</password>
+      </server>
+      <server>
+         <id>alfresco-internal</id>
+         <username>${env.MAVEN_USERNAME}</username>
+         <password>${env.MAVEN_PASSWORD}</password>
+      </server>
+      <server>
+         <id>alfresco-private</id>
+         <username>${env.MAVEN_USERNAME}</username>
+         <password>${env.MAVEN_PASSWORD}</password>
+      </server>
+      <server>
+         <id>alfresco-internal-snapshots</id>
+         <username>${env.MAVEN_USERNAME}</username>
+         <password>${env.MAVEN_PASSWORD}</password>
+      </server>
+   </servers>
+</settings>

.travis.yml

@@ -1,6 +1,129 @@
+import:
+  - source: travis-env-vars.yml
+os: linux
+dist: xenial
 language: java
 jdk:
-  - oraclejdk8
-sudo: false
-install: true
-script: travis_wait 30 mvn -B clean verify -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+  - openjdk11
+
+services:
+  - docker
+
+branches:
+  only:
+    - /release\/V3.\d+.*/
+    - /feature-3.\d+\/.*/
+    - /merge-3.\d+\/.*/
+    - /hotfix-3.\d+\/.*/
+
+cache:
+  directories:
+    - $HOME/.m2
+
+# the cache can grow constantly
+before_cache:
+  - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-governance-services*
+
+before_install:
+  - "cp .travis.settings.xml $HOME/.m2/settings.xml"
+install: skip
+
+stages:
+  - name: Build AGS
+  - name: Tests
+    if: commit_message !~ /\[skip tests\]/
+  - name: Security Scans
+  - name: Release
+  - name: Publish
+
+jobs:
+  include:
+    - name: "Build AGS Community"
+      stage: Build AGS
+      before_script: source scripts/setUpMavenPhase.sh
+      script:
+        - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+
+    - name: "Build AGS Enterprise"
+      stage: Build AGS
+      before_script: source scripts/setUpMavenPhase.sh
+      install:
+        - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      script:
+        - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+
+    - name: "Build AGS Benchmark"
+      stage: Build AGS
+      before_script: source scripts/setUpMavenPhase.sh
+      install:
+        - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      script:
+        - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+
+    - name: "Community Integrations Tests on MySQL"
+      stage: Tests
+      script:
+        - echo "Community Integrations Tests on MySQL"
+    - name: "Enterprise Integrations Tests on MySQL"
+      stage: Tests
+      script:
+        - echo "Enterprise Integrations Tests on MySQL"
+    - name: "Community Rest API Tests"
+      stage: Tests
+      before_install:
+        - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo -am
+      install:
+        - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH
+        - bash scripts/waitForAlfrescoToStart.sh
+      script:
+        - echo "Community Rest API Tests"
+    - name: "Enterprise Rest API Tests"
+      stage: Tests
+      before_install:
+        - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am
+      install:
+        - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH
+        - bash scripts/waitForAlfrescoToStart.sh
+      script:
+        - echo "Enterprise Rest API Tests"
+    - name: "Community UI Tests ..."
+      stage: Tests
+      before_install:
+        - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo,:alfresco-governance-services-community-share -am
+      install:
+        - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH
+        - bash scripts/waitForAlfrescoToStart.sh
+      script:
+        - echo "Community UI Tests ..."
+    - name: "Enterprise UI Tests ..."
+      stage: Tests
+      before_install:
+        - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am
+      install:
+        - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH
+        - bash scripts/waitForAlfrescoToStart.sh
+      script:
+        - echo "Enterprise UI Tests ..."
+
+    - name: "Source Clear Scan (SCA)"
+      stage: Security Scans
+      script:
+       - echo "Source Clear Scan (SCA)"
+    - name: "Static Analysis (SAST)"
+      stage: Security Scans
+      script:
+       - echo "Static Analysis (SAST)"
+
+    - name: "Community Release"
+      stage: Release
+      script:
+        - echo "Community Release"
+    - name: "Enterprise Release"
+      stage: Release
+      script:
+        - echo "Enterprise Release"
+
+    - name: "Copy to S3 Release Bucket"
+      stage: Publish
+      script:
+        - echo "Copy to S3 Release Bucket"

CODE_OF_CONDUCT.md

@@ -0,0 +1,73 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at katalin.zanaty@alfresco.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org

CONTRIBUTING.md

@@ -4,20 +4,19 @@ For the details on the Records Management project see [here](https://community.a
 ## Getting started
 What you need to get started:
 
-* A [Jira](https://issues.alfresco.com/jira/projects/ALF/issues/?filter=allopenissues) account;
-
 * A [GitHub](https://github.com/) account.
 
 Useful but not necessary:
 
 * An [Alfresco community](https://community.alfresco.com/) account - this is a good place to ask questions and find answers. 
 
+* A [Jira](https://issues.alfresco.com/jira/projects/RM/issues/?filter=allopenissues) account - Good place to look at what the team is working on;
+
 ## Making changes
 
-We use Jira to track issues. If you are committing a fix for a raised issue please include the ticket number in both the merge requests and the git commit messages.
-For example a fix for the ticket [ALF-21953](https://issues.alfresco.com/jira/browse/ALF-21953) might have the git commit message: "ALF-21953 Updated to use super pom v9".
+We use GitHub's issues to track community contributions and issues. If you are committing a fix for a raised issue please reference the issue number in the pull request.
 
-If you are adding in a new feature or bug fix please do so [here](https://issues.alfresco.com/jira/projects/ALF/issues/?filter=allopenissues). By raising a ticket in this project you will be agreeing to the Alfresco Contribution Agreement which can be found at the bottom of the 'Create Issue' form or alternatively attached to [this](https://community.alfresco.com/docs/DOC-7070-alfresco-contribution-agreement) page.
+If you are adding in a new feature or bug fix please raise an issue in the issues tab. By raising an issue in this project you will be agreeing to the Alfresco Contribution Agreement which can be found [here](https://community.alfresco.com/docs/DOC-7070-alfresco-contribution-agreement).
 
 When you are ready to make a change you just need to fork the [records-management](https://github.com/Alfresco/records-management) repository and then make your changes into your copy of the code.
 
@@ -55,8 +54,6 @@ Occasionally we may have to revert a change after it has been accepted. This wil
 
 [IDE settings for Eclipse and Intellij](https://github.com/Alfresco/records-management/tree/master/ide-config)
 
-[Jira project for raising issues/features](https://issues.alfresco.com/jira/projects/ALF/issues/?filter=allopenissues)
-
 [Jira project used by GS team](https://issues.alfresco.com/jira/projects/RM/issues)
 
 [Records Management project details](https://community.alfresco.com/docs/DOC-6387-project-overview-records-management)

README.md

@@ -0,0 +1,172 @@
+# Records Management: README
+
+## Contributing
+Please refer to our [How to contribute](/CONTRIBUTING.md) guide and our [Contributor Covenant Code of Conduct](/CODE_OF_CONDUCT.md).
+
+## Configuring and starting Alfresco/Share
+* Clone the project (e.g. `git clone git@gitlab.alfresco.com:records-management/records-management.git`)
+* Import the project as a maven project
+* Start the Alfresco/Share instances with the following commands:
+
+   ```
+   mvn clean install -Pstart-repo
+   mvn clean install -Pstart-share
+   ```
+
+   (these commands work best if run from the specific directories, e.g. start Share from
+   rm-community/rm-community-share/ or rm-enterprise/rm-enterprise-share/ )
+
+## Configuring a different DB other than H2 (e.g. MySQL or PostgreSQL)
+* Create a file called _local.properties_ under src/main/resources in alfresco-rm-enterprise-repo
+* Add the following properties in this new file
+
+   ```
+   my.db.name -> The name of the database schema
+   my.db.port -> The port number for your database (default port number for postgres is 5432 and for mysql it is 3306)
+   ```
+* Run the following commands to start your Alfresco instance:
+
+   to start Alfresco (using Postgres):
+   ```
+   mvn clean install -Pstart-repo,use-postgres
+   ```
+
+   to start Alfresco (using MySQL):
+
+   ```
+   mvn clean install -Pstart-repo,use-mysql
+   ```
+
+## Technical documentation
+Technical documentation is available at [rm-community/documentation/README.md](/rm-community/documentation/README.md) and [rm-enterprise/documentation/README.md](/rm-enterprise/documentation/README.md). This should be particularly useful for anyone wanting to integrate with or extend RM.
+
+## Running integration test
+In order to execute the integration tests run the following command (unit tests will be executed every time before you start Alfresco/Share):
+
+```
+mvn clean install -Dskip.integrationtests=false
+```
+
+## Running UI Automation tests
+To run the automated UI tests, change to the rm-automation directory and run:
+
+```
+mvn clean install -Dskip.automationtests=false
+```
+
+Note: due to Selenium Firefox driver changes, the highest supported Firefox version for UI tests is 43.0.4 (with Selenium 2.52.0).
+
+It is possible to have multiple versions of Firefox installed onto your workstation (e.g. one for running the UI tests and the other, kept
+up to date, for everyday browsing) but beware Firefox auto-updates. In this scenario the best approach is to create a non-default profile
+(default profiles will be shared between your Firefox installations!) for which auto-updates are disabled and forcing the use of this
+profile in your tests (`-Dwebdriver.firefox.profile="ProfileName"`). If your Firefox 43 install isn't in your path, you can use the
+`-Dwebdriver.firefox.profile` option set to the full path of its "firefox-bin" executable.
+
+MacOS X Sierra users: if you experience by order of magnitude slower performance when connected to a WiFi network (e.g. office WiFi)
+add your workstation to your local /etc/hosts file as described on https://github.com/SeleniumHQ/selenium/issues/2824.
+
+To use Chrome instead of Firefox:
+1. copy webdriver.properties from https://github.com/AlfrescoTestAutomation/selenium-grid/tree/master/src/main/resources
+2. put it under src/test/resource in rm-automation-ui project
+3. download the chrome driver from http://chromedriver.storage.googleapis.com and extract it
+4. change the following properties in webdriver.properties: webdriver.browser (Chrome) and webdriver.chrome.server.path (path/to/chrome/driver)
+5. run the tests as usual
+
+## Updating License Headers
+In order to refesh out of date license source headers run the following command:
+
+```
+mvn clean install -Dlicense.update.dryrun=false
+```
+
+## Running tests against latest Aikau snapshot
+The latest Aikau snapshot can be pulled by running the following command in rm-community:
+
+```
+mvn clean install -DskipTests -Dalfresco.aikau.version=LATEST -U
+```
+
+Thereafter start the Share instance and run automation tests as described above.
+
+## Configuring Outlook Integration
+To download and run RM with the Outlook Integration AMPs installed on the repo and Share use the following commands:
+
+```
+mvn clean install -Pstart-repo,outlook-integration
+mvn clean install -Pstart-share,outlook-integration
+```
+
+Follow these instructions to install licence and Outlook plugin:
+
+* http://docs.alfresco.com/outlook2.1/tasks/Outlook-license.html
+* http://docs.alfresco.com/outlook2.1/tasks/Outlook-install_v2.html
+
+## SNAPSHOT dependencies
+If you're building Enterprise RM, the base project (Community) is pulled in via a snapshot dependency configured in maven.
+This dependency will either be loaded from your local .m2 cache, or from Nexus if the version in your .m2 doesn't exist or is old
+('old' in maven terms is anything over 24 hours old). If maven fetches community dependencies from Nexus, then it's unlikely to contain your changes.
+You want to always use the version in your local cache - this means either doing a daily build at the root project level
+that pushes a new copy of the correct version into your cache, or alternatively you could run mvn with the
+`--no-snapshot-dependency` (or `-nsu`) option, which won't try to download a newer version.
+
+## Code Formatting
+This project follows the usual Alfresco Coding Standards. If you use Eclipse or IntelliJ, there are settings inside the ide-config directory for you to import.
+
+## Surf build errors
+If you get:
+```
+[ERROR] Failed to execute goal on project alfresco-rm-community-share: Could not resolve dependencies for project org.alfresco:alfresco-rm-community-share:amp:2.6-SNAPSHOT: Failed to collect dependencies at org.alfresco.surf:spring-surf-api:jar:6.3 -> org.alfresco.surf:spring-surf:jar:${dependency.surf.version}: Failed to read artifact descriptor for org.alfresco.surf:spring-surf:jar:${dependency.surf.version}: Could not transfer artifact org.alfresco.surf:spring-surf:pom:${dependency.surf.version} from/to alfresco-internal (https://artifacts.alfresco.com/nexus/content/groups/private): Not authorized , ReasonPhrase:Unauthorized. -> [Help 1]
+```
+
+then please re-run with `-Ddependency.surf.version=6.3`
+
+## Install lombok plugin for IDEs
+To allow automation and benchmark projects to be built within an IDE the lombok 'plugin' needs to be installed.
+Execute lombok.jar (doubleclick it, or run `java -jar lombok.jar`). Follow the instructions.
+
+## Use Solr 6 with Alfresco 5.2.x
+In alfresco-global.properties (depending on the RM edition `/records-management/rm-community/rm-community-repo/src/test/properties/local` or `/records-management/rm-enterprise/rm-enterprise-repo/src/test/properties/local`)
+change the value for "index.subsystem.name" from "solr4" to "solr6".
+Add also the following property "solr.port=8983".
+
+Download the latest Alfresco Search Services from
+[https://nexus.alfresco.com/nexus/#nexus-search;gav\~\~alfresco-search-services\~\~\~](https://nexus.alfresco.com/nexus/#nexus-search;gav~~alfresco-search-services~~~)
+Currently it's 1.0.0 (alfresco-search-services-1.0.0.zip)
+
+Unzip it and change to the "solr" folder within it. Start the Solr server using the following command:
+```
+solr start -a "-Dcreate.alfresco.defaults=alfresco,archive"
+```
+Start your repository
+
+## Build Docker images for RM Repo and Share
+A first step is checking that you have installed a working version of Docker that can be downloaded from here:
+[https://docs.docker.com/install/]
+
+The second step, in case you already have Docker installed, the current running images must be checked in order to be sure that they are not occupying any of the ports that
+ACS and Share use.
+
+To kill and clean all the images and containers the following command can be used:
+
+```
+docker system prune --volumes
+```
+ > Note that this will also remove all the stopped containers, containers, networks, volumes and build cache.
+
+Depending on which version of AGS you want to start, Community or Enterprise, **you must first build the docker images**.
+From the root folder of the project you can create both the Repo and the Share images for Community and Enterprise.
+To build all the images use the following command:
+```
+mvn install -PbuildDockerImage
+```
+If only the Community or Enterprise images need to be built than the same command as above must be run either in the rm-community or rm-enterprise modules.
+
+## Start the Docker images
+
+The Docker images of the Repo can be started independently from Share running the following command in the rm-repo-enterprise or rm-repo-community folder which contains the Docker-compose.yml file:
+```
+docker-compose up
+```
+> Be aware of the fact that the Share images can not be started independently from Repo
+
+e.g. In order to start an instance of rm-enterprise-repo and rm-enterprise-share, the above command must be run in rm-enterprise-share after the images have been built.

README.txt

@@ -1,155 +0,0 @@
-Configuring and starting Alfresco/Share:
-----------------------------------------
-
-- Clone the project (e.g. git clone git@gitlab.alfresco.com:records-management/records-management.git)
-
-- Import the project as a maven project
-
-- Start the Alfresco/Share instances with the following commands:
-
-  mvn clean install -Pstart-repo
-  mvn clean install -Pstart-share
-
-  (these commands work best if run from the specific directories, e.g. start share from
-  rm-enterprise/rm-enterprise-share/ or rm-community/rm-community-share/ )
-
-
-Configuring a different DB other than H2 (e.g. MySQL or PostgreSQL):
---------------------------------------------------------------------
-
-- Create a file called "local.properties" under src/main/resources in alfresco-rm-enterprise-repo
-
-- Add the following properties in this new file
-  my.db.name -> The name of the database schema
-  my.db.port -> The port number for your database (default port number for postgres is 5432 and for mysql it is 3306)
-
-- Run the following commands to start your Alfresco instance:
-
-  to start Alfresco (using Postgres):
-  mvn clean install -Pstart-repo,use-postgres
-
-  to start Alfresco (using MySQL):
-  mvn clean install -Pstart-repo,use-mysql
-
-
-Technical documentation:
-------------------------
-
-Technical documentation is available at rm-community/documentation/README.md and rm-enterprise/documentation/README.md.
-This should be particularly useful for anyone wanting to integrate with or extend RM.
-
-
-Running integration test:
--------------------------
-
-In order to execute the integration tests run the following command (unit tests will be executed every time before you start Alfresco/Share):
-
-mvn clean install -Dskip.integrationtests=false
-
-
-Running UI Automation tests:
-----------------------------
-
-To run the automated UI tests, change to the rm-automation directory and run:
-
-   mvn clean install -Dskip.automationtests=false
-
-Note: due to Selenium Firefox driver changes, the highest supported Firefox version for UI tests is 43.0.4 (with Selenium 2.52.0).
-
-It is possible to have multiple versions of Firefox installed onto your workstation (e.g. one for running the UI tests and the other, kept
-up to date, for everyday browsing) but beware Firefox auto-updates. In this scenario the best approach is to create a non-default profile
-(default profiles will be shared between your Firefox installations!) for which auto-updates are disabled and forcing the use of this
-profile in your tests (-Dwebdriver.firefox.profile="ProfileName"). If your Firefox 43 install isn't in your path, you can use the
--Dwebdriver.firefox.profile option set to the full path of its "firefox-bin" executable.
-
-MacOS X Sierra users: if you experience by order of magnitude slower performance when connected to a WiFi network (e.g. office WiFi)
-add your workstation to your local /etc/hosts file as described on https://github.com/SeleniumHQ/selenium/issues/2824.
-
-To use Chrome instead of Firefox:
-   - copy webdriver.properties from https://github.com/AlfrescoTestAutomation/selenium-grid/tree/master/src/main/resources
-   
- put it under src/test/resource in rm-automation-ui project
-   
- download the chrome driver from http://chromedriver.storage.googleapis.com/ and extract it
-   
- change the following properties in webdriver.properties: webdriver.browser (Chrome) and webdriver.chrome.server.path (path/to/chrome/driver)
-   
- run the tests as usual
-
-
-Updating License Headers:
--------------------------
-
-In order to refesh out of date license source headers run the following command:
-
-mvn clean install -Dlicense.update.dryrun=false
-
-
-Running tests against latest Aikau snapshot:
---------------------------------------------
-
-The latest Aikau snapshot can be pulled by running the following command in rm-community:
-
-   mvn clean install -DskipTests -Dalfresco.aikau.version=LATEST -U
-
-Thereafter start the Share instance and run automation tests as described above.
-
-
-Configuring Outlook Integration:
--------------------------------
-
-To download and run RM with the Outlook Integration AMPs installed on the repo and Share use the following commands:
-
-  mvn clean install -Pstart-repo,outlook-integration
-  mvn clean install -Pstart-share,outlook-integration
-
-Follow these instructions install licence and Outlook plugin:
-
-  - http://docs.alfresco.com/outlook2.1/tasks/Outlook-license.html
-  - http://docs.alfresco.com/outlook2.1/tasks/Outlook-install_v2.html
-
-
-SNAPSHOT dependencies:
-----------------------
-
-If you're building Enterprise RM, the base project (Community) is pulled in via a snapshot dependency configured in maven.
-This dependency will either be loaded from your local .m2 cache or from Nexus if the version in your .m2 doesn't exist or is old
-(Old in maven terms is anything over 24hrs old). If maven fetches it from Nexus, your code it's unlikely to be the correct version.
-You want to always use the version in your local cache - this means either doing a daily build at the root project level
-that pushes a new copy of the correct version into your cache, or alternatively you could run mvn with the
---no-snapshot-dependency (or -nsu) option, which won't try to download a newer version.
-
-
-Code Formatting:
-----------------
-
-This project follows the usual Alfresco Coding Standards. If you use Eclipse or IntelliJ, there are settings inside the ide-config directory for you to import.
-
-
-Surf build errors:
-------------------
-
-If you get:
-[ERROR] Failed to execute goal on project alfresco-rm-community-share: Could not resolve dependencies for project org.alfresco:alfresco-rm-community-share:amp:2.6-SNAPSHOT: Failed to collect dependencies at org.alfresco.surf:spring-surf-api:jar:6.3 -> org.alfresco.surf:spring-surf:jar:${dependency.surf.version}: Failed to read artifact descriptor for org.alfresco.surf:spring-surf:jar:${dependency.surf.version}: Could not transfer artifact org.alfresco.surf:spring-surf:pom:${dependency.surf.version} from/to alfresco-internal (https://artifacts.alfresco.com/nexus/content/groups/private): Not authorized , ReasonPhrase:Unauthorized. -> [Help 1]
-
-then please re-run with  -Ddependency.surf.version=6.3
-
-
-Install lombok plugin for IDEs:
--------------------------------
-
-To allow automation and benchmark projects to be built within an IDE the lombok 'plugin' needs to be installed.
-
-Execute lombok.jar (doubleclick it, or run java -jar lombok.jar). Follow instructions.
-
-
-Use Solr 6 with Alfresco 5.2.x:
--------------------------------
-In alfresco-global.properties (depending on the RM edition /records-management/rm-community/rm-community-repo/src/test/properties/local or /records-management/rm-enterprise/rm-enterprise-repo/src/test/properties/local)
-change the value for "index.subsystem.name" from "solr4" to "solr6".
-Add also the following property "solr.port=8983".
-
-Download the latest Alfresco Search Services from
-https://nexus.alfresco.com/nexus/#nexus-search;gav~~alfresco-search-services~~~
-Currently it's 1.0.0 (alfresco-search-services-1.0.0.zip)
-
-Unzip it and change to the "solr" folder within it. Start the Solr server using the following command:
-solr start -a "-Dcreate.alfresco.defaults=alfresco,archive"
-
-Start your repository

rm-automation/pom.xml

@@ -1,14 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
-   <artifactId>alfresco-rm-automation</artifactId>
-   <name>Alfresco Records Management Automation</name>
+   <artifactId>alfresco-governance-services-automation</artifactId>
+   <name>Alfresco Governance Services Automation</name>
    <packaging>pom</packaging>
 
    <parent>
       <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-rm</artifactId>
-      <version>2.6.1</version>
+      <artifactId>alfresco-governance-services</artifactId>
+      <version>3.2.0.3</version>
    </parent>
 
    <licenses>
@@ -24,8 +24,6 @@
    </modules>
 
    <properties>
-      <maven.compiler.source>1.8</maven.compiler.source>
-      <maven.compiler.target>1.8</maven.compiler.target>
       <suiteXmlFile>testng.xml</suiteXmlFile>
       <skip.automationtests>true</skip.automationtests>
    </properties>
@@ -131,7 +129,7 @@
          </build>
       </profile>
       <profile>
-         <id>apply-rm-community</id>
+         <id>apply-ags-community</id>
          <build>
             <plugins>
                <plugin>
@@ -145,29 +143,15 @@
                         </goals>
                         <configuration>
                            <artifactItems>
-                              <!-- Due to no compatible community version of ACS 5.2.N with RM community
                               <artifactItem>
                                  <groupId>org.alfresco</groupId>
-                                 <artifactId>alfresco-rm-community-share</artifactId>
+                                 <artifactId>alfresco-governance-services-community-share</artifactId>
                                  <version>${project.version}</version>
                                  <type>amp</type>
                               </artifactItem>
                               <artifactItem>
                                  <groupId>org.alfresco</groupId>
-                                 <artifactId>alfresco-rm-community-repo</artifactId>
-                                 <version>${project.version}</version>
-                                 <type>amp</type>
-                              </artifactItem>
-                              !-->
-                              <artifactItem>
-                                 <groupId>org.alfresco</groupId>
-                                 <artifactId>alfresco-rm-enterprise-share</artifactId>
-                                 <version>${project.version}</version>
-                                 <type>amp</type>
-                              </artifactItem>
-                              <artifactItem>
-                                 <groupId>org.alfresco</groupId>
-                                 <artifactId>alfresco-rm-enterprise-repo</artifactId>
+                                 <artifactId>alfresco-governance-services-community-repo</artifactId>
                                  <version>${project.version}</version>
                                  <type>amp</type>
                               </artifactItem>
@@ -192,7 +176,7 @@
                         <configuration>
                            <backup>true</backup>
                            <ampLocation>
-                              ${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp
+                              ${project.build.directory}/amps/alfresco-governance-services-community-repo-${project.version}.amp
                            </ampLocation>
                            <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war
                            </warLocation>
@@ -207,7 +191,7 @@
                         <configuration>
                            <backup>true</backup>
                            <ampLocation>
-                              ${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp
+                              ${project.build.directory}/amps/alfresco-governance-services-community-share-${project.version}.amp
                            </ampLocation>
                            <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war
                            </warLocation>
@@ -219,7 +203,7 @@
          </build>
       </profile>
       <profile>
-         <id>apply-rm-enterprise</id>
+         <id>apply-ags-enterprise</id>
          <build>
             <plugins>
                <plugin>
@@ -235,13 +219,13 @@
                            <artifactItems>
                               <artifactItem>
                                  <groupId>org.alfresco</groupId>
-                                 <artifactId>${alfresco.rm.share}</artifactId>
+                                 <artifactId>${ags.share}</artifactId>
                                  <version>${project.version}</version>
                                  <type>amp</type>
                               </artifactItem>
                               <artifactItem>
                                  <groupId>org.alfresco</groupId>
-                                 <artifactId>${alfresco.rm.repo}</artifactId>
+                                 <artifactId>${ags.repo}</artifactId>
                                  <version>${project.version}</version>
                                  <type>amp</type>
                               </artifactItem>
@@ -265,7 +249,7 @@
                         <phase>process-test-resources</phase>
                         <configuration>
                            <backup>true</backup>
-                           <ampLocation>${project.build.directory}/amps/${alfresco.rm.repo}-${project.version}.amp</ampLocation>
+                           <ampLocation>${project.build.directory}/amps/${ags.repo}-${project.version}.amp</ampLocation>
                            <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
                         </configuration>
                      </execution>
@@ -277,7 +261,7 @@
                         <phase>process-test-resources</phase>
                         <configuration>
                            <backup>true</backup>
-                           <ampLocation>${project.build.directory}/amps/${alfresco.rm.share}-${project.version}.amp</ampLocation>
+                           <ampLocation>${project.build.directory}/amps/${ags.share}-${project.version}.amp</ampLocation>
                            <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation>
                         </configuration>
                      </execution>

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

@@ -2,21 +2,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
-   <artifactId>alfresco-rm-automation-community-rest-api</artifactId>
-   <name>Alfresco Records Management Automation Community REST API</name>
+   <artifactId>alfresco-governance-services-automation-community-rest-api</artifactId>
+   <name>Alfresco Governance Services Automation Community REST API</name>
 
    <parent>
       <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-rm-automation</artifactId>
-      <version>2.6.1</version>
+      <artifactId>alfresco-governance-services-automation</artifactId>
+      <version>3.2.0.3</version>
    </parent>
 
    <properties>
-      <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
-      <alfresco.rm.share>alfresco-rm-community-share</alfresco.rm.share>
-      <alfresco.rm.repo>alfresco-rm-community-repo</alfresco.rm.repo>
-      <tas.restapi.version>5.2.0-10</tas.restapi.version>
+      <maven.javadoc.skip>false</maven.javadoc.skip>
+      <ags.share>alfresco-governance-services-community-share</ags.share>
+      <ags.repo>alfresco-governance-services-community-repo</ags.repo>
+      <tas.restapi.version>6.0.1.2</tas.restapi.version>
       <fluent.json.version>2.0.0</fluent.json.version>
+      <jackson.databind.version>2.7.7</jackson.databind.version>
    </properties>
 
    <build>
@@ -45,21 +46,39 @@
    </build>
 
    <dependencies>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-log4j12</artifactId>
+         <version>1.7.26</version>
+         <scope>test</scope>
+      </dependency>
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi-test</artifactId>
          <version>${tas.restapi.version}</version>
+         <exclusions>
+              <exclusion>
+                  <groupId>com.fasterxml.jackson.core</groupId>
+                  <artifactId>jackson-databind</artifactId>
+              </exclusion>
+          </exclusions>
       </dependency>
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi-test</artifactId>
          <version>${tas.restapi.version}</version>
          <type>test-jar</type>
+         <exclusions>
+              <exclusion>
+                  <groupId>com.fasterxml.jackson.core</groupId>
+                  <artifactId>jackson-databind</artifactId>
+              </exclusion>
+          </exclusions>         
       </dependency>
       <dependency>
          <groupId>org.projectlombok</groupId>
          <artifactId>lombok</artifactId>
-         <version>1.16.10</version>
+         <version>1.18.6</version>
          <scope>provided</scope>
       </dependency>
       <!-- FIXME: Remove this dependency once RMUserAPI.java has been refactored -->
@@ -73,5 +92,20 @@
          <artifactId>alfresco-testng</artifactId>
          <version>1.1</version>
       </dependency>
+      <dependency>
+         <groupId>org.apache.commons</groupId>
+         <artifactId>commons-collections4</artifactId>
+         <version>4.1</version>
+      </dependency>
+      <dependency>
+         <groupId>com.github.docker-java</groupId>
+         <artifactId>docker-java</artifactId>
+         <version>3.0.14</version>
+      </dependency>
+       <dependency>
+           <groupId>com.fasterxml.jackson.core</groupId>
+           <artifactId>jackson-databind</artifactId>
+            <version>${jackson.databind.version}</version>
+       </dependency>
    </dependencies>
 </project>

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -56,4 +56,7 @@ public class RMRestProperties extends RestProperties
 
     @Value ("${rest.rmPath}")
     private String restRmPath;
+
+    @Value ("${docker.host}")
+    private String dockerHost;
 }

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -26,7 +26,7 @@
  */
 package org.alfresco.rest.core;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
+import io.restassured.builder.RequestSpecBuilder;
 
 import org.alfresco.rest.exception.EmptyJsonResponseException;
 import org.alfresco.rest.model.RestErrorModel;

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -34,6 +34,7 @@ import org.alfresco.rest.requests.Node;
 import org.alfresco.rest.requests.coreAPI.RestCoreAPI;
 import org.alfresco.rest.requests.search.SearchAPI;
 import org.alfresco.rest.rm.community.requests.gscore.GSCoreAPI;
+import org.alfresco.rest.rm.community.requests.gscore.api.ActionsExecutionAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.FilePlanAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.FilesAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.RMSiteAPI;
@@ -225,4 +226,14 @@ public class RestAPIFactory
     {
         return getGSCoreAPI(userModel).usingUnfiledRecordFolder();
     }
+
+    public ActionsExecutionAPI getActionsAPI(UserModel userModel)
+    {
+        return getGSCoreAPI(userModel).usingActionsExecutionsAPI();
+    }
+
+    public ActionsExecutionAPI getActionsAPI()
+    {
+        return getGSCoreAPI(null).usingActionsExecutionsAPI();
+    }
 }

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -26,10 +26,18 @@
  */
 package org.alfresco.rest.core.v0;
 
+import javax.json.Json;
+import javax.json.JsonReader;
 import java.io.IOException;
+import java.io.InputStream;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
+import org.apache.http.ParseException;
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,6 +52,10 @@ public class APIUtils
 {
     /** Logger for this class. */
     private static final Logger LOGGER = LoggerFactory.getLogger(APIUtils.class);
+    /** The ISO instant formatter that formats or parses an instant in UTC, such as '2011-12-03T10:15:305Z'
+     * similar with {@link DateTimeFormatter#ISO_INSTANT}, but with only 3 nanoseconds*/
+    public static final DateTimeFormatter ISO_INSTANT_FORMATTER =
+            new DateTimeFormatterBuilder().appendInstant(3).toFormatter();
 
     /** Private constructor for helper class. */
     private APIUtils()
@@ -70,4 +82,40 @@ public class APIUtils
         LOGGER.info("Response body:\n{}", source);
         return new JSONObject(source);
     }
+
+    /**
+     * Util method to extract the message string from the HTTP response
+     *
+     * @param httpResponse http response
+     * @return error message from the http response
+     */
+    public static String extractErrorMessageFromHttpResponse(HttpResponse httpResponse)
+    {
+        final HttpEntity entity = httpResponse.getEntity();
+        JsonReader reader = null;
+        try
+        {
+            final InputStream responseStream = entity.getContent();
+            reader = Json.createReader(responseStream);
+            return reader.readObject().getString("message");
+        }
+        catch (JSONException error)
+        {
+
+            LOGGER.error("Converting message body to JSON failed. Body: {}", httpResponse, error);
+        }
+        catch (ParseException | IOException error)
+        {
+
+            LOGGER.error("Parsing message body failed.", error);
+        }
+        finally
+        {
+            if (reader != null)
+            {
+                reader.close();
+            }
+        }
+        return null;
+    }
 }

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -81,7 +81,7 @@ public abstract class BaseAPI
     protected static final String UPDATE_METADATA_API = "{0}node/{1}/formprocessor";
     protected static final String ACTIONS_API = "{0}actionQueue";
     protected static final String RM_ACTIONS_API = "{0}rma/actions/ExecutionQueue";
-    protected static final String RM_SITE_ID = "rm";
+    public static final String RM_SITE_ID = "rm";
     protected static final String SHARE_ACTION_API = "{0}internal/shared/share/workspace/SpacesStore/{1}";
     private static final String SLINGSHOT_PREFIX = "alfresco/s/slingshot/";
 
@@ -89,7 +89,7 @@ public abstract class BaseAPI
     private AlfrescoHttpClientFactory alfrescoHttpClientFactory;
 
     @Autowired
-    private ContentService contentService;
+    protected ContentService contentService;
 
     public static final String NODE_REF_WORKSPACE_SPACES_STORE = "workspace://SpacesStore/";
     private static final String FILE_PLAN_PATH = "/Sites/rm/documentLibrary";
@@ -121,6 +121,37 @@ public abstract class BaseAPI
         return results;
     }
 
+    /**
+     * Helper method to extract the property value for the given nodeRef and property name
+     * 
+     * @param result
+     * @param nodeRef
+     * @param propertyName
+     * @return
+     */
+    protected String getPropertyValue(JSONObject result, String nodeRef, String propertyName)
+    {
+        String propertyValue = "";
+        try
+        {
+            JSONArray items = result.getJSONArray("items");
+            for (int i = 0; i < items.length(); i++)
+            {
+                JSONObject item = items.getJSONObject(i);
+                if(nodeRef.equals(item.getString("nodeRef")))
+                {
+                    propertyValue = item.getJSONObject("properties").getString(propertyName);
+                }
+            }
+        }
+        catch (JSONException error)
+        {
+            throw new RuntimeException("Unable to parse result", error);
+        }
+
+        return propertyValue;
+    }
+    
     /**
      * Helper method to extract property values from request result and put them in map as a list that corresponds to a unique property value.
      *
@@ -310,6 +341,78 @@ public abstract class BaseAPI
         }
     }
 
+    /**
+     * Helper method for PUT requests
+     *
+     * @param adminUser user with administrative privileges
+     * @param adminPassword password for adminUser
+     * @param expectedStatusCode The expected return status code.
+     * @param requestParams zero or more endpoint specific request parameters
+     * @param urlTemplate request URL template
+     * @param urlTemplateParams zero or more parameters used with <i>urlTemplate</i>
+     */
+    protected HttpResponse doPutJsonRequest(String adminUser,
+                String adminPassword,
+                int expectedStatusCode,
+                JSONObject requestParams,
+                String urlTemplate,
+                String... urlTemplateParams)
+    {
+        AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
+        return doPutJsonRequest(adminUser, adminPassword, expectedStatusCode, client.getApiUrl(), requestParams, urlTemplate, urlTemplateParams);
+    }
+
+    /**
+     * Helper method for PUT requests
+     *
+     * @param adminUser user with administrative privileges
+     * @param adminPassword password for adminUser
+     * @param expectedStatusCode The expected return status code.
+     * @param urlStart the start of the URL (for example "alfresco/s/slingshot").
+     * @param requestParams zero or more endpoint specific request parameters
+     * @param urlTemplate request URL template
+     * @param urlTemplateParams zero or more parameters used with <i>urlTemplate</i>
+     * @throws AssertionError if the returned status code is not as expected.
+     */
+    private HttpResponse doPutJsonRequest(String adminUser,
+                String adminPassword,
+                int expectedStatusCode,
+                String urlStart,
+                JSONObject requestParams,
+                String urlTemplate,
+                String... urlTemplateParams)
+    {
+        String requestUrl = formatRequestUrl(urlStart, urlTemplate, urlTemplateParams);
+        try
+        {
+            HttpResponse httpResponse = doRequestJson(HttpPut.class, requestUrl, adminUser, adminPassword, requestParams);
+            assertEquals("PUT request to " + requestUrl + " was not successful.", expectedStatusCode, httpResponse.getStatusLine().getStatusCode());
+            return httpResponse;
+        }
+        catch (InstantiationException | IllegalAccessException error)
+        {
+            throw new IllegalArgumentException("doPutRequest failed", error);
+        }
+    }
+
+    /**
+     * Fill in the parameters for a URL template.
+     *
+     * @param urlStart The start of the URL.
+     * @param urlTemplate The template.
+     * @param urlTemplateParams Any parameters that need to be filled into the URL template.
+     * @return The resultant URL.
+     */
+    private String formatRequestUrl(String urlStart, String urlTemplate, String[] urlTemplateParams)
+    {
+        if (urlTemplateParams.length == 1)
+        {
+            // The format method needs some help to know not to use the whole array object.
+            return MessageFormat.format(urlTemplate, urlStart, urlTemplateParams[0]);
+        }
+        return MessageFormat.format(urlTemplate, urlStart, urlTemplateParams);
+    }
+
     /**
      * Helper method for POST requests
      * @param adminUser user with administrative privileges
@@ -403,15 +506,12 @@ public abstract class BaseAPI
                 String urlTemplate,
                 String... urlTemplateParams)
     {
-        // Ensure the host is part of the request URL.
-        String requestUrl = MessageFormat.format(
-                    urlTemplate,
-                    urlStart,
-                    urlTemplateParams);
+        String requestUrl;
+        requestUrl = formatRequestUrl(urlStart, urlTemplate, urlTemplateParams);
         try
         {
             HttpResponse httpResponse = doRequestJson(HttpPost.class, requestUrl, adminUser, adminPassword, requestParams);
-            assertEquals("POST request to " + requestUrl + " was not successful.", httpResponse.getStatusLine().getStatusCode(), expectedStatusCode);
+            assertEquals("POST request to " + requestUrl + " was not successful.", expectedStatusCode, httpResponse.getStatusLine().getStatusCode());
             return httpResponse;
         }
         catch (InstantiationException | IllegalAccessException error)
@@ -453,7 +553,10 @@ public abstract class BaseAPI
             {
                 ((HttpEntityEnclosingRequestBase) request).setEntity(new StringEntity(requestParams.toString()));
             }
+            LOGGER.info("Sending {} request to {}", requestType.getSimpleName(), requestUrl);
+            LOGGER.info("Request body: {}", requestParams);
             response = client.execute(adminUser, adminPassword, request);
+            LOGGER.info("Response: {}", response.getStatusLine());
 
             try
             {
@@ -573,6 +676,9 @@ public abstract class BaseAPI
         SHELF,
         BOX,
         FILE,
+        ORIGINATOR,
+        ORIGINATING_ORGANIZATION,
+        PUBLICATION_DATE
     }
 
     public enum RETENTION_SCHEDULE
@@ -587,7 +693,7 @@ public abstract class BaseAPI
         RETENTION_GHOST,
         RETENTION_ELIGIBLE_FIRST_EVENT,
         RETENTION_EVENTS,
-
+        COMBINE_DISPOSITION_STEP_CONDITIONS
     }
 
     /**
@@ -596,9 +702,12 @@ public abstract class BaseAPI
     public enum RM_ACTIONS
     {
         EDIT_DISPOSITION_DATE("editDispositionActionAsOfDate"),
+        END_RETENTION("retain"),
         CUT_OFF("cutoff"),
         UNDO_CUT_OFF("undoCutoff"),
         TRANSFER("transfer"),
+        COMPLETE_EVENT("completeEvent"),
+        UNDO_EVENT("undoEvent"),
         DESTROY("destroy");
         String action;
 

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

@@ -0,0 +1,49 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * -
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * -
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.core.v0;
+
+public enum RMEvents
+{
+    ABOLISHED("abolished"),
+    ALL_ALLOWANCES_GRANTED_ARE_TERMINATED("all_allowances_granted_are_terminated"),
+    CASE_CLOSED("case_closed"),
+    DECLASSIFICATION_REVIEW("declassification_review"),
+    OBSOLETE("obsolete"),
+    NO_LONGER_NEEDED("no_longer_needed"),
+    STUDY_COMPLETE("study_complete");
+    private String eventName;
+
+    RMEvents(String eventName)
+    {
+        this.eventName = eventName;
+    }
+
+    public String getEventName()
+    {
+        return eventName;
+    }
+}

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

@@ -0,0 +1,89 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * -
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * -
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.rm.community.model.audit;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.alfresco.utility.model.TestModel;
+
+/**
+ * POJO for audit entry
+ *
+ * @author Rodica Sutu
+ * @since 2.7
+ */
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties (ignoreUnknown = true)
+public class AuditEntry extends TestModel
+{
+    @JsonProperty (required = true)
+    private String nodeName;
+
+    @JsonProperty (required = true)
+    private List<Object> changedValues;
+
+    @JsonProperty (required = true)
+    private String identifier;
+
+    @JsonProperty (required = true)
+    private String path;
+
+    @JsonProperty (required = true)
+    private String nodeRef;
+
+    @JsonProperty (required = true)
+    private String fullName;
+
+    @JsonProperty
+    private String createPerson;
+
+    @JsonProperty (required = true)
+    private String userName;
+
+    @JsonProperty (required = true)
+    private String userRole;
+
+    @JsonProperty (required = true)
+    private String nodeType;
+
+    @JsonProperty (required = true)
+    private String event;
+
+    @JsonProperty (required = true)
+    private String timestamp;
+
+}

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

@@ -0,0 +1,57 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * -
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * -
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.rm.community.model.audit;
+
+/**
+ * Enumerates the list of events audited
+ *
+ * @author  Rodica Sutu
+ * @since 2.7
+ *
+ */
+public enum AuditEvents
+{
+    CREATE_PERSON("Create Person", "Create User"),
+    DELETE_PERSON("Delete Person", "Delete User"),
+    CREATE_USER_GROUP("Create User Group", "Create User Group"),
+    DELETE_USER_GROUP("Delete User Group", "Delete User Group"),
+    ADD_TO_USER_GROUP("Add To User Group", "Add To User Group"),
+    REMOVE_FROM_USER_GROUP("Remove From User Group", "Remove From User Group"),
+    LOGIN_UNSUCCESSFUL("Login.Failure", "Login Unsuccessful");
+
+    /** event audited */
+    public final String event;
+
+    /** display name for the event audited */
+    public final String eventDisplayName;
+
+    AuditEvents(String event, String displayName)
+    {
+        this.event = event;
+        this.eventDisplayName = displayName;
+    }
+}

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -36,4 +36,10 @@ public class FilePlanComponentAspects
 {
     // aspect present on completed records
     public static final String ASPECTS_COMPLETED_RECORD = "rma:declaredRecord";
+    
+	// aspect present on record folders/categories with vital records
+    public static final String ASPECTS_VITAL_RECORD_DEFINITION= "rma:vitalRecordDefinition";
+    
+	// aspect present on vital records
+    public static final String ASPECTS_VITAL_RECORD = "rma:vitalRecord";
 }

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -58,6 +58,8 @@ public class FilePlanComponentFields
     public static final String PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_NAME = "rma:recordSearchDispositionActionName";
     public static final String PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS_ELIGIBLE = "rma:recordSearchDispositionEventsEligible";
     public static final String PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS = "rma:recordSearchDispositionInstructions";
+    public static final String PROPERTIES_DECLASSIFICATION_REVIEW_COMPLETED_BY = "rma:declassificationReviewCompletedBy";
+    public static final String PROPERTIES_DECLASSIFICATION_REVIEW_COMPLETED_AT = "rma:declassificationReviewCompletedAt";
     
 
     /** File plan properties */
@@ -74,10 +76,13 @@ public class FilePlanComponentFields
     public static final String PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD = "rma:recordSearchVitalRecordReviewPeriod";
     public static final String PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD_EXPRESSION = "rma:recordSearchVitalRecordReviewPeriodExpression";
 
-    /** Record properties */
+    /**
+     * Record properties
+     */
     public static final String PROPERTIES_CLASSIFICATION = "sc:classification";
     public static final String PROPERTIES_DATE_FILED = "rma:dateFiled";
     public static final String PROPERTIES_ORIGINAL_NAME = "rma:origionalName";
+    public static final String PROPERTIES_REVIEW_AS_OF = "rma:reviewAsOf";
 
     /** Electronic record properties */
     public static final String PROPERTIES_VERSION_TYPE = "cm:versionType";

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -0,0 +1,56 @@
+/*-
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * -
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * -
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.rm.community.model.hold;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.alfresco.utility.model.TestModel;
+
+/**
+ * POJO for hold entry
+ *
+ * @author Rodica Sutu
+ * @since 3.2
+ */
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties (ignoreUnknown = true)
+public class HoldEntry extends TestModel
+{
+    @JsonProperty (required = true)
+    private String name;
+
+    @JsonProperty (required = true)
+    private String nodeRef;
+}

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -52,8 +52,19 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_ORIGINATING_CREATION_DATE;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_ORIGINATING_LOCATION;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_ORIGINATING_USER_ID;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_AS_OF;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_NAME;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS_ELIGIBLE;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD_EXPRESSION;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD_EXPRESSION;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RESOLUTION_UNIT;
+
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_REVIEW_AS_OF;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_ROOT_NODE_REF;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_SHELF;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_SOFTWARE;
@@ -64,19 +75,19 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_X_RESOLUTION;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_Y_RESOLUTION;
 
+import java.util.Date;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import org.alfresco.rest.rm.community.model.common.Owner;
-import org.alfresco.utility.model.TestModel;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.alfresco.rest.rm.community.model.common.Owner;
+import org.alfresco.utility.model.TestModel;
 
 /**
  * POJO for record properties
@@ -208,4 +219,34 @@ public class RecordProperties extends TestModel
 
     @JsonProperty(PROPERTIES_AUTHOR)
     private String author;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD_EXPRESSION)
+    private String recordSearchDispositionPeriodExpression;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY)
+    private String recordSearchDispositionAuthority;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_AS_OF)
+    private Date recordSearchDispositionActionAsOf;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD)
+    private String recordSearchDispositionPeriod;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_NAME)
+    private String recordSearchDispositionActionName;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS_ELIGIBLE)
+    private Boolean recordSearchDispositionEventsEligible;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS)
+    private String recordSearchDispositionInstructions;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD)
+    private String recordSearchVitalRecordReviewPeriod;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD_EXPRESSION)
+    private String recordSearchVitalRecordReviewPeriodExpression;
+
+    @JsonProperty(PROPERTIES_REVIEW_AS_OF)
+    private Date reviewAsOf;
 }

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -33,6 +33,10 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_IS_CLOSED;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_LOCATION;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_OWNER;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields
+        .PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY;
+import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields
+        .PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD_EXPRESSION;
@@ -120,4 +124,11 @@ public class RecordFolderProperties extends TestModel
 
     @JsonProperty (PROPERTIES_RECORD_SEARCH_VITAL_RECORD_REVIEW_PERIOD_EXPRESSION)
     private String recordSearchVitalRecordReviewPeriodExpression;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY)
+    private String recordSearchDispositionAuthority;
+
+    @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS)
+    private String recordSearchDispositionInstructions;
+
 }

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -45,7 +45,7 @@ public class RuleDefinition
     private String contentTitle;
     private String contentDescription;
     private String rejectReason;
-    private List<ActionsOnRule> actions;
+    private List<String> actions;
 
     /**
      * Creates a new object of type Rule Definition
@@ -189,15 +189,15 @@ public class RuleDefinition
         return this;
     }
 
-
-    public List<ActionsOnRule> getActions()
+    public List<String> getActions()
     {
         return actions;
     }
 
-    public RuleDefinition actions(List<ActionsOnRule> actions)
+    public RuleDefinition actions(List<String> actions)
     {
         this.actions = actions;
         return this;
     }
 }
+

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -42,7 +42,6 @@ import lombok.NoArgsConstructor;
  * @author Rodica Sutu
  * @since 2.6
  */
-@Builder
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
@@ -51,4 +50,13 @@ public class RMSite extends RestSiteModel
 {
     @JsonProperty (required = true)
     private RMSiteCompliance compliance;
+
+    /** Private constructor allowing Lombok to include superclass fields in the builder. */
+    @Builder
+    private RMSite(String title, String description, RMSiteCompliance compliance)
+    {
+        this.setTitle(title);
+        this.setDescription(description);
+        this.compliance = compliance;
+    }
 }

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -29,6 +29,7 @@ package org.alfresco.rest.rm.community.model.unfiledcontainer;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_IDENTIFIER;
 import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_ROOT_NODE_REF;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.alfresco.utility.model.TestModel;
@@ -50,6 +51,7 @@ import lombok.NoArgsConstructor;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@JsonIgnoreProperties (ignoreUnknown = true)
 public class UnfiledContainerProperties extends TestModel
 {
     /*************************/

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

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

@@ -0,0 +1,42 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * -
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * -
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.rm.community.model.user;
+
+/**
+ * Constants for RM user capabilities
+ *
+ * @author Rodica Sutu
+ * @since 2.7
+ */
+public class UserCapabilities
+{
+
+    /** The id of the view records capability. */
+    public static final String VIEW_RECORDS_CAP = "ViewRecords";
+    /** The id of the declare records capability. */
+    public static final String DECLARE_RECORDS_CAP = "DeclareRecords";
+}

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -32,9 +32,16 @@ package org.alfresco.rest.rm.community.model.user;
  * @author Kristijan Conkas
  * @since 2.6
  */
-public class UserPermissions
+public enum UserPermissions
 {
-    public static final String PERMISSION_FILING = "Filing";
-    public static final String PERMISSION_READ_RECORDS = "ReadRecords";
-    public static final String PERMISSION_FILE_RECORDS = "FileRecords";
+    PERMISSION_FILING("Filing"),
+    PERMISSION_READ_RECORDS("ReadRecords"),
+    PERMISSION_FILE_RECORDS("FileRecords");
+
+    public final String permissionId;
+
+    UserPermissions(String permissionId)
+    {
+        this.permissionId = permissionId;
+    }
 }

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -24,19 +24,32 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
+
 package org.alfresco.rest.rm.community.model.user;
 
 /**
  * Constants for RM user roles
- * 
+ *
  * @author Kristijan Conkas
  * @since 2.6
  */
-public class UserRoles
+public enum UserRoles
 {
-    public static final String ROLE_RM_ADMIN = "Administrator";
-    public static final String ROLE_RM_MANAGER = "RecordsManager";
-    public static final String ROLE_RM_POWER_USER = "PowerUser";
-    public static final String ROLE_RM_SECURITY_OFFICER = "SecurityOfficer";
-    public static final String ROLE_RM_USER = "User";
+    IN_PLACE_WRITERS("ExtendedWriters", "In-Place Writers"),
+    ROLE_RM_ADMIN("Administrator", "Records Management Administrator"),
+    ROLE_RM_MANAGER("RecordsManager", "Records Management Manager"),
+    ROLE_RM_POWER_USER("PowerUser", "Records Management Power User"),
+    ROLE_RM_SECURITY_OFFICER("SecurityOfficer", "Records Management Security Officer"),
+    ROLE_RM_USER("User", "Records Management User");
+
+    public final String roleId;
+    public final String displayName;
+
+    UserRoles(String roleId, String displayName)
+    {
+        this.roleId = roleId;
+        this.displayName = displayName;
+    }
+
+
 }

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -41,14 +41,14 @@ import lombok.Setter;
  * @author Tuna Aksoy
  * @since 2.6
  */
-public abstract class RMModelRequest extends ModelRequest<RMModelRequest>
+public abstract class RMModelRequest<Request> extends ModelRequest<Request>
 {
     @Getter (value = PROTECTED)
     @Setter (value = PRIVATE)
     private RMRestWrapper rmRestWrapper;
 
     /**
-     * @param restWrapper
+     * @param rmRestWrapper
      */
     public RMModelRequest(RMRestWrapper rmRestWrapper)
     {

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -29,10 +29,11 @@ package org.alfresco.rest.rm.community.requests.gscore;
 import static java.lang.Integer.parseInt;
 import static java.lang.String.format;
 
-import com.jayway.restassured.RestAssured;
+import io.restassured.RestAssured;
 
 import org.alfresco.rest.core.RMRestProperties;
 import org.alfresco.rest.core.RMRestWrapper;
+import org.alfresco.rest.rm.community.requests.gscore.api.ActionsExecutionAPI;
 import org.alfresco.rest.rm.community.requests.RMModelRequest;
 import org.alfresco.rest.rm.community.requests.gscore.api.FilePlanAPI;
 import org.alfresco.rest.rm.community.requests.gscore.api.FilesAPI;
@@ -113,7 +114,7 @@ public class GSCoreAPI extends RMModelRequest
     /**
      * Provides DSL on all REST calls under <code>records/...</code> API path
      *
-     * @return {@link FilePlanComponentAPI}
+     * @return {@link RecordsAPI}
      */
     public RecordsAPI usingRecords()
     {
@@ -179,4 +180,14 @@ public class GSCoreAPI extends RMModelRequest
     {
         return new RMUserAPI(getRmRestWrapper());
     }
+
+    /**
+     * Provides DSL for ActionExecution API
+     *
+     * @return {@link ActionsExecutionAPI}
+     */
+    public ActionsExecutionAPI usingActionsExecutionsAPI()
+    {
+        return new ActionsExecutionAPI(getRmRestWrapper());
+    }
 }

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

@@ -0,0 +1,78 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * -
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * -
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.rm.community.requests.gscore.api;
+
+import com.google.common.collect.ImmutableMap;
+
+import org.alfresco.rest.core.RMRestWrapper;
+import org.alfresco.rest.rm.community.model.rules.ActionsOnRule;
+import org.alfresco.rest.rm.community.requests.RMModelRequest;
+import org.alfresco.utility.model.RepoTestModel;
+import org.json.JSONObject;
+
+/**
+ * Produces processed results from Core Actions API calls
+ *
+ * @author Claudia Agache
+ * @since 3.1
+ */
+public class ActionsExecutionAPI extends RMModelRequest
+{
+    /**
+     * @param rmRestWrapper RM REST Wrapper
+     */
+    public ActionsExecutionAPI(RMRestWrapper rmRestWrapper)
+    {
+        super(rmRestWrapper);
+    }
+
+    /**
+     * Declares and files a document as record to a record folder using v1 actions api
+     *
+     * @param targetNode      the node on which the action is executed
+     * @param destinationPath the path to the record folder
+     * @throws Exception
+     */
+    public JSONObject declareAndFile(RepoTestModel targetNode, String destinationPath) throws Exception
+    {
+        return getRmRestWrapper().withCoreAPI().usingActions()
+                                 .executeAction(ActionsOnRule.DECLARE_AS_RECORD.getActionValue(), targetNode,
+                                         ImmutableMap.of("path", destinationPath));
+    }
+
+    /**
+     * Declares a document as record using v1 actions api
+     *
+     * @param targetNode the node on which the action is executed
+     * @throws Exception
+     */
+    public JSONObject declareAsRecord(RepoTestModel targetNode) throws Exception
+    {
+        return getRmRestWrapper().withCoreAPI().usingActions()
+                                 .executeAction(ActionsOnRule.DECLARE_AS_RECORD.getActionValue(), targetNode);
+    }
+}

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -54,7 +54,7 @@ public class FilePlanAPI extends RMModelRequest
     /**
      * Constructor.
      *
-     * @param restWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public FilePlanAPI(RMRestWrapper rmRestWrapper)
     {
@@ -77,7 +77,7 @@ public class FilePlanAPI extends RMModelRequest
      * @param filePlanId The identifier of a file plan
      * @param parameters The URL parameters to add
      * @return The {@link FilePlan} for the given {@code filePlanId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code filePlanId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -113,7 +113,7 @@ public class FilePlanAPI extends RMModelRequest
      * @param filePlanId The identifier of a file plan
      * @param parameters The URL parameters to add
      * @return The {@link RecordCategoryCollection} for the given {@code filePlanId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>authentication fails</li>
      *  <li>current user does not have permission to read {@code filePlanId}</li>
@@ -177,7 +177,7 @@ public class FilePlanAPI extends RMModelRequest
     /**
      * see {@link #updateFilePlan(FilePlan, String, String)
      */
-    public FilePlan updateFilePlan(FilePlan filePlanModel, String filePlanId) throws Exception
+    public FilePlan updateFilePlan(FilePlan filePlanModel, String filePlanId)
     {
         mandatoryObject("filePlanModel", filePlanModel);
         mandatoryString("filePlanId", filePlanId);
@@ -191,7 +191,7 @@ public class FilePlanAPI extends RMModelRequest
      * @param filePlanModel The file plan  model which holds the information
      * @param filePlanId    The identifier of the file plan
      * @param parameters          The URL parameters to add
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      *                   <ul>
      *                   <li>the update request is invalid or {@code filePlanId} is not a valid format or {@code filePlanModel} is invalid</li>
      *                   <li>authentication fails</li>
@@ -200,7 +200,7 @@ public class FilePlanAPI extends RMModelRequest
      *                   <li>model integrity exception, including file name with invalid characters</li>
      *                   </ul>
      */
-    public FilePlan updateFilePlan(FilePlan filePlanModel, String filePlanId, String parameters) throws Exception
+    public FilePlan updateFilePlan(FilePlan filePlanModel, String filePlanId, String parameters)
     {
         mandatoryObject("filePlanModel", filePlanModel);
         mandatoryString("filePlanId", filePlanId);

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -41,10 +41,12 @@ import org.alfresco.rest.rm.community.requests.RMModelRequest;
  * @author Kristijan Conkas
  * @since 2.6
  */
-public class FilesAPI extends RMModelRequest
+public class FilesAPI extends RMModelRequest<FilesAPI>
 {
+    public static final String PARENT_ID_PARAM = "parentId";
+
     /**
-     * @param rmRestWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public FilesAPI(RMRestWrapper rmRestWrapper)
     {
@@ -55,11 +57,10 @@ public class FilesAPI extends RMModelRequest
      * Declare file as record
      *
      * @param fileId The Id of a file to declare as record
-     * @param parameters Request parameters, refer to API documentation for more details
      * @return The {@link Record} for created record
-     * @throws Exception for malformed JSON responses
+     * @throws RuntimeException for malformed JSON responses
      */
-    public Record declareAsRecord(String fileId, String parameters) throws Exception
+    public Record declareAsRecord(String fileId)
     {
         mandatoryString("fileId", fileId);
 
@@ -67,22 +68,8 @@ public class FilesAPI extends RMModelRequest
             POST,
             "/files/{fileId}/declare?{parameters}",
             fileId,
-            parameters
+            getRmRestWrapper().getParameters()
         ));
     }
-
-    /**
-     * A no-parameter version of {@link FilesAPI#declareAsRecord}
-     *
-     * @param fileId The Id of a file to declare as record
-     * @return The {@link Record} for created record
-     * @throws Exception for malformed JSON responses
-     */
-    public Record declareAsRecord(String fileId) throws Exception
-    {
-        mandatoryString("fileId", fileId);
-
-        return declareAsRecord(fileId, EMPTY);
-    }
 }
 

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -62,7 +62,7 @@ public class RMSiteAPI extends RMModelRequest
      * Get the RM site
      *
      * @return The {@link RMSite} for the given file plan component id
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>Api Response code 400 Invalid parameter: GET request is supported only for the RM site</li>
      *  <li>Api Response code 401 If authentication failed</li>
@@ -70,7 +70,7 @@ public class RMSiteAPI extends RMModelRequest
      *  <li>Api Response code default Unexpected error</li>
      * </ul>
      */
-    public RMSite getSite() throws Exception
+    public RMSite getSite()
     {
         return getRmRestWrapper().processModel(RMSite.class, simpleRequest(
                 GET,
@@ -83,7 +83,7 @@ public class RMSiteAPI extends RMModelRequest
      *
      * @param rmSite The properties of the rm site to be created
      * @return The {@link RMSite} with the given properties
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>Api Response code 400 Invalid parameter: title, or description exceed the maximum length; or siteBodyCreate invalid</li>
      *  <li>Api Response code 401 If authentication failed</
@@ -91,7 +91,7 @@ public class RMSiteAPI extends RMModelRequest
      *  <li>Api Response code default Unexpected error</li>
      * </ul>
      */
-    public RMSite createRMSite(RMSite rmSiteModel) throws Exception
+    public RMSite createRMSite(RMSite rmSiteModel)
     {
         mandatoryObject("rmSiteModel", rmSiteModel);
 
@@ -104,7 +104,7 @@ public class RMSiteAPI extends RMModelRequest
 
     /**
      * Delete RM site
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>Api Response code 400 Invalid parameter: DELETE request is supported only for the RM site</li>
      *  <li>Api Response code 401 If authentication failed</
@@ -113,7 +113,7 @@ public class RMSiteAPI extends RMModelRequest
      *  <li>Api Response code default Unexpected error</li>
      * </ul>
      */
-    public void deleteRMSite() throws Exception
+    public void deleteRMSite()
     {
         getRmRestWrapper().processEmptyModel(simpleRequest(
                 DELETE,
@@ -126,7 +126,7 @@ public class RMSiteAPI extends RMModelRequest
      *
      * @param rmSiteProperties The properties to be updated
      * @return The updated {@link RMSite}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>Api Response code 400 the update request is invalid {@code rmSiteModel} is invalid</li>
      *  <li>Api Response code 401 If authentication fails</li>
@@ -135,7 +135,7 @@ public class RMSiteAPI extends RMModelRequest
      *  <li>Api Response code default Unexpected error,model integrity exception</li>
      * </ul>
      */
-    public RMSite updateRMSite(RMSite rmSiteModel) throws Exception
+    public RMSite updateRMSite(RMSite rmSiteModel)
     {
         mandatoryObject("rmSiteProperties", rmSiteModel);
 
@@ -150,7 +150,7 @@ public class RMSiteAPI extends RMModelRequest
      * Checks if the RM site exists or not
      *
      * @return <code>true</code> if the RM site exists, <code>false</code> otherwise
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>Api Response code 400 Invalid parameter: GET request is supported only for the RM site</li>
      *  <li>Api Response code 401 If authentication failed</li>
@@ -158,7 +158,7 @@ public class RMSiteAPI extends RMModelRequest
      *  <li>Api Response code default Unexpected error</li>
      * </ul>
      */
-    public boolean existsRMSite() throws Exception
+    public boolean existsRMSite()
     {
         getSite();
         return getRmRestWrapper().getStatusCode().equals(OK.toString());

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -26,17 +26,17 @@
  */
 package org.alfresco.rest.rm.community.requests.gscore.api;
 
-import static com.jayway.restassured.RestAssured.basic;
-import static com.jayway.restassured.RestAssured.given;
-
 import static org.jglue.fluentjson.JsonBuilderFactory.buildObject;
 import static org.springframework.http.HttpStatus.OK;
 
 import com.google.gson.JsonObject;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.response.Response;
-import com.jayway.restassured.specification.RequestSpecification;
+
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
+import io.restassured.response.Response;
+import io.restassured.specification.RequestSpecification;
+import static io.restassured.RestAssured.basic;
+import static io.restassured.RestAssured.given;
 
 import org.alfresco.dataprep.AlfrescoHttpClient;
 import org.alfresco.dataprep.AlfrescoHttpClientFactory;
@@ -59,7 +59,7 @@ import org.alfresco.utility.model.UserModel;
 public class RMUserAPI extends RMModelRequest
 {
     /**
-     * @param rmRestWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public RMUserAPI(RMRestWrapper rmRestWrapper)
     {
@@ -84,11 +84,12 @@ public class RMUserAPI extends RMModelRequest
 
     /**
      * Assign RM role to user
+     *
      * @param userName User's username
      * @param userRole User's RM role, one of {@link UserRoles} roles
-     * @throws Exception for failed requests
+     * @throws RuntimeException for failed requests
      */
-    public void assignRoleToUser(String userName, String userRole) throws Exception
+    public void assignRoleToUser(String userName, String userRole)
     {
         UserModel adminUser = getRmRestWrapper().getTestUser();
 
@@ -97,31 +98,31 @@ public class RMUserAPI extends RMModelRequest
 
         // override v1 baseURI and basePath
         RequestSpecification spec = new RequestSpecBuilder()
-            .setBaseUri(client.getApiUrl())
-            .setBasePath("/")
-            .build();
+                .setBaseUri(client.getApiUrl())
+                .setBasePath("/")
+                .build();
 
         Response response = given()
-            .spec(spec)
-            .log().all()
-            .pathParam("role", userRole)
-            .pathParam("authority", userName)
-            .param("alf_ticket", client.getAlfTicket(adminUser.getUsername(),
-                adminUser.getPassword()))
-        .when()
-            .post("/rm/roles/{role}/authorities/{authority}")
-            .prettyPeek()
-            .andReturn();
+                .spec(spec)
+                .log().all()
+                .pathParam("role", userRole)
+                .pathParam("authority", userName)
+                .param("alf_ticket", client.getAlfTicket(adminUser.getUsername(),
+                        adminUser.getPassword()))
+                .when()
+                .post("/rm/roles/{role}/authorities/{authority}")
+                .prettyPeek()
+                .andReturn();
         getRmRestWrapper().setStatusCode(Integer.toString(response.getStatusCode()));
     }
 
     /**
      * Helper method to add permission on a component to user
-     * @param component The id of the file plan component on which permission should be given
+     * @param filePlanComponentId The id of the file plan component on which permission should be given
      * @param user {@link UserModel} for a user to be granted permission
      * @param permission {@link UserPermissions} to be granted
      */
-    public void addUserPermission(String filePlanComponentId, UserModel user, String permission)
+    public void addUserPermission(String filePlanComponentId, UserModel user, UserPermissions permission)
     {
         UserModel adminUser = getRmRestWrapper().getTestUser();
 
@@ -129,34 +130,76 @@ public class RMUserAPI extends RMModelRequest
         AlfrescoHttpClient client = getAlfrescoHttpClient();
 
         JsonObject bodyJson = buildObject()
-            .addArray("permissions")
+                .addArray("permissions")
                 .addObject()
-                    .add("authority", user.getUsername())
-                    .add("role", permission)
-                    .end()
-                    .getJson();
+                .add("authority", user.getUsername())
+                .add("role", permission.permissionId)
+                .end()
+                .getJson();
 
         // override v1 baseURI and basePath
         RequestSpecification spec = new RequestSpecBuilder()
-            .setBaseUri(client.getApiUrl())
-            .setBasePath("/")
-            .build();
+                .setBaseUri(client.getApiUrl())
+                .setBasePath("/")
+                .build();
 
         // execute an "old-style" API call
         Response response = given()
-            .spec(spec)
-            .auth().basic(adminUser.getUsername(), adminUser.getPassword())
-            .contentType(ContentType.JSON)
-            .body(bodyJson.toString())
-            .pathParam("nodeId", filePlanComponentId)
-            .log().all()
-        .when()
-            .post("/node/workspace/SpacesStore/{nodeId}/rmpermissions")
-            .prettyPeek()
-            .andReturn();
+                .spec(spec)
+                .auth().basic(adminUser.getUsername(), adminUser.getPassword())
+                .contentType(ContentType.JSON)
+                .body(bodyJson.toString())
+                .pathParam("nodeId", filePlanComponentId)
+                .log().all()
+                .when()
+                .post("/node/workspace/SpacesStore/{nodeId}/rmpermissions")
+                .prettyPeek()
+                .andReturn();
         getRmRestWrapper().setStatusCode(Integer.toString(response.getStatusCode()));
     }
 
+    /**
+     * Helper method to set permission inheritance on a file plan component
+     *
+     * @param filePlanComponentId The id of the file plan component on which inherited permission should be set
+     * @param isInherited          true if the permission is inherited
+     *                             false if the permission inheritance is disabled
+     */
+    public void setUserPermissionInheritance(String filePlanComponentId, Boolean isInherited)
+    {
+        final UserModel adminUser = getRmRestWrapper().getTestUser();
+
+        // get an "old-style" REST API client
+        final AlfrescoHttpClient client = getAlfrescoHttpClient();
+
+        final JsonObject bodyJson = buildObject()
+                .addArray("permissions")
+                .end()
+                .add("isInherited", isInherited)
+                .getJson();
+
+        // override v1 baseURI and basePath
+        RequestSpecification spec = new RequestSpecBuilder()
+                .setBaseUri(client.getApiUrl())
+                .setBasePath("/")
+                .build();
+
+        // execute an "old-style" API call
+        final Response response = given()
+                .spec(spec)
+                .auth().basic(adminUser.getUsername(), adminUser.getPassword())
+                .contentType(ContentType.JSON)
+                .body(bodyJson.toString())
+                .pathParam("nodeId", filePlanComponentId)
+                .log().all()
+                .when()
+                .post("/node/workspace/SpacesStore/{nodeId}/rmpermissions")
+                .prettyPeek()
+                .andReturn();
+        getRmRestWrapper().setStatusCode(Integer.toString(response.getStatusCode()));
+    }
+
+
     /**
      * Creates a user with the given name using the old APIs
      *
@@ -168,7 +211,7 @@ public class RMUserAPI extends RMModelRequest
     public boolean createUser(String userName, String userPassword, String userEmail)
     {
         UserModel adminUser = getRmRestWrapper().getTestUser();
-        AlfrescoHttpClient client = getAlfrescoHttpClient();
+        final AlfrescoHttpClient client = getAlfrescoHttpClient();
 
         JsonObject body = buildObject()
             .add("userName", userName)
@@ -178,7 +221,7 @@ public class RMUserAPI extends RMModelRequest
             .add("email", userEmail)
             .getJson();
 
-        RequestSpecification spec = new RequestSpecBuilder()
+        final RequestSpecification spec = new RequestSpecBuilder()
             .setBaseUri(client.getApiUrl())
             .setBasePath("/")
             .setAuth(basic(adminUser.getUsername(), adminUser.getPassword()))

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -54,7 +54,7 @@ public class RecordCategoryAPI extends RMModelRequest
     /**
      * Constructor.
      *
-     * @param restWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public RecordCategoryAPI(RMRestWrapper rmRestWrapper)
     {
@@ -65,7 +65,7 @@ public class RecordCategoryAPI extends RMModelRequest
      * Deletes a record category.
      *
      * @param recordCategoryId The identifier of a record category
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code recordCategoryId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -101,7 +101,7 @@ public class RecordCategoryAPI extends RMModelRequest
      * @param recordCategoryId The identifier of a record category
      * @param parameters The URL parameters to add
      * @return The {@link RecordCategory} for the given {@code recordCategoryId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code recordCategoryId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -124,7 +124,7 @@ public class RecordCategoryAPI extends RMModelRequest
     /**
      * see {@link #updateRecordCategory(RecordCategory, String, String)
      */
-    public RecordCategory updateRecordCategory(RecordCategory recordCategoryModel, String recordCategoryId) throws Exception
+    public RecordCategory updateRecordCategory(RecordCategory recordCategoryModel, String recordCategoryId)
     {
         mandatoryObject("recordCategoryModel", recordCategoryModel);
         mandatoryString("recordCategoryId", recordCategoryId);
@@ -139,7 +139,7 @@ public class RecordCategoryAPI extends RMModelRequest
      * @param recordCategoryId The identifier of a record category
      * @param parameters The URL parameters to add
      * @param returns The updated {@link RecordCategory}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>the update request is invalid or {@code recordCategoryId} is not a valid format or {@code recordCategoryModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -149,7 +149,7 @@ public class RecordCategoryAPI extends RMModelRequest
      *  <li>model integrity exception, including file name with invalid characters</li>
      * </ul>
      */
-    public RecordCategory updateRecordCategory(RecordCategory recordCategoryModel, String recordCategoryId, String parameters) throws Exception
+    public RecordCategory updateRecordCategory(RecordCategory recordCategoryModel, String recordCategoryId, String parameters)
     {
         mandatoryObject("recordCategoryModel", recordCategoryModel);
         mandatoryString("recordCategoryId", recordCategoryId);
@@ -179,7 +179,7 @@ public class RecordCategoryAPI extends RMModelRequest
      * @param recordCategoryId The identifier of a record category
      * @param parameters The URL parameters to add
      * @return The {@link RecordCategoryChildCollection} for the given {@code recordCategoryId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>authentication fails</li>
      *  <li>current user does not have permission to read {@code recordCategoryId}</li>

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

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -45,8 +45,8 @@ import java.util.Iterator;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
 
 import org.alfresco.rest.core.RMRestWrapper;
 import org.alfresco.rest.rm.community.model.record.Record;
@@ -66,7 +66,7 @@ public class RecordFolderAPI extends RMModelRequest
     /**
      * Constructor.
      *
-     * @param restWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public RecordFolderAPI(RMRestWrapper rmRestWrapper)
     {
@@ -77,7 +77,7 @@ public class RecordFolderAPI extends RMModelRequest
      * Deletes a record folder.
      *
      * @param recordFolderId The identifier of a record folder
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code recordFolderId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -113,7 +113,7 @@ public class RecordFolderAPI extends RMModelRequest
      * @param recordFolderId The identifier of a record folder
      * @param parameters The URL parameters to add
      * @return The {@link RecordFolder} for the given {@code recordFolderId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code recordFolderId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -136,7 +136,7 @@ public class RecordFolderAPI extends RMModelRequest
     /**
      * see {@link #updateRecordFolder(RecordFolder, String, String)
      */
-    public RecordFolder updateRecordFolder(RecordFolder recordFolderModel, String recordFolderId) throws Exception
+    public RecordFolder updateRecordFolder(RecordFolder recordFolderModel, String recordFolderId)
     {
         mandatoryObject("recordFolderModel", recordFolderModel);
         mandatoryString("recordFolderId", recordFolderId);
@@ -151,7 +151,7 @@ public class RecordFolderAPI extends RMModelRequest
      * @param recordFolderId The identifier of a record folder
      * @param parameters The URL parameters to add
      * @param returns The updated {@link RecordFolder}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>the update request is invalid or {@code recordFolderId} is not a valid format or {@code recordFolderModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -161,7 +161,7 @@ public class RecordFolderAPI extends RMModelRequest
      *  <li>model integrity exception, including file name with invalid characters</li>
      * </ul>
      */
-    public RecordFolder updateRecordFolder(RecordFolder recordFolderModel, String recordFolderId, String parameters) throws Exception
+    public RecordFolder updateRecordFolder(RecordFolder recordFolderModel, String recordFolderId, String parameters)
     {
         mandatoryObject("recordFolderModel", recordFolderModel);
         mandatoryString("recordFolderId", recordFolderId);
@@ -191,7 +191,7 @@ public class RecordFolderAPI extends RMModelRequest
      * @param recordFolderId The identifier of a record folder
      * @param parameters The URL parameters to add
      * @return The {@link RecordFolderCollection} for the given {@code recordFolderId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>authentication fails</li>
      *  <li>current user does not have permission to read {@code recordFolderId}</li>

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordsAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -37,13 +37,14 @@ import static org.springframework.http.HttpMethod.GET;
 import static org.springframework.http.HttpMethod.POST;
 import static org.springframework.http.HttpMethod.PUT;
 
-import com.jayway.restassured.response.ResponseBody;
 
 import org.alfresco.rest.core.RMRestWrapper;
 import org.alfresco.rest.rm.community.model.record.Record;
 import org.alfresco.rest.rm.community.model.record.RecordBodyFile;
 import org.alfresco.rest.rm.community.requests.RMModelRequest;
 
+import io.restassured.response.ResponseBody;
+
 /**
  * Records REST API Wrapper
  *
@@ -53,7 +54,7 @@ import org.alfresco.rest.rm.community.requests.RMModelRequest;
 public class RecordsAPI extends RMModelRequest
 {
     /**
-     * @param rmRestWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public RecordsAPI(RMRestWrapper rmRestWrapper)
     {
@@ -65,7 +66,7 @@ public class RecordsAPI extends RMModelRequest
      *
      * @param recordId The id of the electronic record
      * @return {@link ResponseBody} representing content for the given record id
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      * <li>{@code recordId} has no content</li>
      * <li> {@code recordId} is not a valid format, or is not a record</li>
@@ -73,7 +74,7 @@ public class RecordsAPI extends RMModelRequest
      * <li>{@code recordId} does not exist</li>
      * </ul>
      */
-    public ResponseBody<?> getRecordContent(String recordId) throws Exception
+    public ResponseBody<?> getRecordContent(String recordId)
     {
         mandatoryString("recordId", recordId);
 
@@ -89,7 +90,7 @@ public class RecordsAPI extends RMModelRequest
      * @param recordBodyFile The properties where to file the record
      * @param recordId       The id of the record to file
      * @return The {@link Record} with the given properties
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>Invalid parameter: {@code recordBodyFile} is not a valid format,{@code recordId} is not a record</li>
      *  <li>authentication fails</li>
@@ -100,7 +101,7 @@ public class RecordsAPI extends RMModelRequest
      * </ul>
      *
      */
-    public Record fileRecord(RecordBodyFile recordBodyFile, String recordId) throws Exception
+    public Record fileRecord(RecordBodyFile recordBodyFile, String recordId)
     {
         mandatoryObject("recordBodyFile", recordBodyFile);
         mandatoryString("recordId", recordId);
@@ -114,7 +115,7 @@ public class RecordsAPI extends RMModelRequest
      * @param recordBodyFile The properties where to file the record
      * @param recordId       The id of the record to file
      * @return The {@link Record} with the given properties
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>Invalid parameter: {@code recordBodyFile} is not a valid format,{@code recordId} is not a record</li>
      *  <li>authentication fails</li>
@@ -125,7 +126,7 @@ public class RecordsAPI extends RMModelRequest
      * </ul>
      *
      */
-    public Record fileRecord(RecordBodyFile recordBodyFile, String recordId, String parameters) throws Exception
+    public Record fileRecord(RecordBodyFile recordBodyFile, String recordId, String parameters)
     {
         mandatoryObject("requestBodyFile", recordBodyFile);
         mandatoryString("recordId", recordId);
@@ -142,7 +143,7 @@ public class RecordsAPI extends RMModelRequest
     /**
      * see {@link #completeRecord(String, String)
      */
-    public Record completeRecord(String recordId) throws Exception
+    public Record completeRecord(String recordId)
     {
         mandatoryString("recordId", recordId);
 
@@ -154,7 +155,7 @@ public class RecordsAPI extends RMModelRequest
      *
      * @param recordId The id of the record to complete
      * @return The completed {@link Record} with the given properties
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      *                   <ul>
      *                   <li>Invalid parameter: {@code recordId} is not a record</li>
      *                   <li>authentication fails</li>
@@ -164,7 +165,7 @@ public class RecordsAPI extends RMModelRequest
      *                   <li>model integrity exception: the record has missing meta-data</li>
      *                   </ul>
      */
-    public Record completeRecord(String recordId, String parameters) throws Exception
+    public Record completeRecord(String recordId, String parameters)
     {
         mandatoryString("recordId", recordId);
 
@@ -179,7 +180,7 @@ public class RecordsAPI extends RMModelRequest
      * Deletes a record.
      *
      * @param recordId The identifier of a record
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code recordId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -215,7 +216,7 @@ public class RecordsAPI extends RMModelRequest
      * @param recordId The identifier of a record
      * @param parameters The URL parameters to add
      * @return The {@link Record} for the given {@code recordId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code recordId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -238,7 +239,7 @@ public class RecordsAPI extends RMModelRequest
     /**
      * see {@link #updateRecord(Record, String, String)
      */
-    public Record updateRecord(Record recordModel, String recordId) throws Exception
+    public Record updateRecord(Record recordModel, String recordId)
     {
         mandatoryObject("recordModel", recordModel);
         mandatoryString("recordId", recordId);
@@ -253,7 +254,7 @@ public class RecordsAPI extends RMModelRequest
      * @param recordId The identifier of a record
      * @param parameters The URL parameters to add
      * @return The updated {@link Record}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>the update request is invalid or {@code recordId} is not a valid format or {@code recordModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -263,7 +264,7 @@ public class RecordsAPI extends RMModelRequest
      *  <li>model integrity exception, including file name with invalid characters</li>
      * </ul>
      */
-    public Record updateRecord(Record recordModel, String recordId, String parameters) throws Exception
+    public Record updateRecord(Record recordModel, String recordId, String parameters)
     {
         mandatoryObject("recordModel", recordModel);
         mandatoryString("recordId", recordId);

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/TransferAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -46,7 +46,7 @@ import org.alfresco.rest.rm.community.requests.RMModelRequest;
 public class TransferAPI extends RMModelRequest
 {
     /**
-     * @param rmRestWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public TransferAPI(RMRestWrapper rmRestWrapper)
     {
@@ -69,7 +69,7 @@ public class TransferAPI extends RMModelRequest
      * @param transferId The identifier of a transfer
      * @param parameters The URL parameters to add
      * @return The {@link Transfer} for the given {@code transferId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code transferId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -104,7 +104,7 @@ public class TransferAPI extends RMModelRequest
      * @param transferId The identifier of a transfer
      * @param parameters The URL parameters to add
      * @return The {@link TransferChildCollection} for the given {@code transferId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>authentication fails</li>
      *  <li>current user does not have permission to read {@code transferId}</li>

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/TransferContainerAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -50,7 +50,7 @@ import org.alfresco.rest.rm.community.requests.RMModelRequest;
 public class TransferContainerAPI extends RMModelRequest
 {
     /**
-     * @param rmRestWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public TransferContainerAPI(RMRestWrapper rmRestWrapper)
     {
@@ -73,7 +73,7 @@ public class TransferContainerAPI extends RMModelRequest
      * @param transferContainerId The identifier of a transfer container
      * @param parameters The URL parameters to add
      * @return The {@link TransferContainer} for the given {@code transferContainerId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code transferContainerId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -96,7 +96,7 @@ public class TransferContainerAPI extends RMModelRequest
     /**
      * see {@link #updateTransferContainer(TransferContainer, String, String)
      */
-    public TransferContainer updateTransferContainer(TransferContainer transferContainerModel, String transferContainerId) throws Exception
+    public TransferContainer updateTransferContainer(TransferContainer transferContainerModel, String transferContainerId)
     {
         mandatoryObject("transferContainerModel", transferContainerModel);
         mandatoryString("transferContainerId", transferContainerId);
@@ -111,7 +111,7 @@ public class TransferContainerAPI extends RMModelRequest
      * @param transferContainerId The identifier of a transfer container
      * @param parameters The URL parameters to add
      * @param returns The updated {@link TransferContainer}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>the update request is invalid or {@code transferContainerId} is not a valid format or {@code transferContainerModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -121,7 +121,7 @@ public class TransferContainerAPI extends RMModelRequest
      *  <li>model integrity exception, including transfer container name with invalid characters</li>
      * </ul>
      */
-    public TransferContainer updateTransferContainer(TransferContainer transferContainerModel, String transferContainerId, String parameters) throws Exception
+    public TransferContainer updateTransferContainer(TransferContainer transferContainerModel, String transferContainerId, String parameters)
     {
         mandatoryObject("transferContainerModel", transferContainerModel);
         mandatoryString("transferContainerId", transferContainerId);
@@ -151,7 +151,7 @@ public class TransferContainerAPI extends RMModelRequest
      * @param transferContainerId The identifier of a transfer container
      * @param parameters The URL parameters to add
      * @return The {@link TransferCollection} for the given {@code transferContainerId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>authentication fails</li>
      *  <li>current user does not have permission to read {@code transferContainerId}</li>

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/UnfiledContainerAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -39,12 +39,14 @@ import static org.springframework.http.HttpMethod.PUT;
 import static org.testng.Assert.fail;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Iterator;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
+
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
 
 import org.alfresco.rest.core.RMRestWrapper;
 import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainer;
@@ -63,7 +65,7 @@ import org.alfresco.rest.rm.community.util.UnfiledContainerChildMixin;
 public class UnfiledContainerAPI extends RMModelRequest
 {
     /**
-     * @param rmRestWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public UnfiledContainerAPI(RMRestWrapper rmRestWrapper)
     {
@@ -86,7 +88,7 @@ public class UnfiledContainerAPI extends RMModelRequest
      * @param unfiledContainerId The identifier of a unfiled record container
      * @param parameters The URL parameters to add
      * @return The {@link UnfiledContainer} for the given {@code unfiledContainerId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code unfiledContainerId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -122,7 +124,7 @@ public class UnfiledContainerAPI extends RMModelRequest
      * @param unfiledContainerId The identifier of an unfiled records container
      * @param parameters The URL parameters to add
      * @return The {@link UnfiledContainerChildCollection} for the given {@code unfiledContainerId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>authentication fails</li>
      *  <li>current user does not have permission to read {@code unfiledContainerId}</li>
@@ -144,7 +146,7 @@ public class UnfiledContainerAPI extends RMModelRequest
     /**
      * see {@link #createUnfiledContainerChild(UnfiledContainerChild, String, String)}
      */
-    public UnfiledContainerChild createUnfiledContainerChild(UnfiledContainerChild unfiledContainerChildModel, String unfiledContainerId) throws Exception
+    public UnfiledContainerChild createUnfiledContainerChild(UnfiledContainerChild unfiledContainerChildModel, String unfiledContainerId)
     {
         mandatoryObject("unfiledContainerChildModel", unfiledContainerChildModel);
         mandatoryString("unfiledContainerId", unfiledContainerId);
@@ -159,7 +161,7 @@ public class UnfiledContainerAPI extends RMModelRequest
      * @param unfiledContainerId The identifier of an unfiled container
      * @param parameters The URL parameters to add
      * @return The created {@link UnfiledContainerChild}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code unfiledContainerId} is not a valid format or {@code unfiledContainerChildModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -169,7 +171,7 @@ public class UnfiledContainerAPI extends RMModelRequest
      *  <li>model integrity exception, including node name with invalid characters</li>
      * </ul>
      */
-    public UnfiledContainerChild createUnfiledContainerChild(UnfiledContainerChild unfiledContainerChildModel, String unfiledContainerId, String parameters) throws Exception
+    public UnfiledContainerChild createUnfiledContainerChild(UnfiledContainerChild unfiledContainerChildModel, String unfiledContainerId, String parameters)
     {
         mandatoryObject("unfiledContainerChildModel", unfiledContainerChildModel);
         mandatoryString("unfiledContainerId", unfiledContainerId);
@@ -190,9 +192,9 @@ public class UnfiledContainerAPI extends RMModelRequest
      * @param unfiledContainerChildContent {@link File} pointing to the content of the electronic record to be created
      * @param unfiledContainerId The identifier of a unfiled container
      * @return newly created {@link UnfiledContainerChild}
-     * @throws Exception for invalid recordModel JSON strings
+     * @throws RuntimeException for invalid recordModel JSON strings
      */
-    public UnfiledContainerChild uploadRecord(UnfiledContainerChild unfiledContainerChildModel, String unfiledContainerId, File unfiledContainerChildContent) throws Exception
+    public UnfiledContainerChild uploadRecord(UnfiledContainerChild unfiledContainerChildModel, String unfiledContainerId, File unfiledContainerChildContent)
     {
         mandatoryObject("unfiledContainerChildModel", unfiledContainerChildModel);
         mandatoryObject("unfiledContainerChildContent", unfiledContainerChildContent);
@@ -208,7 +210,15 @@ public class UnfiledContainerAPI extends RMModelRequest
          * to the request.
          */
         RequestSpecBuilder builder = getRmRestWrapper().configureRequestSpec();
-        JsonNode root = new ObjectMapper().readTree(toJson(unfiledContainerChildModel, UnfiledContainerChild.class, UnfiledContainerChildMixin.class));
+        JsonNode root;
+        try
+        {
+            root = new ObjectMapper().readTree(toJson(unfiledContainerChildModel, UnfiledContainerChild.class, UnfiledContainerChildMixin.class));
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException("Failed to convert model to JSON.", e);
+        }
         // add request fields
         Iterator<String> fieldNames = root.fieldNames();
         while (fieldNames.hasNext())
@@ -225,7 +235,7 @@ public class UnfiledContainerAPI extends RMModelRequest
     /**
      * see {@link #updateUnfiledContainer(UnfiledContainer, String, String)
      */
-    public UnfiledContainer updateUnfiledContainer(UnfiledContainer unfiledContainerModel, String unfiledContainerId) throws Exception
+    public UnfiledContainer updateUnfiledContainer(UnfiledContainer unfiledContainerModel, String unfiledContainerId)
     {
         mandatoryObject("unfiledContainerModel", unfiledContainerModel);
         mandatoryString("unfiledContainerId", unfiledContainerId);
@@ -240,7 +250,7 @@ public class UnfiledContainerAPI extends RMModelRequest
      * @param unfiledContainerId The identifier of an unfiled record container
      * @param parameters The URL parameters to add
      * @param returns The updated {@link UnfiledContainer}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>the update request is invalid or {@code unfiledContainerId} is not a valid format or {@code unfiledContainerModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -250,7 +260,7 @@ public class UnfiledContainerAPI extends RMModelRequest
      *  <li>model integrity exception, including file name with invalid characters</li>
      * </ul>
      */
-    public UnfiledContainer updateUnfiledContainer(UnfiledContainer unfiledContainerModel, String unfiledContainerId, String parameters) throws Exception
+    public UnfiledContainer updateUnfiledContainer(UnfiledContainer unfiledContainerModel, String unfiledContainerId, String parameters)
     {
         mandatoryObject("unfiledContainerModel", unfiledContainerModel);
         mandatoryString("unfiledContainerId", unfiledContainerId);

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/UnfiledRecordFolderAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -40,12 +40,13 @@ import static org.springframework.http.HttpMethod.PUT;
 import static org.testng.Assert.fail;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Iterator;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.http.ContentType;
 
 import org.alfresco.rest.core.RMRestWrapper;
 import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainerChild;
@@ -63,7 +64,7 @@ import org.alfresco.rest.rm.community.util.UnfiledContainerChildMixin;
 public class UnfiledRecordFolderAPI extends RMModelRequest
 {
     /**
-     * @param rmRestWrapper
+     * @param rmRestWrapper RM REST Wrapper
      */
     public UnfiledRecordFolderAPI(RMRestWrapper rmRestWrapper)
     {
@@ -86,7 +87,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      * @param unfiledRecordFolderId The identifier of a unfiled record folder
      * @param parameters The URL parameters to add
      * @return The {@link UnfiledRecordFolder} for the given {@code unfiledRecordFolderId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code unfiledRecordFolderId} is not a valid format</li>
      *  <li>authentication fails</li>
@@ -122,7 +123,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      * @param unfiledRecordFolderId The identifier of an unfiled records folder
      * @param parameters The URL parameters to add
      * @return The {@link UnfiledRecordFolderChildCollection} for the given {@code unfiledRecordFolderId}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>authentication fails</li>
      *  <li>current user does not have permission to read {@code unfiledRecordFolderId}</li>
@@ -144,7 +145,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
     /**
      * see {@link #createUnfiledRecordFolderChild(UnfiledContainerChild, String, String)}
      */
-    public UnfiledContainerChild createUnfiledRecordFolderChild(UnfiledContainerChild unfiledRecordFolderChildModel, String unfiledRecordFolderId) throws Exception
+    public UnfiledContainerChild createUnfiledRecordFolderChild(UnfiledContainerChild unfiledRecordFolderChildModel, String unfiledRecordFolderId)
     {
         mandatoryObject("unfiledRecordFolderChildModel", unfiledRecordFolderChildModel);
         mandatoryString("unfiledRecordFolderId", unfiledRecordFolderId);
@@ -159,7 +160,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      * @param unfiledRecordFolderId The identifier of an unfiled folder
      * @param parameters The URL parameters to add
      * @return The created {@link UnfiledRecordFolderChild}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code unfiledRecordFolderId} is not a valid format or {@code unfiledRecordFolderChildModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -169,7 +170,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      *  <li>model integrity exception, including node name with invalid characters</li>
      * </ul>
      */
-    public UnfiledContainerChild createUnfiledRecordFolderChild(UnfiledContainerChild unfiledRecordFolderChildModel, String unfiledRecordFolderId, String parameters) throws Exception
+    public UnfiledContainerChild createUnfiledRecordFolderChild(UnfiledContainerChild unfiledRecordFolderChildModel, String unfiledRecordFolderId, String parameters)
     {
         mandatoryObject("unfiledRecordFolderChildModel", unfiledRecordFolderChildModel);
         mandatoryString("unfiledRecordFolderId", unfiledRecordFolderId);
@@ -190,9 +191,9 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      * @param unfiledRecordFolderChildContent {@link File} pointing to the content of the electronic record to be created
      * @param unfiledRecordFolderId The identifier of a unfiled record folder
      * @return newly created {@link UnfiledContainerChild}
-     * @throws Exception for invalid recordModel JSON strings
+     * @throws RuntimeException for invalid recordModel JSON strings
      */
-    public UnfiledContainerChild uploadRecord(UnfiledContainerChild unfiledRecordFolderChildModel, String unfiledRecordFolderId, File unfiledRecordFolderChildContent) throws Exception
+    public UnfiledContainerChild uploadRecord(UnfiledContainerChild unfiledRecordFolderChildModel, String unfiledRecordFolderId, File unfiledRecordFolderChildContent)
     {
         mandatoryObject("unfiledRecordFolderChildModel", unfiledRecordFolderChildModel);
         mandatoryObject("unfiledRecordFolderChildContent", unfiledRecordFolderChildContent);
@@ -208,7 +209,15 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
          * to the request.
          */
         RequestSpecBuilder builder = getRmRestWrapper().configureRequestSpec();
-        JsonNode root = new ObjectMapper().readTree(toJson(unfiledRecordFolderChildModel, UnfiledContainerChild.class, UnfiledContainerChildMixin.class));
+        JsonNode root;
+        try
+        {
+            root = new ObjectMapper().readTree(toJson(unfiledRecordFolderChildModel, UnfiledContainerChild.class, UnfiledContainerChildMixin.class));
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException("Failed to convert model to JSON.", e);
+        }
         // add request fields
         Iterator<String> fieldNames = root.fieldNames();
         while (fieldNames.hasNext())
@@ -225,7 +234,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
     /**
      * see {@link #updateUnfiledRecordFolder(UnfiledRecordFolder, String, String)
      */
-    public UnfiledRecordFolder updateUnfiledRecordFolder(UnfiledRecordFolder unfiledRecordFolderModel, String unfiledRecordFolderId) throws Exception
+    public UnfiledRecordFolder updateUnfiledRecordFolder(UnfiledRecordFolder unfiledRecordFolderModel, String unfiledRecordFolderId)
     {
         mandatoryObject("unfiledRecordFolderModel", unfiledRecordFolderModel);
         mandatoryString("unfiledRecordFolderId", unfiledRecordFolderId);
@@ -240,7 +249,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      * @param unfiledRecordFolderId The identifier of an unfiled record folder
      * @param parameters The URL parameters to add
      * @param returns The updated {@link UnfiledRecordFolder}
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>the update request is invalid or {@code unfiledRecordFolderId} is not a valid format or {@code unfiledRecordFolderModel} is invalid</li>
      *  <li>authentication fails</li>
@@ -250,7 +259,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      *  <li>model integrity exception, including file name with invalid characters</li>
      * </ul>
      */
-    public UnfiledRecordFolder updateUnfiledRecordFolder(UnfiledRecordFolder unfiledRecordFolderModel, String unfiledRecordFolderId, String parameters) throws Exception
+    public UnfiledRecordFolder updateUnfiledRecordFolder(UnfiledRecordFolder unfiledRecordFolderModel, String unfiledRecordFolderId, String parameters)
     {
         mandatoryObject("unfiledRecordFolderModel", unfiledRecordFolderModel);
         mandatoryString("unfiledRecordFolderId", unfiledRecordFolderId);
@@ -268,7 +277,7 @@ public class UnfiledRecordFolderAPI extends RMModelRequest
      * Deletes an unfiled record folder.
      *
      * @param unfiledRecordFolderId The identifier of a unfiled record folder
-     * @throws Exception for the following cases:
+     * @throws RuntimeException for the following cases:
      * <ul>
      *  <li>{@code unfiledRecordFolderId} is not a valid format</li>
      *  <li>authentication fails</li>

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/CommonTestUtils.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/DockerHelper.java

@@ -0,0 +1,142 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * -
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * -
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.rest.rm.community.util;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.command.LogContainerCmd;
+import com.github.dockerjava.api.model.Container;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.core.DockerClientBuilder;
+import com.github.dockerjava.core.command.LogContainerResultCallback;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang.SystemUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+/**
+ * Helper class for interaction with docker containers
+ *
+ * @author Claudia Agache
+ * @since 3.1
+ */
+@Service
+public class DockerHelper
+{
+    private static final Logger LOGGER = LoggerFactory.getLogger(DockerHelper.class);
+    private static final String REPO_IMAGE_NAME = "repository";
+    @Getter
+    @Setter
+    private DockerClient dockerClient;
+
+    @Autowired
+    public DockerHelper(@Value ("${docker.host}") String dockerHost)
+    {
+        if (SystemUtils.IS_OS_WINDOWS)
+        {
+            this.dockerClient = DockerClientBuilder.getInstance(dockerHost).build();
+        }
+        else
+        {
+            this.dockerClient = DockerClientBuilder.getInstance().build();
+        }
+    }
+
+    /**
+     * Method for returning logs of docker container
+     *
+     * @param containerId - ID of the container
+     * @return list of strings, where every string is log line
+     */
+    private List<String> getDockerLogs(String containerId)
+    {
+        final List<String> logs = new ArrayList<>();
+        // get the logs since current time - 10 seconds
+        final int timeStamp = (int) (System.currentTimeMillis() / 1000) - 10;
+
+        final LogContainerCmd logContainerCmd = getDockerClient().logContainerCmd(containerId);
+        logContainerCmd.withStdOut(true)
+                       .withStdErr(true)
+                       .withSince(timeStamp) // UNIX timestamp to filter logs. Output log-entries since that timestamp.
+                       .withTimestamps(true); //print timestamps for every log line
+
+        try
+        {
+            logContainerCmd.exec(new LogContainerResultCallback()
+            {
+                @Override
+                public void onNext(Frame item)
+                {
+                    logs.add(item.toString());
+                }
+            }).awaitCompletion();
+        }
+        catch (InterruptedException e)
+        {
+            Thread.currentThread().interrupt();  // set interrupt flag
+            LOGGER.error("Failed to retrieve logs of container " + containerId, e);
+        }
+
+        return logs;
+    }
+
+    /**
+     * Get the alfresco container logs
+     *
+     * @return list of strings, where every string is log line
+     */
+    public List<String> getAlfrescoLogs()
+    {
+        final Optional<Container> alfrescoContainer = findContainerByImageName(REPO_IMAGE_NAME);
+        return (alfrescoContainer.isPresent()) ? getDockerLogs(alfrescoContainer.get().getId()) : Collections.emptyList();
+    }
+
+    /**
+     * Method for finding a docker container after the image name
+     *
+     * @param imageName - the name of the image used by container
+     * @return the container
+     */
+    private Optional<Container> findContainerByImageName(String imageName)
+    {
+        final List<Container> containers = getDockerClient().listContainersCmd().withShowAll(true).exec();
+
+        return containers.stream()
+                         .filter(container -> container.getImage().contains(imageName))
+                         .findFirst();
+    }
+}

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/FilePlanComponentMixIn.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/ParameterCheck.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/PojoUtility.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -28,9 +28,18 @@ package org.alfresco.rest.rm.community.util;
 
 import static org.alfresco.rest.rm.community.util.ParameterCheck.mandatoryObject;
 
+import java.io.IOException;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.CollectionType;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Utility class for creating the json object
@@ -40,6 +49,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  */
 public class PojoUtility
 {
+    /**
+     * Logger for the class.
+     */
+    private static final Logger LOGGER = LoggerFactory.getLogger(PojoUtility.class);
+
     /**
      * see {@link #toJson(Object, Class, Class)}
      */
@@ -85,4 +99,64 @@ public class PojoUtility
             return error.toString();
         }
     }
+
+    /**
+     * Converting json to  java object
+     *
+     * @param json   The json object to convert
+     * @param classz Class  for the java object
+     * @return The converted java object
+     * @throws JsonProcessingException Throws exceptions if the given object doesn't match to the POJO class model
+     */
+    public static <T> T jsonToObject(JSONObject json, Class<T> classz)
+    {
+        mandatoryObject("model", classz);
+        mandatoryObject("jsonObject", json);
+
+        ObjectMapper mapper = new ObjectMapper();
+
+        T obj = null;
+        try
+        {
+            obj = mapper.readValue(json.toString(), classz);
+        }
+        catch (IOException e)
+        {
+            LOGGER.error("Unable to convert the json into a java object.", e.toString());
+        }
+
+        return obj;
+    }
+
+    /**
+     * Converting json array into a list of java objects
+     *
+     * @param json   The json array to convert
+     * @param classz Class  for the java object
+     * @return The list of converted java objects
+     * @throws JsonProcessingException Throws exceptions if the given object doesn't match to the POJO class model
+     */
+    public static <T> List<T> jsonToObject(JSONArray json, Class<T> classz)
+    {
+
+        mandatoryObject("model", classz);
+        mandatoryObject("jsonObject", json);
+
+        ObjectMapper mapper = new ObjectMapper();
+
+        CollectionType collectionType = mapper.getTypeFactory().constructCollectionType(List.class, classz);
+        List<T> asList = null;
+        try
+        {
+            asList = mapper.readValue(json.toString(), collectionType);
+        }
+        catch (IOException e)
+        {
+            LOGGER.error("Unable to convert the json array into a java collection.", e.toString());
+        }
+
+
+        return asList;
+    }
+
 }

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/ReviewPeriodSerializer.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/UnfiledContainerChildMixin.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/CopyToAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/CustomDefinitionsAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/HoldsAPI.java

@@ -0,0 +1,327 @@
+/*-
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * -
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * -
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.v0;
+
+import static org.alfresco.rest.core.v0.APIUtils.convertHTTPResponseToJSON;
+import static org.apache.http.HttpStatus.SC_OK;
+import static org.testng.AssertJUnit.assertNotNull;
+
+import java.text.MessageFormat;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.alfresco.rest.core.v0.APIUtils;
+import org.alfresco.rest.core.v0.BaseAPI;
+import org.alfresco.rest.rm.community.model.hold.HoldEntry;
+import org.alfresco.rest.rm.community.util.PojoUtility;
+import org.alfresco.utility.Utility;
+import org.apache.chemistry.opencmis.client.api.CmisObject;
+import org.apache.http.HttpResponse;
+import org.apache.http.ParseException;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.stereotype.Component;
+
+/**
+ * Methods to make API requests using v0 API for generalized holds
+ *
+ * @author Rodica Sutu
+ * @since 3.2
+ */
+@Component
+public class HoldsAPI extends BaseAPI
+{
+    public static final String HOLDS_CONTAINER = "Holds";
+    /**
+     * The URI to create a hold
+     */
+    private static final String CREATE_HOLDS_API = "{0}type/rma:hold/formprocessor";
+
+    /**
+     * The URI to add items to hold or to remove items from hold
+     */
+    private static final String RM_HOLDS_API = "{0}rma/holds";
+
+    /**
+     * The URI to  get holds.
+     */
+    private static final String GET_RM_HOLDS = RM_HOLDS_API + "?{1}";
+
+    /**
+     * Util method to create a hold
+     *
+     * @param user        the user creating the hold
+     * @param password    the user's password
+     * @param holdName    the hold name
+     * @param reason      hold reason
+     * @param description hold description
+     * @return The HTTP response (or null if no POST call was needed).
+     */
+    public HttpResponse createHold(String user, String password,
+                                          String holdName, String reason, String description)
+    {
+        // if the hold already exists don't try to create it again
+        final String fullHoldPath = Utility.buildPath(getFilePlanPath(), HOLDS_CONTAINER) + holdName;
+        final CmisObject hold = getObjectByPath(user, password, fullHoldPath);
+        if (hold != null)
+        {
+            return null;
+        }
+        // retrieve the Holds container nodeRef
+        final String parentNodeRef = getItemNodeRef(user, password, "/" + HOLDS_CONTAINER);
+
+        final JSONObject requestParams = new JSONObject();
+        requestParams.put("alf_destination", getNodeRefSpacesStore() + parentNodeRef);
+        requestParams.put("prop_cm_name", holdName);
+        requestParams.put("prop_cm_description", description);
+        requestParams.put("prop_rma_holdReason", reason);
+
+        // Make the POST request and throw an assertion error if it fails.
+        final HttpResponse httpResponse = doPostJsonRequest(user, password, SC_OK, requestParams, CREATE_HOLDS_API);
+        assertNotNull("Expected object to have been created at " + fullHoldPath,
+                getObjectByPath(user, password, fullHoldPath));
+        return httpResponse;
+    }
+
+    /**
+     * Create a hold and get the node ref of the hold from the response body
+     *
+     * @param user        the user creating the hold
+     * @param password    the user's password
+     * @param holdName    the hold name to be created
+     * @param reason      reason of the hold to be created
+     * @param description hold description
+     * @return node ref of the hold created
+     */
+    public String createHoldAndGetNodeRef(String user, String password,
+                                     String holdName, String reason, String description)
+    {
+        final HttpResponse httpResponse = createHold(user, password, holdName, reason, description);
+
+        try
+        {
+           return convertHTTPResponseToJSON(httpResponse).getString("persistedObject")
+                                .replace(NODE_REF_WORKSPACE_SPACES_STORE, "");
+        }
+        catch(JSONException error)
+        {
+            LOGGER.error("Converting message body to JSON failed. Body: {}", httpResponse, error);
+        }
+        catch(ParseException error)
+        {
+            LOGGER.error("Parsing message body failed.", error);
+        }
+
+        return null;
+    }
+
+    /**
+     * Deletes hold
+     *
+     * @param username user's username
+     * @param password its password
+     * @param holdName the hold name
+     * @throws AssertionError if the deletion was unsuccessful.
+     */
+    public void deleteHold( String username, String password, String holdName)
+    {
+        deleteItem(username, password, String.format("/%s/%s", HOLDS_CONTAINER, holdName));
+    }
+
+    /**
+     * Adds item(content/record/record folder) to the hold
+     *
+     * @param user        the user who adds the item to the hold
+     * @param password    the user's password
+     * @param itemNodeRef the nodeRef of the item to be added to hold
+     * @param holdName    the hold name
+     * @return The HTTP response
+     */
+    public HttpResponse addItemToHold(String user, String password, String itemNodeRef, String holdName)
+    {
+        return addItemsToHolds(user, password, Collections.singletonList(itemNodeRef), Collections.singletonList(holdName));
+    }
+
+    /**
+     * Adds a list of items (content/record/record folder) to a list of holds
+     *
+     * @param user         the user who adds the items to the holds
+     * @param password     the user's password
+     * @param itemNodeRefs the list of items nodeRefs to be added to holds
+     * @param holdNames    the list of holds
+     * @return The HTTP response
+     */
+    public HttpResponse addItemsToHolds(String user, String password, List<String> itemNodeRefs, List<String> holdNames)
+    {
+        return addItemsToHolds(user, password, SC_OK, itemNodeRefs, holdNames);
+    }
+
+    /**
+     * Adds a list of items (content/record/record folder) to a list of holds
+     *
+     * @param user         the user who adds the items to the holds
+     * @param password     the user's password
+     * @param itemNodeRefs the list of items nodeRefs to be added to holds
+     * @param holdNames    the list of holds
+     * @return The HTTP response
+     */
+    public HttpResponse addItemsToHolds(String user, String password, int expectedStatus, List<String> itemNodeRefs,
+                                        List<String> holdNames)
+    {
+        final JSONObject requestParams = addOrRemoveToFromHoldJsonObject(user, password, itemNodeRefs, holdNames);
+        return doPostJsonRequest(user, password, expectedStatus, requestParams, RM_HOLDS_API);
+    }
+
+    /**
+     * Util method to add item(content/record/record folder) to the hold and get the error message
+     *
+     * @param user        the user who adds the item to the hold
+     * @param password    the user's password
+     * @param itemNodeRef the nodeRef of the item to be added to hold
+     * @param holdName    the hold name
+     * @return The error message
+     */
+    public String addToHoldAndGetMessage(String user, String password, int expectedStatus, String itemNodeRef, String
+            holdName)
+    {
+        final HttpResponse httpResponse = addItemsToHolds(user, password, expectedStatus, Collections.singletonList(itemNodeRef),
+                Collections.singletonList(holdName));
+        return APIUtils.extractErrorMessageFromHttpResponse(httpResponse);
+    }
+
+    /**
+     * Util method to create the request body used when adding items to holds or when removing items from holds
+     *
+     * @param user      user to create the request body for add/remove an item to/from hold
+     * @param password  the user's password
+     * @param items     list of items node refs to be added to holds
+     * @param holdNames list of hold names for add/remove items
+     * @return JSONObject fo
+     */
+    private JSONObject addOrRemoveToFromHoldJsonObject(String user, String password, List<String> items, List<String> holdNames)
+    {
+        final JSONArray nodeRefs = new JSONArray();
+        items.forEach(itemNodeRef -> nodeRefs.put(getNodeRefSpacesStore() + itemNodeRef));
+        final List<String> holdNodeRefs = holdNames.stream().map(hold ->
+                getNodeRefSpacesStore() + getItemNodeRef(user, password, String.format("/%s/%s", HOLDS_CONTAINER, hold)))
+                                                   .collect(Collectors.toList());
+        final JSONArray holds = new JSONArray();
+        holdNodeRefs.forEach(holds::put);
+        final JSONObject requestParams = new JSONObject();
+        requestParams.put("nodeRefs", nodeRefs);
+        requestParams.put("holds", holds);
+        return requestParams;
+    }
+
+    /**
+     * Remove item(content/record/record folder) from hold
+     *
+     * @param user        the user who removes the item from the hold
+     * @param password    the user's password
+     * @param itemNodeRef the nodeRef of the item to be removed from hold
+     * @param holdName    the hold name
+     * @return The HTTP response
+     */
+    public HttpResponse removeItemFromHold(String user, String password, String itemNodeRef, String holdName)
+    {
+        return removeItemsFromHolds(user, password, Collections.singletonList(itemNodeRef), Collections.singletonList(holdName));
+    }
+
+    /**
+     * Remove a list of items (content/record/record folder) from a list of holds
+     *
+     * @param user           the user who removes the item from the hold
+     * @param password       the user's password
+     * @param itemNodeRefs   the list of items nodeRefs to be removed from hold
+     * @param holdNames      the list of hold names
+     * @return The HTTP response
+     */
+    public HttpResponse removeItemsFromHolds(String user, String password, List<String> itemNodeRefs, List<String> holdNames)
+    {
+        return removeItemsFromHolds(user, password, SC_OK, itemNodeRefs, holdNames);
+    }
+
+    /**
+     * Remove a list of items (content/record/record folder) from a list of holds
+     *
+     * @param user           the user who removes the item from the hold
+     * @param password       the user's password
+     * @param expectedStatus https status code expected
+     * @param itemNodeRefs   the list of items nodeRefs to be removed from hold
+     * @param holdNames      the list of hold names
+     * @return The HTTP response
+     */
+    public HttpResponse removeItemsFromHolds(String user, String password, int expectedStatus, List<String> itemNodeRefs,
+                                             List<String> holdNames)
+    {
+        final JSONObject requestParams = addOrRemoveToFromHoldJsonObject(user, password, itemNodeRefs, holdNames);
+        return doPutJsonRequest(user, password, expectedStatus, requestParams, RM_HOLDS_API);
+    }
+
+    /**
+     * Util method to remove item(content/record/record folder) from hold and get the error message
+     *
+     * @param user        the user who removes the item from hold
+     * @param password    the user's password
+     * @param itemNodeRef the nodeRef of the item to be removed from hold
+     * @param holdName    the hold name
+     * @return The error message
+     */
+    public String removeFromHoldAndGetMessage(String user, String password, int expectedStatus, String itemNodeRef, String
+            holdName)
+    {
+        final HttpResponse httpResponse = removeItemsFromHolds(user, password, expectedStatus, Collections.singletonList(itemNodeRef),
+                Collections.singletonList(holdName));
+        return APIUtils.extractErrorMessageFromHttpResponse(httpResponse);
+    }
+
+    /**
+     *  Get the list of the available holds which have the item node reference if includedInHold parameter is true,
+     *   otherwise a list of hold node references will be retrieved which do not include the given node reference.
+     *
+     * @param user     The username of the user to use.
+     * @param password The password of the user.
+     * @param itemNodeRef The item node reference
+     * @param includedInHold True to retrieve the holds which have the item node reference
+     * @param fileOnly True if only files should be return
+     * @return return a list of hold entries
+     */
+    public List<HoldEntry> getHolds(String user, String password, final String itemNodeRef,
+                                    final Boolean includedInHold, final Boolean fileOnly)
+    {
+        final String parameters = (itemNodeRef != null ? "itemNodeRef=" + NODE_REF_WORKSPACE_SPACES_STORE + itemNodeRef  : "")
+                             + (includedInHold != null ? "&includedInHold=" + includedInHold : "")
+                             + (fileOnly != null ? "&fileOnly=" + fileOnly : "");
+
+        final JSONArray holdEntries = doGetRequest(user, password,
+                MessageFormat.format(GET_RM_HOLDS, "{0}", parameters)).getJSONObject("data").getJSONArray("holds");
+
+        return PojoUtility.jsonToObject(holdEntries, HoldEntry.class);
+    }
+}

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

@@ -0,0 +1,74 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * -
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * -
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.v0;
+import java.text.MessageFormat;
+
+import org.alfresco.dataprep.AlfrescoHttpClient;
+import org.alfresco.dataprep.AlfrescoHttpClientFactory;
+import org.alfresco.rest.core.v0.BaseAPI;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * The v0 REST API for nodes
+ * 
+ * @author jcule
+ * @since 2.7EA1
+ */
+@Component
+public class NodeAPI extends BaseAPI
+{
+    /** Logger for the class. */
+    private static final Logger LOGGER = LoggerFactory.getLogger(NodeAPI.class);
+
+    /** The URI for the get node API. */
+    private static final String GET_NODE_API = "{0}alfresco/s/slingshot/doclib2/node/{1}";
+
+    @Autowired
+    private AlfrescoHttpClientFactory alfrescoHttpClientFactory;
+
+    /**
+     * Get the node metadata using the using the node data webscript:  Document List v2 Component
+     * 
+     * @param username
+     * @param password
+     * @param nodeId
+     * @return
+     */
+    public JSONObject getNode(String username, String password, String nodeId)
+    {
+        String requestURL;
+        AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
+        requestURL = MessageFormat.format(GET_NODE_API, client.getAlfrescoUrl(), NODE_PREFIX + nodeId);
+        client.close();
+        return doGetRequest(username, password, requestURL);
+    }
+    
+}

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMAuditAPI.java

@@ -0,0 +1,104 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * -
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * -
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.rest.v0;
+
+import static org.testng.Assert.assertTrue;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.MessageFormat;
+import java.util.List;
+
+import org.alfresco.rest.core.v0.BaseAPI;
+import org.alfresco.rest.rm.community.model.audit.AuditEntry;
+import org.alfresco.rest.rm.community.util.PojoUtility;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * The v0 REST API for rm audit logs
+ *
+ * @author Rodica Sutu
+ * @since 2.7
+ */
+@Component
+public class RMAuditAPI extends BaseAPI
+{
+    /** Logger for the class. */
+    private static final Logger LOGGER = LoggerFactory.getLogger(RMAuditAPI.class);
+
+    /** The URI for the audit API. */
+    private static final String RM_AUDIT_API = "{0}rma/admin/rmauditlog";
+    private static final String RM_AUDIT_LOG_API = RM_AUDIT_API + "?{1}";
+
+    /**
+     * Returns a list of rm audit entries .
+     *
+     * @param user     The username of the user to use.
+     * @param password The password of the user.
+     * @param size     Maximum number of log entries to return
+     * @param event    The name of audit event to be retrieved
+     * @return return Only return log entries matching this event
+     */
+    public List<AuditEntry> getRMAuditLog(String user, String password, final int size, final String event)
+    {
+        String parameters = null;
+        try
+        {
+            parameters = "size=" + size + (event != null ? "&event=" + URLEncoder.encode(event, "UTF-8"):"");
+        }
+        catch (UnsupportedEncodingException e)
+        {
+            LOGGER.error("Unable to encode the event name" + e.getMessage());
+        }
+        JSONArray auditEntries =  doGetRequest(user, password,
+                MessageFormat.format(RM_AUDIT_LOG_API,"{0}", parameters)).getJSONObject("data").getJSONArray("entries");
+
+        return PojoUtility.jsonToObject(auditEntries, AuditEntry.class);
+    }
+
+    /**
+     * Clear the list of audit entries.
+     *
+     * @param username The username of the user to use.
+     * @param password The password of the user.
+     * @throws AssertionError If the API call didn't clear the audit log.
+     */
+    public void clearAuditLog(String username, String password)
+    {
+        JSONObject deleteStatus = doDeleteRequest(username, password, RM_AUDIT_API);
+
+        assertTrue(deleteStatus != null
+                //audit clear and login events are returned
+                && getRMAuditLog(username, password, 100, null).size() == 2);
+    }
+
+
+}

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -27,24 +27,26 @@
 package org.alfresco.rest.v0;
 
 import static org.alfresco.dataprep.AlfrescoHttpClient.MIME_TYPE_JSON;
+import static org.alfresco.rest.core.v0.APIUtils.ISO_INSTANT_FORMATTER;
 import static org.apache.http.HttpStatus.SC_OK;
 import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertTrue;
 import static org.testng.AssertJUnit.fail;
 
 import java.io.IOException;
 import java.text.MessageFormat;
+import java.time.Instant;
 import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.Map;
+import java.util.Set;
 
 import org.alfresco.dataprep.AlfrescoHttpClient;
 import org.alfresco.dataprep.AlfrescoHttpClientFactory;
-import org.alfresco.dataprep.ContentService;
 import org.alfresco.dataprep.UserService;
 import org.alfresco.rest.core.v0.BaseAPI;
+import org.alfresco.rest.core.v0.RMEvents;
 import org.apache.chemistry.opencmis.client.api.CmisObject;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.http.HttpResponse;
@@ -70,12 +72,15 @@ import org.springframework.stereotype.Component;
 @Component
 public class RMRolesAndActionsAPI extends BaseAPI
 {
+    /** The URI to view the configured roles and capabilities. */
+    private static final String RM_ROLES = "{0}rma/admin/rmroles";
+    /** The URI for REST requests about a particular configured role. */
+    private static final String RM_ROLES_ROLE = RM_ROLES + "/{1}";
     private static final String RM_ROLES_AUTHORITIES = "{0}rm/roles/{1}/authorities/{2}?alf_ticket={3}";
 
     // logger
     private static final Logger LOGGER = LoggerFactory.getLogger(RMRolesAndActionsAPI.class);
     private static final String MOVE_ACTIONS_API = "action/rm-move-to/site/rm/documentLibrary/{0}";
-    private static final String CREATE_HOLDS_API = "{0}type/rma:hold/formprocessor";
 
     /** http client factory */
     @Autowired
@@ -85,8 +90,99 @@ public class RMRolesAndActionsAPI extends BaseAPI
     @Autowired
     private UserService userService;
 
-    @Autowired
-    private ContentService contentService;
+    /**
+     * Get all the configured RM roles.
+     *
+     * @param adminUser The RM admin user.
+     * @param adminPassword The password of the user.
+     * @return The RM roles in the system (Note that this will be the internal names, not the display labels).
+     */
+    public Set<String> getConfiguredRoles(String adminUser, String adminPassword)
+    {
+        // Using "is=true" includes the in-place readers and writers.
+        final JSONObject jsonObject = doGetRequest(adminUser, adminPassword, RM_ROLES + "?is=true").getJSONObject(
+                "data");
+        return jsonObject.toMap().keySet();
+    }
+
+    /**
+     * Get the capabilities for a given role.
+     *
+     * @param adminUser The RM admin user.
+     * @param adminPassword The password of the user.
+     * @param role The role to get capabilities for.
+     * @return The set of system names for the capabilities.
+     */
+    public Set<String> getCapabilitiesForRole(String adminUser, String adminPassword, String role)
+    {
+        final JSONObject jsonObject = doGetRequest(adminUser, adminPassword, RM_ROLES + "?is=true").getJSONObject(
+                "data");
+        assertTrue("Could not find role '" + role + "' in " + jsonObject.keySet(), jsonObject.has(role));
+        return jsonObject.getJSONObject(role).getJSONObject("capabilities").keySet();
+    }
+
+    /**
+     * Creates the body for PUT/POST Roles API requests
+     *
+     * @param roleName         the role name
+     * @param roleDisplayLabel a human-readable label for the role
+     * @param capabilities     a list of capabilities for the role
+     * @return
+     */
+    private JSONObject roleRequestBody(String roleName, String roleDisplayLabel, Set<String> capabilities)
+    {
+        final JSONObject requestBody = new JSONObject();
+        requestBody.put("name", roleName);
+        requestBody.put("displayLabel", roleDisplayLabel);
+        final JSONArray capabilitiesArray = new JSONArray();
+        capabilities.forEach(capabilitiesArray::put);
+        requestBody.put("capabilities", capabilitiesArray);
+        return requestBody;
+    }
+
+    /**
+     * Create a new RM role.
+     *
+     * @param adminUser The username of the admin user.
+     * @param adminPassword The password for the admin user.
+     * @param roleName The name of the new role.
+     * @param roleDisplayLabel A human-readable label for the role.
+     * @param capabilities A list of capabilities for the role.
+     */
+    public void createRole(String adminUser, String adminPassword, String roleName, String roleDisplayLabel, Set<String> capabilities)
+    {
+        doPostJsonRequest(adminUser, adminPassword, HttpStatus.SC_OK, roleRequestBody(roleName, roleDisplayLabel, capabilities),
+                RM_ROLES);
+    }
+
+    /**
+     * Update an existing RM role.
+     *
+     * @param adminUser The username of the admin user.
+     * @param adminPassword The password for the admin user.
+     * @param roleName The name of the new role.
+     * @param roleDisplayLabel A human-readable label for the role.
+     * @param capabilities A list of capabilities for the role.
+     */
+    public void updateRole(String adminUser, String adminPassword, String roleName, String roleDisplayLabel, Set<String> capabilities)
+    {
+        doPutJsonRequest(adminUser, adminPassword, HttpStatus.SC_OK, roleRequestBody(roleName, roleDisplayLabel, capabilities),
+                RM_ROLES_ROLE, roleName);
+    }
+
+    /**
+     * Delete a created RM role.
+     *
+     * @param adminUser The username of the admin user.
+     * @param adminPassword The password for the admin user.
+     * @param roleName The name of the role to be deleted.
+     */
+    public void deleteRole(String adminUser, String adminPassword, String roleName)
+    {
+        doDeleteRequest(adminUser, adminPassword, MessageFormat.format(RM_ROLES_ROLE, "{0}", roleName));
+        assertFalse("Failed to delete role " + roleName + " with " + adminUser,
+                getConfiguredRoles(adminUser, adminPassword).contains(roleName));
+    }
 
     /**
      * create user and assign to records management role
@@ -115,8 +211,8 @@ public class RMRolesAndActionsAPI extends BaseAPI
      */
     public void assignRoleToUser(String adminUser, String adminPassword, String userName, String role)
     {
-        AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
-        String reqURL = MessageFormat.format(
+        final AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
+        final String reqURL = MessageFormat.format(
                 RM_ROLES_AUTHORITIES,
                 client.getApiUrl(),
                 role,
@@ -184,7 +280,7 @@ public class RMRolesAndActionsAPI extends BaseAPI
         }
         catch (JSONException | IOException e)
         {
-            e.printStackTrace();
+            LOGGER.error(e.toString());
         }
         finally
         {
@@ -222,42 +318,98 @@ public class RMRolesAndActionsAPI extends BaseAPI
     }
 
     /**
-     * Perform an action on the record folder
+     * Perform an action on the given content
      *
      * @param user        the user executing the action
      * @param password    the user's password
      * @param contentName the content name
      * @return The HTTP response.
      */
-    public HttpResponse executeAction(String user, String password, String contentName, RM_ACTIONS rm_action)
+    public HttpResponse executeAction(String user, String password, String contentName, RM_ACTIONS action)
     {
-        return executeAction(user, password, contentName, rm_action, null);
+        return executeAction(user, password, contentName, action, null);
+    }
+
+    /**
+     * Creates the body for Actions API requests
+     *
+     * @param user          the user executing the action
+     * @param password      the user's password
+     * @param contentName   the content on which the action is executed
+     * @param action        the action executed
+     * @param actionsParams the request parameters
+     * @return the JSONObject created
+     */
+    private JSONObject actionsRequestBody(String user, String password, String contentName, RM_ACTIONS action,
+                                          JSONObject actionsParams)
+    {
+        final String recNodeRef = getNodeRefSpacesStore() + contentService.getNodeRef(user, password, RM_SITE_ID, contentName);
+        final JSONObject requestParams = new JSONObject();
+        requestParams.put("name", action.getAction());
+        requestParams.put("nodeRef", recNodeRef);
+        if (actionsParams != null)
+        {
+            requestParams.put("params", actionsParams);
+        }
+        return requestParams;
     }
 
     /**
      * Perform an action on the record folder
      *
-     * @param user        the user closing the folder
+     * @param user        the user executing the action
      * @param password    the user's password
-     * @param contentName the record folder name
+     * @param contentName the content name
      * @param date        the date to be updated
      * @return The HTTP response.
      */
     public HttpResponse executeAction(String user, String password, String contentName, RM_ACTIONS action, ZonedDateTime date)
     {
-        String recNodeRef = getNodeRefSpacesStore() + contentService.getNodeRef(user, password, RM_SITE_ID, contentName);
-        JSONObject requestParams = new JSONObject();
-        requestParams.put("name", action.getAction());
-        requestParams.put("nodeRef", recNodeRef);
+        final JSONObject actionParams = new JSONObject();
         if (date != null)
         {
-            String thisMoment = date.format(DateTimeFormatter.ISO_INSTANT);
-            requestParams.put("params", new JSONObject()
-                            .put("asOfDate", new JSONObject()
-                                    .put("iso8601", thisMoment)
-                                )
-                             );
+            actionParams.put("asOfDate", new JSONObject().put("iso8601", ISO_INSTANT_FORMATTER.format(date)));
         }
+        final JSONObject requestParams = actionsRequestBody(user, password, contentName, action, actionParams);
+        return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
+    }
+
+    /**
+     * Complete an event on the record/record folder
+     *
+     * @param user        the user executing the action
+     * @param password    the user's password
+     * @param nodeName    the node name
+     * @param event       the event to be completed
+     * @param date        the date to be updated
+     * @return The HTTP response.
+     */
+    public HttpResponse completeEvent(String user, String password, String nodeName, RMEvents event, Instant date)
+    {
+        date = (date != null) ? date : Instant.now();
+        final JSONObject actionParams = new JSONObject().put("eventName", event.getEventName())
+                                                        .put("eventCompletedBy", user)
+                                                        .put("eventCompletedAt", new JSONObject()
+                                                                .put("iso8601", ISO_INSTANT_FORMATTER.format(date))
+                                                            );
+        final JSONObject requestParams = actionsRequestBody(user, password, nodeName, RM_ACTIONS.COMPLETE_EVENT,
+                actionParams);
+        return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
+    }
+
+    /**
+     * Undo an event on the record/record folder
+     *
+     * @param user        the user executing the action
+     * @param password    the user's password
+     * @param contentName the content name
+     * @param event       the event to be undone
+     * @return The HTTP response.
+     */
+    public HttpResponse undoEvent(String user, String password, String contentName, RMEvents event)
+    {
+        final JSONObject requestParams = actionsRequestBody(user, password, contentName, RM_ACTIONS.UNDO_EVENT,
+                new JSONObject().put("eventName", event.getEventName()));
         return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
     }
 
@@ -276,58 +428,8 @@ public class RMRolesAndActionsAPI extends BaseAPI
         {
             item.delete();
         }
-        boolean success = !(contentService.getFolderObject(contentService.getCMISSession(username, password), siteId, containerName).getChildren().getHasMoreItems());
-        assertTrue("Not all items were deleted from " + containerName, success);
-    }
-
-    /**
-     * Deletes hold
-     *
-     * @param username user's username
-     * @param password its password
-     * @param holdName the hold name
-     * @throws AssertionError if the deletion was unsuccessful.
-     */
-    public void deleteHold(String username, String password, String holdName)
-    {
-        deleteItem(username, password, "/Holds/" + holdName);
-    }
-
-
-    /**
-     * Util method to create a hold
-     *
-     * @param user        the user creating the category
-     * @param password    the user's password
-     * @param holdName    the hold name
-     * @param reason      hold reason
-     * @param description hold description
-     * @return The HTTP response (or null if no POST call was needed).
-     */
-    public HttpResponse createHold(String user, String password, String holdName, String reason, String description)
-    {
-        // if the hold already exists don't try to create it again
-        String holdsContainerPath = getFilePlanPath() + "/Holds";
-        String fullHoldPath = holdsContainerPath + "/" + holdName;
-        CmisObject hold = getObjectByPath(user, password, fullHoldPath);
-        if (hold != null)
-        {
-            return null;
-        }
-        // retrieve the Holds container nodeRef
-        String parentNodeRef = getItemNodeRef(user, password, "/Holds");
-
-        JSONObject requestParams = new JSONObject();
-        requestParams.put("alf_destination", getNodeRefSpacesStore() + parentNodeRef);
-        requestParams.put("prop_cm_name", holdName);
-        requestParams.put("prop_cm_description", description);
-        requestParams.put("prop_rma_holdReason", reason);
-
-        // Make the POST request and throw an assertion error if it fails.
-        HttpResponse httpResponse = doPostJsonRequest(user, password, SC_OK, requestParams, CREATE_HOLDS_API);
-        assertNotNull("Expected object to have been created at " + fullHoldPath,
-                    getObjectByPath(user, password, fullHoldPath));
-        return httpResponse;
+        assertFalse("Not all items were deleted from " + containerName,
+                contentService.getFolderObject(contentService.getCMISSession(username, password), siteId, containerName).getChildren().getHasMoreItems());
     }
 
     /**
@@ -345,6 +447,10 @@ public class RMRolesAndActionsAPI extends BaseAPI
         addPropertyToRequest(requestParams, "prop_cm_title", properties, RMProperty.TITLE);
         addPropertyToRequest(requestParams, "prop_cm_description", properties, RMProperty.DESCRIPTION);
         addPropertyToRequest(requestParams, "prop_cm_author", properties, RMProperty.AUTHOR);
+        addPropertyToRequest(requestParams, "prop_dod_originator", properties, RMProperty.ORIGINATOR);
+        addPropertyToRequest(requestParams, "prop_dod_originatingOrganization", properties, RMProperty
+                .ORIGINATING_ORGANIZATION);
+        addPropertyToRequest(requestParams, "prop_dod_publicationDate", properties, RMProperty.PUBLICATION_DATE);
 
         return doPostJsonRequest(username, password, SC_OK, requestParams, MessageFormat.format(UPDATE_METADATA_API, "{0}", itemNodeRef));
     }

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordCategoriesAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -51,6 +51,8 @@ public class RecordCategoriesAPI extends BaseAPI
     private static final Logger LOGGER = LoggerFactory.getLogger(RecordCategoriesAPI.class);
     private static final String RM_ACTIONS_API = "{0}rma/actions/ExecutionQueue";
     private static final String DISPOSITION_ACTIONS_API = "{0}node/{1}/dispositionschedule/dispositionactiondefinitions";
+    private static final String DISPOSITION_SCHEDULE_API = "{0}node/{1}/dispositionschedule";
+
 
     /**
      * Creates a retention schedule for the category given as parameter
@@ -71,6 +73,21 @@ public class RecordCategoriesAPI extends BaseAPI
         return doPostJsonRequest(user, password, SC_OK, requestParams, RM_ACTIONS_API);
     }
 
+    /**
+     * Get the disposition schedule nodeRef
+     *
+     * @param user
+     * @param password
+     * @param categoryName
+     * @return the disposition schedule nodeRef
+     */
+    public String getDispositionScheduleNodeRef(String user, String password, String categoryName)
+    {
+        String catNodeRef = NODE_PREFIX + getItemNodeRef(user, password, "/" + categoryName);
+        JSONObject dispositionSchedule = doGetRequest(user, password, MessageFormat.format(DISPOSITION_SCHEDULE_API, "{0}", catNodeRef));
+        return dispositionSchedule.getJSONObject("data").getString("nodeRef").replace(getNodeRefSpacesStore(), "");
+    }
+
     /**
      * Sets retention schedule authority and instructions, also if it is applied to records or folders
      *
@@ -108,7 +125,12 @@ public class RecordCategoriesAPI extends BaseAPI
         addPropertyToRequest(requestParams, "period", properties, RETENTION_SCHEDULE.RETENTION_PERIOD);
         addPropertyToRequest(requestParams, "ghostOnDestroy", properties, RETENTION_SCHEDULE.RETENTION_GHOST);
         addPropertyToRequest(requestParams, "periodProperty", properties, RETENTION_SCHEDULE.RETENTION_PERIOD_PROPERTY);
-        addPropertyToRequest(requestParams, "events", properties, RETENTION_SCHEDULE.RETENTION_EVENTS);
+        String events = getPropertyValue(properties, RETENTION_SCHEDULE.RETENTION_EVENTS);
+        if(!events.equals(""))
+        {
+            requestParams.append("events", events);
+        }
+        addPropertyToRequest(requestParams, "combineDispositionStepConditions", properties, RETENTION_SCHEDULE.COMBINE_DISPOSITION_STEP_CONDITIONS);
         addPropertyToRequest(requestParams, "eligibleOnFirstCompleteEvent", properties, RETENTION_SCHEDULE.RETENTION_ELIGIBLE_FIRST_EVENT);
 
         return doPostJsonRequest(user, password, SC_OK, requestParams, MessageFormat.format(DISPOSITION_ACTIONS_API, "{0}", catNodeRef));

rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordFoldersAPI.java

@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Records Management Module
  * %%
- * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -28,14 +28,12 @@ package org.alfresco.rest.v0;
 
 import static org.apache.http.HttpStatus.SC_OK;
 
-import org.alfresco.dataprep.ContentService;
 import org.alfresco.rest.core.v0.BaseAPI;
 import org.apache.http.HttpResponse;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -49,9 +47,6 @@ public class RecordFoldersAPI extends BaseAPI
 {
     private static final Logger LOGGER = LoggerFactory.getLogger(RecordFoldersAPI.class);
 
-    @Autowired
-    private ContentService contentService;
-
     /**
      * Close the record folder
      *