From e19101823169032e4e915442ee095e66cc96c1cc Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Wed, 3 Mar 2021 15:10:33 +0200
Subject: [PATCH 01/15] APPS-832: prevent multiple nodes from initializing the
 custom properties

---
 .../rm-service-context.xml                    |   1 +
 .../RecordsManagementAdminServiceImpl.java    | 129 +++++++++++++++---
 2 files changed, 108 insertions(+), 22 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index 29b5a0e785..3d46d6a87a 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -806,6 +806,7 @@
    <bean id="recordsManagementAdminService" class="org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminServiceImpl" parent="recordsManagementAdminBase">
       <property name="relationshipService" ref="RelationshipService" />
       <property name="transactionService" ref="transactionService"/>
+      <property name="jobLockService" ref="jobLockService"/>
       <property name="customisableTypes">
          <list>
             <value>rma:recordCategory</value>
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
index 9cd8e0c096..0e8da44a36 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
@@ -37,6 +37,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
@@ -53,6 +54,9 @@ import org.alfresco.repo.dictionary.M2Aspect;
 import org.alfresco.repo.dictionary.M2Constraint;
 import org.alfresco.repo.dictionary.M2Model;
 import org.alfresco.repo.dictionary.M2Property;
+import org.alfresco.repo.lock.JobLockService;
+import org.alfresco.repo.lock.JobLockService.JobLockRefreshCallback;
+import org.alfresco.repo.lock.LockAcquisitionException;
 import org.alfresco.repo.node.NodeServicePolicies;
 import org.alfresco.repo.policy.Behaviour.NotificationFrequency;
 import org.alfresco.repo.policy.annotation.Behaviour;
@@ -71,6 +75,7 @@ import org.alfresco.service.cmr.dictionary.TypeDefinition;
 import org.alfresco.service.cmr.repository.AssociationRef;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
 import org.alfresco.service.transaction.TransactionService;
@@ -112,6 +117,7 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas
     private static final String PARAM_ALLOWED_VALUES = "allowedValues";
     private static final String PARAM_CASE_SENSITIVE = "caseSensitive";
     private static final String PARAM_MATCH_LOGIC = "matchLogic";
+    private static final long DEFAULT_TIME = 30000L;
 
     /** Relationship service */
     private RelationshipService relationshipService;
@@ -119,6 +125,9 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas
     /** Transaction service */
     private TransactionService transactionService;
 
+    /** Job Lock service */
+    private JobLockService jobLockService;
+
     /** List of types that can be customisable */
     private List<QName> pendingCustomisableTypes;
     private Map<QName, QName> customisableTypes;
@@ -152,7 +161,15 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas
         return this.relationshipService;
     }
 
-	/**
+    /**
+     * @param  jobLockService The Job Lock service
+     */
+    public void setJobLockService(JobLockService jobLockService)
+    {
+        this.jobLockService = jobLockService;
+    }
+
+    /**
 	 * Indicate that this application content listener must be executed with the lowest 
 	 * precedence. (ie last)
 	 * 
@@ -172,30 +189,98 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas
     @Override
     public void onApplicationEvent(ContextRefreshedEvent event)
     {
-        if(!isCustomMapInit && getDictionaryService().getAllModels().contains(RM_CUSTOM_MODEL)) 
-        {
-		// run as System on bootstrap
-        AuthenticationUtil.runAs(new RunAsWork<Object>()
-        {
-            public Object doWork()
-            {
-                RetryingTransactionCallback<Void> callback = new RetryingTransactionCallback<Void>()
-                {
-                    public Void execute()
-                    {
-                      // initialise custom properties
-                      initCustomMap();
-                        return null;
-                    }
-                };
-                transactionService.getRetryingTransactionHelper().doInTransaction(callback);
+        final LockCallback lockCallback = new LockCallback();
 
-                return null;
+        // try and get the lock
+        String lockToken = getLock();
+        if (lockToken != null)
+        {
+            try
+            {
+                jobLockService.refreshLock(lockToken, getLockQName(), DEFAULT_TIME, lockCallback);
+
+                if (!isCustomMapInit && getDictionaryService().getAllModels().contains(RM_CUSTOM_MODEL))
+                {
+                    // run as System on bootstrap
+                    AuthenticationUtil.runAs(new RunAsWork<Object>()
+                    {
+                        public Object doWork()
+                        {
+                            RetryingTransactionCallback<Void> callback = new RetryingTransactionCallback<Void>()
+                            {
+                                public Void execute()
+                                {
+                                    // initialise custom properties
+                                    initCustomMap();
+                                    return null;
+                                }
+                            };
+                            transactionService.getRetryingTransactionHelper().doInTransaction(callback);
+
+                            return null;
+                        }
+                    }, AuthenticationUtil.getSystemUserName());
+                }
             }
-        }, AuthenticationUtil.getSystemUserName());
-		}           
+            finally
+            {
+                try
+                {
+                    lockCallback.running.set(false);
+                    jobLockService.releaseLock(lockToken, getLockQName());
+                }
+                catch (LockAcquisitionException e)
+                {
+                    // Ignore
+                    if (logger.isDebugEnabled())
+                    {
+                        logger.debug("Lock release failed: " + getLockQName() + ": " + lockToken + "("
+                                + e.getMessage() + ")");
+                    }
+                }
+            }
+        }
     }
-    
+
+    private QName getLockQName()
+    {
+        return QName.createQName(NamespaceService.SYSTEM_MODEL_1_0_URI, this.getClass().getName());
+    }
+
+    /**
+     * Attempts to get the lock. If the lock couldn't be taken, then <tt>null</tt> is returned.
+     *
+     * @return Returns the lock token or <tt>null</tt>
+     */
+    private String getLock()
+    {
+        try
+        {
+            return jobLockService.getLock(getLockQName(), DEFAULT_TIME);
+        }
+        catch (LockAcquisitionException e)
+        {
+            return null;
+        }
+    }
+
+    private class LockCallback implements JobLockRefreshCallback
+    {
+        final AtomicBoolean running = new AtomicBoolean(true);
+
+        @Override
+        public boolean isActive()
+        {
+            return running.get();
+        }
+
+        @Override
+        public void lockReleased()
+        {
+            running.set(false);
+        }
+    }
+
     /**
      * Helper method to indicate whether the custom map is initialised or not.
      * 

From 9c3c2354a809d03bef992415ec87b6d277ea49b3 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Thu, 4 Mar 2021 13:40:15 +0200
Subject: [PATCH 02/15] APPS-832: address PR comment

---
 .../RecordsManagementAdminServiceImpl.java    | 50 +++++++------------
 .../java/org/alfresco/util/LockCallback.java  | 27 ++++++++++
 2 files changed, 44 insertions(+), 33 deletions(-)
 create mode 100644 rm-community/rm-community-repo/source/java/org/alfresco/util/LockCallback.java

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
index 0e8da44a36..cce7d92977 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
@@ -37,7 +37,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
@@ -55,7 +54,6 @@ import org.alfresco.repo.dictionary.M2Constraint;
 import org.alfresco.repo.dictionary.M2Model;
 import org.alfresco.repo.dictionary.M2Property;
 import org.alfresco.repo.lock.JobLockService;
-import org.alfresco.repo.lock.JobLockService.JobLockRefreshCallback;
 import org.alfresco.repo.lock.LockAcquisitionException;
 import org.alfresco.repo.node.NodeServicePolicies;
 import org.alfresco.repo.policy.Behaviour.NotificationFrequency;
@@ -80,6 +78,9 @@ import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.GUID;
+import org.alfresco.util.LockCallback;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.core.Ordered;
@@ -101,6 +102,9 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas
 														  ApplicationListener<ContextRefreshedEvent>, 
 														  Ordered
 {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RecordsManagementAdminServiceImpl.class);
+
     /** I18N messages*/
     private static final String MSG_SERVICE_NOT_INIT = "rm.admin.service-not-init";
     private static final String MSG_PROP_EXIST = "rm.admin.prop-exist";
@@ -113,10 +117,12 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas
 
     /** Constants */
     private static final String CUSTOM_CONSTRAINT_TYPE = org.alfresco.module.org_alfresco_module_rm.caveat.RMListOfValuesConstraint.class.getName();
-    private static final String CAPATIBILITY_CUSTOM_CONTRAINT_TYPE = org.alfresco.module.org_alfresco_module_dod5015.caveat.RMListOfValuesConstraint.class.getName();
+    private static final String CAPABILITY_CUSTOM_CONSTRAINT_TYPE = org.alfresco.module.org_alfresco_module_dod5015.caveat.RMListOfValuesConstraint.class.getName();
     private static final String PARAM_ALLOWED_VALUES = "allowedValues";
     private static final String PARAM_CASE_SENSITIVE = "caseSensitive";
     private static final String PARAM_MATCH_LOGIC = "matchLogic";
+
+    private static final QName LOCK_QNAME = QName.createQName(NamespaceService.SYSTEM_MODEL_1_0_URI, "RecordsManagementAdminServiceImpl");
     private static final long DEFAULT_TIME = 30000L;
 
     /** Relationship service */
@@ -197,7 +203,7 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas
         {
             try
             {
-                jobLockService.refreshLock(lockToken, getLockQName(), DEFAULT_TIME, lockCallback);
+                jobLockService.refreshLock(lockToken, LOCK_QNAME, DEFAULT_TIME, lockCallback);
 
                 if (!isCustomMapInit && getDictionaryService().getAllModels().contains(RM_CUSTOM_MODEL))
                 {
@@ -226,27 +232,21 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas
             {
                 try
                 {
-                    lockCallback.running.set(false);
-                    jobLockService.releaseLock(lockToken, getLockQName());
+                    lockCallback.setIsRunning(false);
+                    jobLockService.releaseLock(lockToken, LOCK_QNAME);
                 }
                 catch (LockAcquisitionException e)
                 {
-                    // Ignore
-                    if (logger.isDebugEnabled())
+                    if (LOGGER.isDebugEnabled())
                     {
-                        logger.debug("Lock release failed: " + getLockQName() + ": " + lockToken + "("
-                                + e.getMessage() + ")");
+                        LOGGER.debug("Lock release failed: {}: {}", LOCK_QNAME, lockToken, e);
+
                     }
                 }
             }
         }
     }
 
-    private QName getLockQName()
-    {
-        return QName.createQName(NamespaceService.SYSTEM_MODEL_1_0_URI, this.getClass().getName());
-    }
-
     /**
      * Attempts to get the lock. If the lock couldn't be taken, then <tt>null</tt> is returned.
      *
@@ -256,7 +256,7 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas
     {
         try
         {
-            return jobLockService.getLock(getLockQName(), DEFAULT_TIME);
+            return jobLockService.getLock(LOCK_QNAME, DEFAULT_TIME);
         }
         catch (LockAcquisitionException e)
         {
@@ -264,22 +264,6 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas
         }
     }
 
-    private class LockCallback implements JobLockRefreshCallback
-    {
-        final AtomicBoolean running = new AtomicBoolean(true);
-
-        @Override
-        public boolean isActive()
-        {
-            return running.get();
-        }
-
-        @Override
-        public void lockReleased()
-        {
-            running.set(false);
-        }
-    }
 
     /**
      * Helper method to indicate whether the custom map is initialised or not.
@@ -1283,7 +1267,7 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas
         String type = customConstraint.getType();
         if (type == null ||
             (!type.equals(CUSTOM_CONSTRAINT_TYPE) &&
-             !type.equals(CAPATIBILITY_CUSTOM_CONTRAINT_TYPE)))
+             !type.equals(CAPABILITY_CUSTOM_CONSTRAINT_TYPE)))
         {
             throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_UNEXPECTED_TYPE_CONSTRAINT, type, constraintNameAsPrefixString, CUSTOM_CONSTRAINT_TYPE));
         }
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/util/LockCallback.java b/rm-community/rm-community-repo/source/java/org/alfresco/util/LockCallback.java
new file mode 100644
index 0000000000..c89eccbd93
--- /dev/null
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/util/LockCallback.java
@@ -0,0 +1,27 @@
+package org.alfresco.util;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.alfresco.repo.lock.JobLockService.JobLockRefreshCallback;
+
+public class LockCallback implements JobLockRefreshCallback
+{
+    private final AtomicBoolean running = new AtomicBoolean(true);
+
+    @Override
+    public boolean isActive()
+    {
+        return running.get();
+    }
+
+    @Override
+    public void lockReleased()
+    {
+        running.set(false);
+    }
+
+    public void setIsRunning(boolean isRunning)
+    {
+        this.running.set(isRunning);
+    }
+}

From 74deefe0c093dbdd682333aa42851c825da416e3 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Thu, 4 Mar 2021 15:27:35 +0200
Subject: [PATCH 03/15] APPS-852: Allow lowercase operation - modify operation
 field to op

---
 .../util/UpdateActionType.java                  | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/UpdateActionType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/UpdateActionType.java
index 71c1382504..08637b970b 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/UpdateActionType.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/UpdateActionType.java
@@ -38,5 +38,20 @@ import org.alfresco.api.AlfrescoPublicApi;
 public enum UpdateActionType
 {
     ADD,
-    REMOVE
+    REMOVE;
+
+    public static UpdateActionType valueOfIgnoreCase(String name)
+    {
+        UpdateActionType actionType;
+        try
+        {
+            actionType = UpdateActionType.valueOf(name.toUpperCase());
+        }
+        catch (Exception e)
+        {
+            throw new IllegalArgumentException("Could not find enum with name '" + name + "'. Not one of the values accepted for Enum class: [ADD, REMOVE]");
+        }
+
+        return actionType;
+    }
 }

From 20f877d5fe93a7d6e73528a546b9d89d00298971 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Thu, 4 Mar 2021 15:54:31 +0200
Subject: [PATCH 04/15] add header for LockCallback class

---
 .../java/org/alfresco/util/LockCallback.java  | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/util/LockCallback.java b/rm-community/rm-community-repo/source/java/org/alfresco/util/LockCallback.java
index c89eccbd93..ae87470fa3 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/util/LockCallback.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/util/LockCallback.java
@@ -1,3 +1,30 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2021 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.util;
 
 import java.util.concurrent.atomic.AtomicBoolean;

From ab3f4a16eb7e25244f1ebd348c6e3f1c624b149e Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Fri, 5 Mar 2021 10:14:53 +0200
Subject: [PATCH 05/15] address PR comment

---
 .../RecordsManagementAdminServiceImpl.java    | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
index cce7d92977..bcd9e3fbe0 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
@@ -208,24 +208,15 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas
                 if (!isCustomMapInit && getDictionaryService().getAllModels().contains(RM_CUSTOM_MODEL))
                 {
                     // run as System on bootstrap
-                    AuthenticationUtil.runAs(new RunAsWork<Object>()
-                    {
-                        public Object doWork()
-                        {
-                            RetryingTransactionCallback<Void> callback = new RetryingTransactionCallback<Void>()
-                            {
-                                public Void execute()
-                                {
-                                    // initialise custom properties
-                                    initCustomMap();
-                                    return null;
-                                }
-                            };
-                            transactionService.getRetryingTransactionHelper().doInTransaction(callback);
-
+                    AuthenticationUtil.runAsSystem((RunAsWork<Void>) () -> {
+                        transactionService.getRetryingTransactionHelper()
+                                          .doInTransaction((RetryingTransactionCallback<Void>) () -> {
+                            // initialise custom properties
+                            initCustomMap();
                             return null;
-                        }
-                    }, AuthenticationUtil.getSystemUserName());
+                        });
+                        return null;
+                    });
                 }
             }
             finally

From b8847e4089c51672f7a5427cc2d7d2be3f1dd655 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Fri, 5 Mar 2021 13:59:52 +0200
Subject: [PATCH 06/15] - remove logger check

---
 .../admin/RecordsManagementAdminServiceImpl.java            | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
index bcd9e3fbe0..6fce532585 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
@@ -228,11 +228,7 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas
                 }
                 catch (LockAcquisitionException e)
                 {
-                    if (LOGGER.isDebugEnabled())
-                    {
-                        LOGGER.debug("Lock release failed: {}: {}", LOCK_QNAME, lockToken, e);
-
-                    }
+                    LOGGER.debug("Lock release failed: {}: {}", LOCK_QNAME, lockToken, e);
                 }
             }
         }

From 1934798cd40425359cb1fbe4dce74069ad650ef5 Mon Sep 17 00:00:00 2001
From: Claudia Agache <claudia.agache@ness.com>
Date: Fri, 5 Mar 2021 16:15:50 +0200
Subject: [PATCH 07/15] Fix 3.5 patch

---
 .../patch/rm-patch-v35-context.xml                       | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml
index cc54b588ad..6f33953408 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml
@@ -5,16 +5,15 @@
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
    <!-- RM v3.5 Patches -->
-   <!-- fixesFromSchema must be 3201 because we apply this patch over RMv32HoldChildAssocPatch  -->
-   <bean id="rm.holdChildAssocPatch"
+   <bean id="rm.holdNewChildAssocPatch"
          parent="rm.parentModulePatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.v35.RMv35HoldNewChildAssocPatch">
       <property name="description" value="Create new hold child association to link the record to the hold"/>
-      <property name="fixesFromSchema" value="3201" />
-      <property name="fixesToSchema" value="3500"/>
+      <property name="fixesToSchema" value="3300"/>
+      <property name="targetSchema" value="3500" />
       <property name="behaviourFilter" ref="policyBehaviourFilter" />
       <property name="filePlanService" ref="filePlanService" />
       <property name="holdService" ref="holdService" />
       <property name="nodeService" ref="nodeService" />
    </bean>
-</beans>
\ No newline at end of file
+</beans>

From ce12582d27ee51454941511ed65b8a392f42149b Mon Sep 17 00:00:00 2001
From: Claudia Agache <claudia.agache@ness.com>
Date: Fri, 5 Mar 2021 17:39:29 +0200
Subject: [PATCH 08/15] code review comment

---
 .../org_alfresco_module_rm/patch/rm-patch-v35-context.xml     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml
index 6f33953408..6159adab5f 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml
@@ -9,7 +9,9 @@
          parent="rm.parentModulePatch"
          class="org.alfresco.module.org_alfresco_module_rm.patch.v35.RMv35HoldNewChildAssocPatch">
       <property name="description" value="Create new hold child association to link the record to the hold"/>
-      <property name="fixesToSchema" value="3300"/>
+      <!-- fixesFromSchema must be 3201 because we apply this patch over RMv32HoldChildAssocPatch  -->
+      <property name="fixesFromSchema" value="3201"/>
+      <property name="fixesToSchema" value="3499"/>
       <property name="targetSchema" value="3500" />
       <property name="behaviourFilter" ref="policyBehaviourFilter" />
       <property name="filePlanService" ref="filePlanService" />

From fd9f278980871935f71409e2c700aac38546efb8 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Fri, 5 Mar 2021 17:52:23 +0200
Subject: [PATCH 09/15] [enterprise release 3.5.0-A7 3.5.0-SNAPSHOT] [skip
 tests]


From 91a483a779ca72f9da41d4d3338e52e7f5bb1a39 Mon Sep 17 00:00:00 2001
From: Travis CI User <build@alfresco.com>
Date: Fri, 5 Mar 2021 17:02:14 +0000
Subject: [PATCH 10/15] [maven-release-plugin][skip ci] prepare release
 V3.5.0-A7

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

diff --git a/pom.xml b/pom.xml
index f30f477d14..771e890509 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <groupId>org.alfresco</groupId>
    <artifactId>alfresco-governance-services</artifactId>
    <packaging>pom</packaging>
-   <version>3.5.0-SNAPSHOT</version>
+   <version>3.5.0-A7</version>
    <name>Alfresco Governance Services</name>
 
    <url>http://www.alfresco.org/</url>
@@ -18,7 +18,7 @@
       <connection>scm:git:https://github.com/Alfresco/governance-services.git</connection>
       <developerConnection>scm:git:https://github.com/Alfresco/governance-services.git</developerConnection>
       <url>https://github.com/Alfresco/governance-services</url>
-     <tag>HEAD</tag>
+     <tag>V3.5.0-A7</tag>
   </scm>
 
    <issueManagement>
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 5eee570158..73f76661b8 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
+      <version>3.5.0-A7</version>
    </parent>
 
    <licenses>
diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml
index b559c7682d..ae75f32389 100644
--- a/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
+      <version>3.5.0-A7</version>
    </parent>
 
    <properties>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index 3e065f78e6..13465e02e6 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
+      <version>3.5.0-A7</version>
    </parent>
 
    <licenses>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index f942056ed3..7b2ce55f4c 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-governance-services-community</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
+      <version>3.5.0-A7</version>
    </parent>
 
    <properties>
diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml
index 7c19b1535b..e27adf62fe 100644
--- a/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
+      <version>3.5.0-A7</version>
    </parent>
 
    <properties>

From 45d77188b622a0700e42206a32998bb0c0302ac8 Mon Sep 17 00:00:00 2001
From: Travis CI User <build@alfresco.com>
Date: Fri, 5 Mar 2021 17:02:19 +0000
Subject: [PATCH 11/15] [maven-release-plugin][skip ci] prepare for next
 development iteration

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

diff --git a/pom.xml b/pom.xml
index 771e890509..f30f477d14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <groupId>org.alfresco</groupId>
    <artifactId>alfresco-governance-services</artifactId>
    <packaging>pom</packaging>
-   <version>3.5.0-A7</version>
+   <version>3.5.0-SNAPSHOT</version>
    <name>Alfresco Governance Services</name>
 
    <url>http://www.alfresco.org/</url>
@@ -18,7 +18,7 @@
       <connection>scm:git:https://github.com/Alfresco/governance-services.git</connection>
       <developerConnection>scm:git:https://github.com/Alfresco/governance-services.git</developerConnection>
       <url>https://github.com/Alfresco/governance-services</url>
-     <tag>V3.5.0-A7</tag>
+     <tag>HEAD</tag>
   </scm>
 
    <issueManagement>
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 73f76661b8..5eee570158 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services</artifactId>
-      <version>3.5.0-A7</version>
+      <version>3.5.0-SNAPSHOT</version>
    </parent>
 
    <licenses>
diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml
index ae75f32389..b559c7682d 100644
--- a/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation</artifactId>
-      <version>3.5.0-A7</version>
+      <version>3.5.0-SNAPSHOT</version>
    </parent>
 
    <properties>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index 13465e02e6..3e065f78e6 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services</artifactId>
-      <version>3.5.0-A7</version>
+      <version>3.5.0-SNAPSHOT</version>
    </parent>
 
    <licenses>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 7b2ce55f4c..f942056ed3 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-governance-services-community</artifactId>
-      <version>3.5.0-A7</version>
+      <version>3.5.0-SNAPSHOT</version>
    </parent>
 
    <properties>
diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml
index e27adf62fe..7c19b1535b 100644
--- a/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community</artifactId>
-      <version>3.5.0-A7</version>
+      <version>3.5.0-SNAPSHOT</version>
    </parent>
 
    <properties>

From 74b20e007694968c23edd1d852e329f51d94c552 Mon Sep 17 00:00:00 2001
From: Travis CI User <build@alfresco.com>
Date: Tue, 9 Mar 2021 09:10:39 +0000
Subject: [PATCH 12/15] [maven-release-plugin][skip ci] prepare release V3.5.0

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

diff --git a/pom.xml b/pom.xml
index f30f477d14..a7da53a528 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <groupId>org.alfresco</groupId>
    <artifactId>alfresco-governance-services</artifactId>
    <packaging>pom</packaging>
-   <version>3.5.0-SNAPSHOT</version>
+   <version>3.5.0</version>
    <name>Alfresco Governance Services</name>
 
    <url>http://www.alfresco.org/</url>
@@ -18,7 +18,7 @@
       <connection>scm:git:https://github.com/Alfresco/governance-services.git</connection>
       <developerConnection>scm:git:https://github.com/Alfresco/governance-services.git</developerConnection>
       <url>https://github.com/Alfresco/governance-services</url>
-     <tag>HEAD</tag>
+     <tag>V3.5.0</tag>
   </scm>
 
    <issueManagement>
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 5eee570158..3aafd9fbc5 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
+      <version>3.5.0</version>
    </parent>
 
    <licenses>
diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml
index b559c7682d..1ad8295c4e 100644
--- a/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
+      <version>3.5.0</version>
    </parent>
 
    <properties>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index 3e065f78e6..384e55b4a7 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
+      <version>3.5.0</version>
    </parent>
 
    <licenses>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index f942056ed3..c4a32f8a70 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-governance-services-community</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
+      <version>3.5.0</version>
    </parent>
 
    <properties>
diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml
index 7c19b1535b..d30cac6a6f 100644
--- a/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
+      <version>3.5.0</version>
    </parent>
 
    <properties>

From e1c250406f50f9ab3eebf932c90b197dc6d42a5f Mon Sep 17 00:00:00 2001
From: Travis CI User <build@alfresco.com>
Date: Tue, 9 Mar 2021 09:10:44 +0000
Subject: [PATCH 13/15] [maven-release-plugin][skip ci] prepare for next
 development iteration

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

diff --git a/pom.xml b/pom.xml
index a7da53a528..4720b511f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <groupId>org.alfresco</groupId>
    <artifactId>alfresco-governance-services</artifactId>
    <packaging>pom</packaging>
-   <version>3.5.0</version>
+   <version>3.5.1-SNAPSHOT</version>
    <name>Alfresco Governance Services</name>
 
    <url>http://www.alfresco.org/</url>
@@ -18,7 +18,7 @@
       <connection>scm:git:https://github.com/Alfresco/governance-services.git</connection>
       <developerConnection>scm:git:https://github.com/Alfresco/governance-services.git</developerConnection>
       <url>https://github.com/Alfresco/governance-services</url>
-     <tag>V3.5.0</tag>
+     <tag>HEAD</tag>
   </scm>
 
    <issueManagement>
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 3aafd9fbc5..20e84fc407 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.1-SNAPSHOT</version>
    </parent>
 
    <licenses>
diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml
index 1ad8295c4e..2606b83732 100644
--- a/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.1-SNAPSHOT</version>
    </parent>
 
    <properties>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index 384e55b4a7..e116557e08 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.1-SNAPSHOT</version>
    </parent>
 
    <licenses>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index c4a32f8a70..814394242f 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-governance-services-community</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.1-SNAPSHOT</version>
    </parent>
 
    <properties>
diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml
index d30cac6a6f..a892c5aa15 100644
--- a/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.1-SNAPSHOT</version>
    </parent>
 
    <properties>

From bbaa72110a32aaf0601e35056c9b5632c0a5225f Mon Sep 17 00:00:00 2001
From: Claudia Agache <claudia.agache@ness.com>
Date: Tue, 9 Mar 2021 12:26:31 +0200
Subject: [PATCH 14/15] Update version to 3.5.0.1-SNAPSHOT

---
 pom.xml                                                | 2 +-
 rm-automation/pom.xml                                  | 2 +-
 rm-automation/rm-automation-community-rest-api/pom.xml | 2 +-
 rm-community/pom.xml                                   | 2 +-
 rm-community/rm-community-repo/pom.xml                 | 2 +-
 rm-community/rm-community-rest-api-explorer/pom.xml    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index a7da53a528..9cc62e9ca8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <groupId>org.alfresco</groupId>
    <artifactId>alfresco-governance-services</artifactId>
    <packaging>pom</packaging>
-   <version>3.5.0</version>
+   <version>3.5.0.1-SNAPSHOT</version>
    <name>Alfresco Governance Services</name>
 
    <url>http://www.alfresco.org/</url>
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 3aafd9fbc5..b06ed77dd8 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.0.1-SNAPSHOT</version>
    </parent>
 
    <licenses>
diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml
index 1ad8295c4e..bb823fcd16 100644
--- a/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.0.1-SNAPSHOT</version>
    </parent>
 
    <properties>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index 384e55b4a7..d2635d4f5a 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.0.1-SNAPSHOT</version>
    </parent>
 
    <licenses>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index c4a32f8a70..3365d419d9 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-governance-services-community</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.0.1-SNAPSHOT</version>
    </parent>
 
    <properties>
diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml
index d30cac6a6f..78b9e62276 100644
--- a/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community</artifactId>
-      <version>3.5.0</version>
+      <version>3.5.0.1-SNAPSHOT</version>
    </parent>
 
    <properties>

From 54e68da433736cdb4ec5a3edde190b0c08f1baf6 Mon Sep 17 00:00:00 2001
From: Claudia Agache <claudia.agache@ness.com>
Date: Tue, 9 Mar 2021 12:29:04 +0200
Subject: [PATCH 15/15] Update branches for travis

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 887038834c..419ef99e0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,10 +19,10 @@ git:
 
 branches:
   only:
-    - master
-    - /feature\/.*/
-    - /merge\/.*/
-    - /hotfix\/.*/
+    - /release\/V3.\d+.*/
+    - /feature-3.\d+\/.*/
+    - /merge-3.\d+\/.*/
+    - /hotfix-3.\d+\/.*/
 
 cache:
   directories: