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 01/12] 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 02/12] 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 03/12] 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 04/12] 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 05/12] 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 06/12] 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 07/12] 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 08/12] 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 09/12] 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 10/12] 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 11/12] 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 12/12] 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}"