From 8e405dbb30c529832882d404d4cbbcd716292abd Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Thu, 30 Jul 2020 10:07:09 +0100
Subject: [PATCH] Modify release command

---
 .travis.yml                       | 6 +++++-
 search-services/packaging/pom.xml | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 97f36ab25..e9c817c7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -164,9 +164,13 @@ jobs:
 #      if: fork = false AND (branch = master OR branch =~ /support\/.*/) AND type != pull_request AND commit_message =~ /\[release\]/
 #      if: commit_message =~ /\[release\]/
       install:
+        # Use full history for release
+        - git checkout -B "${TRAVIS_BRANCH}"
+        # Add email to link commits to user
+        - git config user.email "${GIT_EMAIL}"
         - travis_retry travis_wait 60 mvn --batch-mode -q clean package -DskipTests
       script:
-        - travis_wait 60 mvn --batch-mode -DreleaseVersion=$RELEASE_VERSION -DdevelopmentVersion=$DEVELOPMENT_VERSION release:prepare release:perform -DskipTests "-Darguments=-DskipTests -Dadditionalparam=-Xdoclint:none"
+        - travis_wait 60 mvn --batch-mode -DreleaseVersion=$RELEASE_VERSION -DdevelopmentVersion=$DEVELOPMENT_VERSION -DscmCommentPrefix="[maven-release-plugin][skip ci]" -DskipTests "-Darguments=-DskipTests -Dadditionalparam=-Xdoclint:none" release:prepare release:perform
       deploy:
         - provider: s3
           access_key_id: ${AWS_STAGING_ACCESS_KEY}
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index 8db3085d8..05c2767ad 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -8,7 +8,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.timestamp>${maven.build.timestamp}</project.timestamp>
-        <project.revision.key>${bamboo_repository_revision_number}</project.revision.key>
     </properties>
     <parent>
         <groupId>org.alfresco</groupId>