From fa74649d2f176b8d6385e179b0af23d33e46236c Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Tue, 20 Sep 2016 16:05:40 +0100
Subject: [PATCH] RM-3902 (RM 2.5 Community Release)

---
 pom.xml                                         | 17 +++++++++++++++--
 rm-community/pom.xml                            |  3 ++-
 .../version/RecordableVersionServiceImpl.java   |  1 +
 .../version/RecordableVersionsBaseTest.java     |  4 +++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f9d303b36d..06a2029bdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,10 +84,23 @@
 
    <modules>
       <module>rm-community</module>
-      <module>rm-enterprise</module>
-      <module>rm-automation</module>
    </modules>
 
+   <profiles>
+      <profile>
+         <id>enterprise</id>
+         <activation>
+            <property>
+               <name>!community</name>
+            </property>
+         </activation>
+         <modules>
+            <module>rm-enterprise</module>
+            <module>rm-automation</module>
+         </modules>
+      </profile>
+   </profiles>
+
    <properties>
       <alfresco.db.params>AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE</alfresco.db.params>
       <maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index 62b282a245..e5ad0a3c57 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -23,6 +23,7 @@
    </modules>
 
    <properties>
-      <alfresco.version>5.1.e</alfresco.version>
+      <alfresco.version>5.1.g</alfresco.version>
+      <share.version>${alfresco.version}</share.version>
    </properties>
 </project>
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java
index 0b714bc9da..1ac0b0534a 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java
@@ -729,6 +729,7 @@ public class RecordableVersionServiceImpl extends    Version2ServiceImpl
                         versionRecordProps.put(PROP_VERSIONED_NODEREF, nodeRef);
                         versionRecordProps.put(RecordableVersionModel.PROP_VERSION_LABEL, currentVersion.getVersionLabel());
                         versionRecordProps.put(RecordableVersionModel.PROP_VERSION_DESCRIPTION, currentVersion.getDescription());
+                        versionRecordProps.put(ContentModel.PROP_VERSION_TYPE, currentVersion.getVersionType());
                         nodeService.addAspect(record, ASPECT_VERSION_RECORD, versionRecordProps);
 
                         // wire record up to previous record
diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/RecordableVersionsBaseTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/RecordableVersionsBaseTest.java
index e595509b4e..d4424d14c6 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/RecordableVersionsBaseTest.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/RecordableVersionsBaseTest.java
@@ -245,7 +245,9 @@ public abstract class RecordableVersionsBaseTest extends BaseRMTestCase implemen
                      !PROP_RECORDABLE_VERSION_POLICY.equals(beforePropertyName) &&
                      !ContentModel.PROP_AUTO_VERSION_PROPS.equals(beforePropertyName) &&
                      !ContentModel.PROP_AUTO_VERSION.equals(beforePropertyName) &&
-                     !ContentModel.PROP_INITIAL_VERSION.equals(beforePropertyName))
+                     !ContentModel.PROP_INITIAL_VERSION.equals(beforePropertyName) &&
+                     !ContentModel.PROP_VERSION_TYPE.equals(beforePropertyName) &&
+                     !ContentModel.PROP_VERSION_LABEL.equals(beforePropertyName))
             {
                 fail("Property missing from frozen state .. " + beforePropertyName);
             }