From fdf709b8ed6d3d55a59eadc2a554faca33ac993f Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Tue, 23 Jan 2018 23:17:39 +0000
Subject: [PATCH] SEARCH-663 (Reduce the number of build plans on Bamboo)

---
 search-services/packaging/buildAndTest.sh | 10 ++++++++--
 search-services/pom.xml                   |  6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/search-services/packaging/buildAndTest.sh b/search-services/packaging/buildAndTest.sh
index 889fb798e..d798bc7ca 100755
--- a/search-services/packaging/buildAndTest.sh
+++ b/search-services/packaging/buildAndTest.sh
@@ -10,8 +10,14 @@ then
    # set current working directory to the directory of the script
    cd "$bamboo_working_directory"
 
-   dockerImage="quay.io/alfresco/search-services:$bamboo_maven_version"
-   echo "Building $dockerImage from $nicebranch using version $bamboo_maven_version"
+   tag_version=`echo "$bamboo_maven_version"`
+   if [ "${bamboo_shortJobName}" = "Release" ]
+   then
+      tag_version=`echo "$bamboo_release_version"`
+   fi
+
+   dockerImage="quay.io/alfresco/search-services:$tag_version"
+   echo "Building $dockerImage from $nicebranch using version $tag_version"
 
    docker build -t $dockerImage packaging/target/docker-resources
 
diff --git a/search-services/pom.xml b/search-services/pom.xml
index fe4c989d1..d3e69e23a 100644
--- a/search-services/pom.xml
+++ b/search-services/pom.xml
@@ -25,9 +25,9 @@
         </snapshotRepository>
     </distributionManagement>
     <scm>
-        <connection>scm:git:https://git.alfresco.com/search_discovery/searchservices.git</connection>
-        <developerConnection>scm:git:https://git.alfresco.com/search_discovery/searchservices.git</developerConnection>
-        <url>https://git.alfresco.com/search_discovery/searchservices.git</url>
+        <connection>scm:git:git@github.com:Alfresco/SearchServices.git</connection>
+        <developerConnection>scm:git:git@github.com:Alfresco/SearchServices.git</developerConnection>
+        <url>https://github.com/Alfresco/SearchServices.git</url>
         <tag>HEAD</tag>
     </scm>
     <modules>