From 6e53b68f0f577a5443edf65dde692ae9f75b5dcc Mon Sep 17 00:00:00 2001
From: ehardon <elena.hardon@ness.com>
Date: Tue, 20 Oct 2020 16:45:58 +0300
Subject: [PATCH] APPS-241: - fix zip-artifacts-release.sh - remove -x flag -
 add scmCommentPrefix to maven release command [enterprise release 2.7.3-A2
 2.7.3-SNAPSHOT] [skip tests]

---
 scripts/release.sh               | 3 ++-
 scripts/set-release-variables.sh | 2 +-
 scripts/zip-artifacts-release.sh | 4 ++--
 scripts/zip-artifacts-staging.sh | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/release.sh b/scripts/release.sh
index f3bc2cdf74..1436d0c8e8 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -ev
 
 # Use full history for release
 git checkout -B "${TRAVIS_BRANCH}"
@@ -27,5 +27,6 @@ mvn --batch-mode \
     -Dpassword="${GIT_PASSWORD}" \
     -DreleaseVersion=${RELEASE_VERSION} \
     -DdevelopmentVersion=${DEVELOPMENT_VERSION} \
+    -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
     -DskipTests -D${release_type} -DuseReleaseProfile=false \
     -P${release_type}-release release:clean release:prepare release:perform
\ No newline at end of file
diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index e74c9ca4a3..44cce71321 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -evx
+set -ev
 
 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\])')
diff --git a/scripts/zip-artifacts-release.sh b/scripts/zip-artifacts-release.sh
index 96a1c14ab3..41ea2c8d5e 100644
--- a/scripts/zip-artifacts-release.sh
+++ b/scripts/zip-artifacts-release.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -evx
+set -ev
 
 release_type=$1
 
@@ -24,4 +24,4 @@ cd artifacts_dir
 zip alfresco-rm-${release_type}-${RELEASE_VERSION}.zip *
 
 # rm *.amp *.war -f
-ls artifacts_dir
\ No newline at end of file
+ls
\ No newline at end of file
diff --git a/scripts/zip-artifacts-staging.sh b/scripts/zip-artifacts-staging.sh
index 12c4b246ad..d06da74700 100755
--- a/scripts/zip-artifacts-staging.sh
+++ b/scripts/zip-artifacts-staging.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -evx
+set -ev
 
 release_type=$1