From 78a6738eb34f8029d594e1991d8085b2ddf37458 Mon Sep 17 00:00:00 2001
From: BoykoAlex <aboyko@pivotal.io>
Date: Fri, 15 Mar 2019 17:27:24 -0400
Subject: [PATCH] PT #164169543: Correct Theia package version setting

---
 concourse/tasks/build-theia-package.sh | 9 ++++-----
 concourse/tasks/theia-rc-build.sh      | 5 +----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/concourse/tasks/build-theia-package.sh b/concourse/tasks/build-theia-package.sh
index 133d2ab8a..b8dd38383 100755
--- a/concourse/tasks/build-theia-package.sh
+++ b/concourse/tasks/build-theia-package.sh
@@ -28,18 +28,17 @@ timestamp=`date -u +%Y%m%d%H%M`
 
 base_version=`jq -r .version package.json`
 
+cd "$sources"
+./build.sh
+
 # for snapshot build, work the timestamp into package.json version qualifier
 qualified_version=${base_version}-${timestamp}
 echo "Version: ${qualified_version}"
-npm version ${qualified_version}
-update_package_json "$sources"/browser-app $server_id $qualified_version
-update_package_json "$sources"/electron-app $server_id $qualified_version
+lerna version ${qualified_version} --exact --no-git-tag-version --no-push --yes
 
 cd "$ext_sources"
 echo -e "\n\n*Version: ${qualified_version}*" >> README.md
 
-cd "$sources"
-./build.sh
 cd "$ext_folder"
 tar_file=$extension_id-v$qualified_version.tgz
 yarn pack --filename $tar_file
diff --git a/concourse/tasks/theia-rc-build.sh b/concourse/tasks/theia-rc-build.sh
index 10a82a07f..e911c9ce0 100755
--- a/concourse/tasks/theia-rc-build.sh
+++ b/concourse/tasks/theia-rc-build.sh
@@ -25,12 +25,9 @@ else
    exit -1
 fi
 
-cd ${ext_sources}
-npm version "${version%-*}" || true
-echo "Version set to " `npm version`
-
 cd ${sources}
 ./build.sh
+lerna version "${version%-*}" || true --exact --no-git-tag-version --no-push --yes
 
 cd ${ext_sources}
 yarn pack