From d0ec0d22eca4a50bc077a456f08412965db1dd88 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Mon, 14 Aug 2017 13:44:21 -0700
Subject: [PATCH] Tweaks to version bumping scripts

---
 concourse/pipeline.yml                                       | 4 ++--
 .../{bump-package-json-versions.sh => bump-versions.sh}      | 5 ++++-
 .../{bump-package-json-versions.yml => bump-versions.yml}    | 2 +-
 .../tasks}/update-pom-versions.sh                            | 4 +++-
 4 files changed, 10 insertions(+), 5 deletions(-)
 rename concourse/tasks/{bump-package-json-versions.sh => bump-versions.sh} (78%)
 rename concourse/tasks/{bump-package-json-versions.yml => bump-versions.yml} (73%)
 rename {headless-services => concourse/tasks}/update-pom-versions.sh (57%)

diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index c3c60b333..b026e3d01 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -485,8 +485,8 @@ jobs:
       trigger: true
       passed:
       - publish-release
-  - task: bump-package-json-versions
-    file: sts4/concourse/tasks/bump-package-json-versions.yml
+  - task: bump-versions
+    file: sts4/concourse/tasks/bump-versions.yml
   - put: sts4-out
     params:
       repository: out
diff --git a/concourse/tasks/bump-package-json-versions.sh b/concourse/tasks/bump-versions.sh
similarity index 78%
rename from concourse/tasks/bump-package-json-versions.sh
rename to concourse/tasks/bump-versions.sh
index fdf03fc46..a56ba82de 100755
--- a/concourse/tasks/bump-package-json-versions.sh
+++ b/concourse/tasks/bump-versions.sh
@@ -19,7 +19,10 @@ done
 git config user.email "kdevolder@pivotal.io"
 git config user.name "Kris De Volder"
 
+cd $workdir/sts4/headless-services
+$workdir/sts4/concourse/tasks/update-pom-versions.sh $version
+
 git commit \
-    -m "Bump version of vscode extensions to ${version}"
+    -m "Bump version to ${version}"
 
 git clone $workdir/sts4 $workdir/out
diff --git a/concourse/tasks/bump-package-json-versions.yml b/concourse/tasks/bump-versions.yml
similarity index 73%
rename from concourse/tasks/bump-package-json-versions.yml
rename to concourse/tasks/bump-versions.yml
index 5d6250456..44a54192d 100644
--- a/concourse/tasks/bump-package-json-versions.yml
+++ b/concourse/tasks/bump-versions.yml
@@ -9,4 +9,4 @@ image_resource:
   source:
     repository: kdvolder/sts4-build-env
 run:
-  path: sts4/concourse/tasks/bump-package-json-versions.sh
+  path: sts4/concourse/tasks/bump-versions.sh
diff --git a/headless-services/update-pom-versions.sh b/concourse/tasks/update-pom-versions.sh
similarity index 57%
rename from headless-services/update-pom-versions.sh
rename to concourse/tasks/update-pom-versions.sh
index 559aeafea..b685d9f32 100755
--- a/headless-services/update-pom-versions.sh
+++ b/concourse/tasks/update-pom-versions.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 #poms=`find . -name pom.xml -not -path "*/target/*"`
+set -e
+version=$1
 poms=commons/pom.xml
 for i in $poms; do
-    ./mvnw -f $i versions:set -DnewVersion=0.0.9-SNAPSHOT
+    ./mvnw -f $i versions:set -DnewVersion=${version}-SNAPSHOT
 done