From 7040cc8427d0019f739cb5fecb810ad5060e4ecf Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Mon, 25 Feb 2019 12:24:42 -0800
Subject: [PATCH] Fix theia similar to  vscode for commons-ls-extensions build

---
 theia-extensions/theia-spring-boot/build.sh | 24 +++++----------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/theia-extensions/theia-spring-boot/build.sh b/theia-extensions/theia-spring-boot/build.sh
index f5d888795..cdab71f63 100755
--- a/theia-extensions/theia-spring-boot/build.sh
+++ b/theia-extensions/theia-spring-boot/build.sh
@@ -9,29 +9,15 @@ cd ${workdir}
 rm -fr ${workdir}/jars
 mkdir -p ${workdir}/jars
 
-# Use maven to build common-lsp-extensions - jdt extension depend on that jar
-cd ../../../headless-services/
-./mvnw -pl :commons-parent clean install -DskipTests
-./mvnw -pl :commons-lsp-extensions clean install
-cd ${workdir}
-
-# Use maven to build jdt ls extension
-cd ../../../headless-services/jdt-ls-extension
-if command -v xvfb-run ; then
-    echo "Using xvfb to run in headless environment..."
-    xvfb-run ../mvnw clean integration-test
-else
-    ../mvnw clean integration-test
-fi
-cp org.springframework.tooling.jdt.ls.extension/target/*.jar ${workdir}/jars/jdt-ls-extension.jar
-cp org.springframework.tooling.jdt.ls.commons/target/*.jar ${workdir}/jars/jdt-ls-commons.jar
-
-cd ${workdir}
 
 # Use maven to build fat jar of the language server
-cd ../../../headless-services/spring-boot-language-server
+cd ${workdir}/../../../headless-services/spring-boot-language-server
 ./build.sh
 cp target/*.jar ${workdir}/jars
 
+cd ${workdir}/../../../headless-services/jdt-ls-extension
+cp org.springframework.tooling.jdt.ls.extension/target/*.jar ${workdir}/jars/jdt-ls-extension.jar
+cp org.springframework.tooling.jdt.ls.commons/target/*.jar ${workdir}/jars/jdt-ls-commons.jar
+
 cd ${workdir}/..
 yarn