From 989caf3dc21132af74db91af742449eccb3ccff0 Mon Sep 17 00:00:00 2001
From: Tom Page <tom.page@alfresco.com>
Date: Thu, 28 Sep 2017 14:08:14 +0100
Subject: [PATCH 1/2] Update version to 2.5.2.1-SNAPSHOT.

---
 pom.xml                                | 2 +-
 rm-automation/pom.xml                  | 2 +-
 rm-community/pom.xml                   | 2 +-
 rm-community/rm-community-repo/pom.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index dc2b869115..8ba1519c82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <groupId>org.alfresco</groupId>
    <artifactId>alfresco-rm</artifactId>
    <packaging>pom</packaging>
-   <version>2.5.2</version>
+   <version>2.5.2.1-SNAPSHOT</version>
    <name>Alfresco Records Management</name>
 
    <parent>
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 7a1de7b6d5..458d6341d9 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm</artifactId>
-      <version>2.5.2</version>
+      <version>2.5.2.1-SNAPSHOT</version>
    </parent>
 
    <properties>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index d791df8c19..a7db24f18f 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm</artifactId>
-      <version>2.5.2</version>
+      <version>2.5.2.1-SNAPSHOT</version>
    </parent>
 
    <licenses>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index b0099d65ba..77d09a49f7 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -9,7 +9,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm-community</artifactId>
-      <version>2.5.2</version>
+      <version>2.5.2.1-SNAPSHOT</version>
    </parent>
 
    <properties>

From 5610e783a66f3d651aecb3d5e41498bc72bc2d3f Mon Sep 17 00:00:00 2001
From: Ross Gale <ross.gale@alfresco.com>
Date: Mon, 2 Oct 2017 13:22:27 +0100
Subject: [PATCH 2/2] RM-5595 Replace v0 calls to records apis

---
 .../org/alfresco/rest/rm/community/model/record/Record.java     | 2 ++
 .../rest/rm/community/model/recordcategory/RecordCategory.java  | 2 ++
 .../rm/community/model/recordcategory/RecordCategoryChild.java  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/Record.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/Record.java
index 6ebd2bf33a..0d221fa967 100644
--- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/Record.java
+++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/record/Record.java
@@ -53,6 +53,8 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class Record extends TestModel
 {
+    public final static String CONTENT_NODE_TYPE = "cm:content";
+
     /*************************/
     /** Mandatory parameters */
     /*************************/
diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategory.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategory.java
index ab668e2f0f..5bbcf2551f 100644
--- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategory.java
+++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategory.java
@@ -53,6 +53,8 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class RecordCategory extends TestModel
 {
+    public final static String DEFAULT_FILE_PLAN_ALIAS = "-filePlan-";
+
     /*************************/
     /** Mandatory parameters */
     /*************************/
diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChild.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChild.java
index 08fab3b764..61bc7edabe 100644
--- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChild.java
+++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChild.java
@@ -53,6 +53,8 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class RecordCategoryChild extends TestModel
 {
+    public final static String RECORD_FOLDER_NODE_TYPE = "rma:recordFolder";
+
     /*************************/
     /** Mandatory parameters */
     /*************************/