From c1f1ceab90b7308f00ae008d046ec6dc362d49cb Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Thu, 26 Nov 2020 10:21:13 +0200
Subject: [PATCH 01/35] update release command in order to not upload the
 sources twice

---
 scripts/release.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/release.sh b/scripts/release.sh
index 4435342437..ddaa87fe7d 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -40,5 +40,6 @@ mvn --batch-mode \
     -DreleaseVersion=${RELEASE_VERSION} \
     -DdevelopmentVersion=${DEVELOPMENT_VERSION} \
     -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
+    -DuseReleaseProfile=false \
     "-Darguments=-DskipTests -D${release_type} -P${deployment_repository},release-${release_type}" \
     release:clean release:prepare release:perform
\ No newline at end of file

From 291d252824c753558a20414b1b8025f58d25c2c5 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Thu, 26 Nov 2020 10:21:13 +0200
Subject: [PATCH 02/35] update release command in order to not upload the
 sources twice

---
 scripts/release.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/release.sh b/scripts/release.sh
index 4435342437..ddaa87fe7d 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -40,5 +40,6 @@ mvn --batch-mode \
     -DreleaseVersion=${RELEASE_VERSION} \
     -DdevelopmentVersion=${DEVELOPMENT_VERSION} \
     -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
+    -DuseReleaseProfile=false \
     "-Darguments=-DskipTests -D${release_type} -P${deployment_repository},release-${release_type}" \
     release:clean release:prepare release:perform
\ No newline at end of file

From 65bde792d426ec3cf9a2f3ae7217385e404090c5 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Thu, 26 Nov 2020 10:21:13 +0200
Subject: [PATCH 03/35] update release command in order to not upload the
 sources twice

---
 scripts/release.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/release.sh b/scripts/release.sh
index 4435342437..ddaa87fe7d 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -40,5 +40,6 @@ mvn --batch-mode \
     -DreleaseVersion=${RELEASE_VERSION} \
     -DdevelopmentVersion=${DEVELOPMENT_VERSION} \
     -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
+    -DuseReleaseProfile=false \
     "-Darguments=-DskipTests -D${release_type} -P${deployment_repository},release-${release_type}" \
     release:clean release:prepare release:perform
\ No newline at end of file

From 0c636136a327df1cfd707fca96a17b9200cd18da Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Thu, 26 Nov 2020 10:21:13 +0200
Subject: [PATCH 04/35] update release command in order to not upload the
 sources twice

---
 scripts/release.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/release.sh b/scripts/release.sh
index 4435342437..ddaa87fe7d 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -40,5 +40,6 @@ mvn --batch-mode \
     -DreleaseVersion=${RELEASE_VERSION} \
     -DdevelopmentVersion=${DEVELOPMENT_VERSION} \
     -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
+    -DuseReleaseProfile=false \
     "-Darguments=-DskipTests -D${release_type} -P${deployment_repository},release-${release_type}" \
     release:clean release:prepare release:perform
\ No newline at end of file

From ea7b125fda494af7681fe3859cdf5161f274da29 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Thu, 26 Nov 2020 10:21:13 +0200
Subject: [PATCH 05/35] update release command in order to not upload the
 sources twice

---
 scripts/release.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/release.sh b/scripts/release.sh
index d9a13454ec..7c128afef5 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -36,5 +36,6 @@ mvn --batch-mode \
     -DreleaseVersion=${RELEASE_VERSION} \
     -DdevelopmentVersion=${DEVELOPMENT_VERSION} \
     -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
+    -DuseReleaseProfile=false \
     "-Darguments=-DskipTests -D${release_type} -P${deployment_repository},release-${release_type}" \
     release:clean release:prepare release:perform

From 4a23d2d49793ece8acc6e88a813c4ee88fabba9c Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Thu, 26 Nov 2020 10:21:13 +0200
Subject: [PATCH 06/35] update release command in order to not upload the
 sources twice

---
 scripts/release.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/release.sh b/scripts/release.sh
index d9a13454ec..7c128afef5 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -36,5 +36,6 @@ mvn --batch-mode \
     -DreleaseVersion=${RELEASE_VERSION} \
     -DdevelopmentVersion=${DEVELOPMENT_VERSION} \
     -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
+    -DuseReleaseProfile=false \
     "-Darguments=-DskipTests -D${release_type} -P${deployment_repository},release-${release_type}" \
     release:clean release:prepare release:perform

From ff4b64058d98173e8954168014122825551ff65f Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Thu, 26 Nov 2020 10:21:13 +0200
Subject: [PATCH 07/35] update release command in order to not upload the
 sources twice

---
 scripts/release.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/release.sh b/scripts/release.sh
index d9a13454ec..7c128afef5 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -36,5 +36,6 @@ mvn --batch-mode \
     -DreleaseVersion=${RELEASE_VERSION} \
     -DdevelopmentVersion=${DEVELOPMENT_VERSION} \
     -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
+    -DuseReleaseProfile=false \
     "-Darguments=-DskipTests -D${release_type} -P${deployment_repository},release-${release_type}" \
     release:clean release:prepare release:perform

From 3428f31b1151cbd650362366efd4516de69a3547 Mon Sep 17 00:00:00 2001
From: Epure Alexandru-Eusebiu <alexeusebiu@gmail.com>
Date: Thu, 3 Dec 2020 17:44:20 +0200
Subject: [PATCH 08/35] MNT-22062 : poor performance viewing category retention
 schedule    Add DispositionServiceImpl#hasDisposableItemsImpl that will
 return a boolean value if a RM Container has disposable items    This method
 uses early return, once the first occurence is found.

---
 .../disposition/DispositionServiceImpl.java   | 44 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
index d469d2fe87..37394e6cb6 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
@@ -488,7 +488,49 @@ public class DispositionServiceImpl extends    ServiceBaseImpl
     @Override
     public boolean hasDisposableItems(DispositionSchedule dispositionSchdule)
     {
-    	return !getDisposableItems(dispositionSchdule).isEmpty();
+        ParameterCheck.mandatory("dispositionSchedule", dispositionSchdule);
+
+        // Get the associated container
+        NodeRef rmContainer = getAssociatedRecordsManagementContainer(dispositionSchdule);
+
+        return hasDisposableItemsImpl(dispositionSchdule.isRecordLevelDisposition(), rmContainer);
+    }
+
+    /**
+     * Method that provides a boolean if given Records Management Container has disposable items.
+     * This method is similar to getDisposableItemsImpl(boolean isRecordLevelDisposition, NodeRef rmContainer) but with improved performance:
+     * For RecordLevelDisposition it will limit Record retrieval to 1.
+     * Early returns once the first occurrence is found.
+     * @param isRecordLevelDisposition
+     * @param rmContainer
+     * @return
+     */
+    private boolean hasDisposableItemsImpl(boolean isRecordLevelDisposition, NodeRef rmContainer)
+    {
+        List<NodeRef> items = filePlanService.getAllContained(rmContainer);
+        for (NodeRef item : items)
+        {
+            if (recordFolderService.isRecordFolder(item))
+            {
+                if (isRecordLevelDisposition)
+                {
+                    List<ChildAssociationRef> assocs = nodeService.getChildAssocs(item, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL, 1, true);
+                    if (!assocs.isEmpty())
+                    {
+                        return true;
+                    }
+                }
+                else
+                {
+                    return true;
+                }
+            }
+            else if (filePlanService.isRecordCategory(item) && getAssociatedDispositionScheduleImpl(item) == null)
+            {
+                return hasDisposableItemsImpl(isRecordLevelDisposition, item);
+            }
+        }
+        return false;
     }
 
     /**

From 8c511ddec4fb383b414b96fe85b76e06285c0ba7 Mon Sep 17 00:00:00 2001
From: Epure Alexandru-Eusebiu <alexeusebiu@gmail.com>
Date: Fri, 4 Dec 2020 10:36:11 +0200
Subject: [PATCH 09/35] Fix the early returning of the recurssion.

---
 .../disposition/DispositionServiceImpl.java                  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
index 37394e6cb6..66e9e1bf7c 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
@@ -527,7 +527,10 @@ public class DispositionServiceImpl extends    ServiceBaseImpl
             }
             else if (filePlanService.isRecordCategory(item) && getAssociatedDispositionScheduleImpl(item) == null)
             {
-                return hasDisposableItemsImpl(isRecordLevelDisposition, item);
+                if (hasDisposableItemsImpl(isRecordLevelDisposition, item));
+                {
+                    return true;
+                }
             }
         }
         return false;

From 48d00e7dff5a209c4fc14f2f329e4fc29818e954 Mon Sep 17 00:00:00 2001
From: Epure Alexandru-Eusebiu <alexeusebiu@gmail.com>
Date: Fri, 4 Dec 2020 10:37:16 +0200
Subject: [PATCH 10/35] Change travis.yml setting to trigger a build.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a61a87d351..18a5f34ffc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ branches:
     - /release\/V3.\d+.*/
     - /feature-3.\d+\/.*/
     - /merge-3.\d+\/.*/
-    - /hotfix-3.\d+\/.*/
+    - /hotfix-3.2.0.11/.*/
 
 cache:
   directories:

From 4b8290f1530efc9c8c2fc30e6bb27d10810cccb1 Mon Sep 17 00:00:00 2001
From: Epure Alexandru-Eusebiu <alexeusebiu@gmail.com>
Date: Fri, 4 Dec 2020 19:42:49 +0200
Subject: [PATCH 11/35] Revert "Change travis.yml setting to trigger a build."

This reverts commit 48d00e7dff5a209c4fc14f2f329e4fc29818e954.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 18a5f34ffc..a61a87d351 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ branches:
     - /release\/V3.\d+.*/
     - /feature-3.\d+\/.*/
     - /merge-3.\d+\/.*/
-    - /hotfix-3.2.0.11/.*/
+    - /hotfix-3.\d+\/.*/
 
 cache:
   directories:

From c460e9ecc68b77b611571ff88f306015c6c87752 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 09:43:33 +0200
Subject: [PATCH 12/35] [enterprise release 3.2.0.11
 3.2.0.12-SNAPSHOT][publish][skip tests]


From 86d3c75e0afca23cf383a1ffe402160d401e22ba Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 12:49:10 +0200
Subject: [PATCH 13/35] [enterprise release 3.2.0.11
 3.2.0.12-SNAPSHOT][publish] [skip tests]

---
 scripts/set-release-variables.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index 35013b7053..c0362e5b91 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,15 +2,15 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1)
-export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT')
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"
 echo "Development version is set to $DEVELOPMENT_VERSION"
\ No newline at end of file

From a9fe2c3f67e04f7551910d89dce84c3489730631 Mon Sep 17 00:00:00 2001
From: Travis CI User <build@alfresco.com>
Date: Mon, 7 Dec 2020 11:55:31 +0000
Subject: [PATCH 14/35] [maven-release-plugin][skip ci] prepare release
 V3.2.0.11

---
 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 b35d9deb73..39d4a023c7 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.2.0.11-SNAPSHOT</version>
+   <version>3.2.0.11</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.2.0.11</tag>
   </scm>
 
    <issueManagement>
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index dd36705450..ae9f24eb1d 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.2.0.11-SNAPSHOT</version>
+      <version>3.2.0.11</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 2eb59111d2..b40361aff3 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.2.0.11-SNAPSHOT</version>
+      <version>3.2.0.11</version>
    </parent>
 
    <properties>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index 64ccb3a2f3..f1f2c5c735 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.2.0.11-SNAPSHOT</version>
+      <version>3.2.0.11</version>
    </parent>
 
    <licenses>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index e612fd7fbf..ba2371b52b 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.2.0.11-SNAPSHOT</version>
+      <version>3.2.0.11</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 584dad783f..5d16e44c83 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.2.0.11-SNAPSHOT</version>
+      <version>3.2.0.11</version>
    </parent>
 
    <properties>

From 429857e85599c080b40bfae0acf987013fe6370b Mon Sep 17 00:00:00 2001
From: Travis CI User <build@alfresco.com>
Date: Mon, 7 Dec 2020 11:55:40 +0000
Subject: [PATCH 15/35] [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 39d4a023c7..dad514fb30 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.2.0.11</version>
+   <version>3.2.0.12-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.2.0.11</tag>
+     <tag>HEAD</tag>
   </scm>
 
    <issueManagement>
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index ae9f24eb1d..9f080f9905 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.2.0.11</version>
+      <version>3.2.0.12-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 b40361aff3..9cc96467af 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.2.0.11</version>
+      <version>3.2.0.12-SNAPSHOT</version>
    </parent>
 
    <properties>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index f1f2c5c735..bba5ee5df3 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.2.0.11</version>
+      <version>3.2.0.12-SNAPSHOT</version>
    </parent>
 
    <licenses>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index ba2371b52b..a35f1213d0 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.2.0.11</version>
+      <version>3.2.0.12-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 5d16e44c83..1fa0f37733 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.2.0.11</version>
+      <version>3.2.0.12-SNAPSHOT</version>
    </parent>
 
    <properties>

From 97efd390b397c23c70df5a41f2ff301a0aebb742 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 14:43:22 +0200
Subject: [PATCH 16/35] Fix publish stage in travis

---
 travis/.travis.publish-stage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis/.travis.publish-stage.yml b/travis/.travis.publish-stage.yml
index fdb32962c4..e597eedc81 100644
--- a/travis/.travis.publish-stage.yml
+++ b/travis/.travis.publish-stage.yml
@@ -9,7 +9,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: $RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_ACCESS_SECRET}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/community/RM/${RELEASE_VERSION}"

From 0917cf9c468d2631b1b772de8b26b2377c6460f8 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 16:27:44 +0200
Subject: [PATCH 17/35] Fix publish stage credentials and release script regex

---
 .travis.yml                      | 4 ++--
 scripts/set-release-variables.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 654183c30e..3de15a28aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -224,7 +224,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: $RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/community/RM/${RELEASE_VERSION}"
@@ -245,7 +245,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: ${RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"
diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index 35013b7053..b15b3a59cb 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,15 +2,15 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1)
-export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT')
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"
 echo "Development version is set to $DEVELOPMENT_VERSION"
\ No newline at end of file

From b0c205a73aebba01917f93b3909c3b50a942019c Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 16:27:44 +0200
Subject: [PATCH 18/35] Fix publish stage credentials and release script regex

---
 .travis.yml                      | 4 ++--
 scripts/set-release-variables.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0aae63c89a..addc8093f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -225,7 +225,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: $RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/community/RM/${RELEASE_VERSION}"
@@ -246,7 +246,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: ${RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"
diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index 35013b7053..b15b3a59cb 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,15 +2,15 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1)
-export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT')
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"
 echo "Development version is set to $DEVELOPMENT_VERSION"
\ No newline at end of file

From 27f7d4b7c75778435abf7bf8c954bc0f3a9f154a Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 16:27:44 +0200
Subject: [PATCH 19/35] Fix publish stage credentials and release script regex

---
 .travis.yml                      | 4 ++--
 scripts/set-release-variables.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c1bf5571d7..fbd00613f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -224,7 +224,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: $RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/community/RM/${RELEASE_VERSION}"
@@ -245,7 +245,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: ${RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"
diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index 35013b7053..b15b3a59cb 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,15 +2,15 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1)
-export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT')
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"
 echo "Development version is set to $DEVELOPMENT_VERSION"
\ No newline at end of file

From 698ad950220c413978411a13fea46ac81ebd895f Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 16:27:44 +0200
Subject: [PATCH 20/35] Fix publish stage credentials and release script regex

---
 .travis.yml                      | 4 ++--
 scripts/set-release-variables.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 86eeac0a9f..695824b1d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -231,7 +231,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: $RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/community/RM/${RELEASE_VERSION}"
@@ -252,7 +252,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: ${RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"
diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index 35013b7053..b15b3a59cb 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,15 +2,15 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1)
-export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT')
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"
 echo "Development version is set to $DEVELOPMENT_VERSION"
\ No newline at end of file

From 9014638210c432ad70480af7f4183f18c4ba2d55 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 17:30:57 +0200
Subject: [PATCH 21/35] Updated regex for release version

---
 scripts/set-release-variables.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index b15b3a59cb..9d38ed7e4c 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,14 +2,14 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}' | head -1)
 export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"

From 96ea0338a1c106fbe84bf141d39ddd609c445bf0 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 16:59:00 +0200
Subject: [PATCH 22/35] Merge branch 'release/V2.7' into release/V3.0

---
 scripts/set-release-variables.sh | 6 +++---
 travis/.travis.publish-stage.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index 35013b7053..b15b3a59cb 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,15 +2,15 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1)
-export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT')
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"
 echo "Development version is set to $DEVELOPMENT_VERSION"
\ No newline at end of file
diff --git a/travis/.travis.publish-stage.yml b/travis/.travis.publish-stage.yml
index fdb32962c4..dd2dea54ba 100644
--- a/travis/.travis.publish-stage.yml
+++ b/travis/.travis.publish-stage.yml
@@ -9,7 +9,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: $RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/community/RM/${RELEASE_VERSION}"
@@ -30,7 +30,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: ${RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"

From 3a159361125b0ee47a1c4f555f9bb846ac742d47 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 17:30:57 +0200
Subject: [PATCH 23/35] Updated regex for release version

---
 scripts/set-release-variables.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index b15b3a59cb..9d38ed7e4c 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,14 +2,14 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}' | head -1)
 export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"

From 4f41566bb2821f7a6b56cb3a146a3b02982bc486 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 16:59:00 +0200
Subject: [PATCH 24/35] Merge branch 'release/V2.7' into release/V3.0

---
 scripts/set-release-variables.sh | 6 +++---
 travis/.travis.publish-stage.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index 35013b7053..b15b3a59cb 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,15 +2,15 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1)
-export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT')
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"
 echo "Development version is set to $DEVELOPMENT_VERSION"
\ No newline at end of file
diff --git a/travis/.travis.publish-stage.yml b/travis/.travis.publish-stage.yml
index fdb32962c4..dd2dea54ba 100644
--- a/travis/.travis.publish-stage.yml
+++ b/travis/.travis.publish-stage.yml
@@ -9,7 +9,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: $RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/community/RM/${RELEASE_VERSION}"
@@ -30,7 +30,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: ${RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"

From ef68c92eab8622292b355612acd0f6bbd97f8c5e Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 17:30:57 +0200
Subject: [PATCH 25/35] Updated regex for release version

---
 scripts/set-release-variables.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index b15b3a59cb..9d38ed7e4c 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,14 +2,14 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}' | head -1)
 export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"

From 194cbae1f92413153f9a067c9ab31cd5772fed55 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 16:59:00 +0200
Subject: [PATCH 26/35] Merge branch 'release/V2.7' into release/V3.0

---
 scripts/set-release-variables.sh | 6 +++---
 travis/.travis.publish-stage.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index 35013b7053..b15b3a59cb 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,15 +2,15 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1)
-export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT')
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"
 echo "Development version is set to $DEVELOPMENT_VERSION"
\ No newline at end of file
diff --git a/travis/.travis.publish-stage.yml b/travis/.travis.publish-stage.yml
index fdb32962c4..dd2dea54ba 100644
--- a/travis/.travis.publish-stage.yml
+++ b/travis/.travis.publish-stage.yml
@@ -9,7 +9,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: $RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/community/RM/${RELEASE_VERSION}"
@@ -30,7 +30,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: ${RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"

From 81180d899d77c08ca8baa513ab62c02a852429d1 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 17:30:57 +0200
Subject: [PATCH 27/35] Updated regex for release version

---
 scripts/set-release-variables.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index b15b3a59cb..9d38ed7e4c 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,14 +2,14 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}' | head -1)
 export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"

From c4a7f1a7f90dd0aafae4ad00c411ca547b5782c3 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 17:45:22 +0200
Subject: [PATCH 28/35] Merge branch 'release/V3.0' into release/V3.1

---
 scripts/set-release-variables.sh | 6 +++---
 travis/.travis.publish-stage.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index 35013b7053..9d38ed7e4c 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,15 +2,15 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1)
-export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT')
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}' | head -1)
+export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"
 echo "Development version is set to $DEVELOPMENT_VERSION"
\ No newline at end of file
diff --git a/travis/.travis.publish-stage.yml b/travis/.travis.publish-stage.yml
index fdb32962c4..dd2dea54ba 100644
--- a/travis/.travis.publish-stage.yml
+++ b/travis/.travis.publish-stage.yml
@@ -9,7 +9,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: $RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/community/RM/${RELEASE_VERSION}"
@@ -30,7 +30,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: ${RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"

From d5478eb85e7eb3f5cb5e01037fd7e03bddfb37d0 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 17:53:42 +0200
Subject: [PATCH 29/35] Merge branch 'release/V3.1' into release/V3.2

# Conflicts:
#	scripts/set-release-variables.sh
---
 scripts/set-release-variables.sh | 4 ++--
 travis/.travis.publish-stage.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index c0362e5b91..9d38ed7e4c 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,14 +2,14 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+(\d)+-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}' | head -1)
 export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"
diff --git a/travis/.travis.publish-stage.yml b/travis/.travis.publish-stage.yml
index fdb32962c4..dd2dea54ba 100644
--- a/travis/.travis.publish-stage.yml
+++ b/travis/.travis.publish-stage.yml
@@ -9,7 +9,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: $RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/community/RM/${RELEASE_VERSION}"
@@ -30,7 +30,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: ${RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"

From b45bc1b6efd22492e3952e2854939fa4b5ec65c4 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 16:59:00 +0200
Subject: [PATCH 30/35] Merge branch 'release/V2.7' into release/V3.0

---
 scripts/set-release-variables.sh | 6 +++---
 travis/.travis.publish-stage.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index 35013b7053..b15b3a59cb 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,15 +2,15 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1)
-export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT')
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"
 echo "Development version is set to $DEVELOPMENT_VERSION"
\ No newline at end of file
diff --git a/travis/.travis.publish-stage.yml b/travis/.travis.publish-stage.yml
index fdb32962c4..dd2dea54ba 100644
--- a/travis/.travis.publish-stage.yml
+++ b/travis/.travis.publish-stage.yml
@@ -9,7 +9,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: $RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/community/RM/${RELEASE_VERSION}"
@@ -30,7 +30,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: ${RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"

From c1dc894802b7c1b075ebbc786327d7ae633cc40e Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 17:30:57 +0200
Subject: [PATCH 31/35] Updated regex for release version

---
 scripts/set-release-variables.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index b15b3a59cb..9d38ed7e4c 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,14 +2,14 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}' | head -1)
 export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"

From bd235385b878bad6f9735555f684c98a68a23034 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 16:59:00 +0200
Subject: [PATCH 32/35] Merge branch 'release/V2.7' into release/V3.0

---
 scripts/set-release-variables.sh | 6 +++---
 travis/.travis.publish-stage.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index 35013b7053..b15b3a59cb 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,15 +2,15 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1)
-export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT')
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"
 echo "Development version is set to $DEVELOPMENT_VERSION"
\ No newline at end of file
diff --git a/travis/.travis.publish-stage.yml b/travis/.travis.publish-stage.yml
index fdb32962c4..dd2dea54ba 100644
--- a/travis/.travis.publish-stage.yml
+++ b/travis/.travis.publish-stage.yml
@@ -9,7 +9,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: $RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/community/RM/${RELEASE_VERSION}"
@@ -30,7 +30,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: ${RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"

From 7505b0ac9e8ad32ffe3b731fe9536eba5df5f142 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 17:30:57 +0200
Subject: [PATCH 33/35] Updated regex for release version

---
 scripts/set-release-variables.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index b15b3a59cb..9d38ed7e4c 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,14 +2,14 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}' | head -1)
 export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"

From 10b9c81194e763f798829800eb3c83eba61f61cf Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 16:59:00 +0200
Subject: [PATCH 34/35] Merge branch 'release/V2.7' into release/V3.0

---
 scripts/set-release-variables.sh | 6 +++---
 travis/.travis.publish-stage.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index 35013b7053..b15b3a59cb 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,15 +2,15 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1)
-export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT')
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"
 echo "Development version is set to $DEVELOPMENT_VERSION"
\ No newline at end of file
diff --git a/travis/.travis.publish-stage.yml b/travis/.travis.publish-stage.yml
index fdb32962c4..dd2dea54ba 100644
--- a/travis/.travis.publish-stage.yml
+++ b/travis/.travis.publish-stage.yml
@@ -9,7 +9,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: $RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/community/RM/${RELEASE_VERSION}"
@@ -30,7 +30,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: ${RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"

From 6d49098ef38a65b4fa5eed9b6ca8d0565d747448 Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Mon, 7 Dec 2020 17:30:57 +0200
Subject: [PATCH 35/35] Updated regex for release version

---
 scripts/set-release-variables.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index b15b3a59cb..9d38ed7e4c 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,14 +2,14 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}' | head -1)
 export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"