From 29228edc93bfefa33702934529fb04e33483327c Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Mon, 25 Feb 2019 12:04:31 -0800
Subject: [PATCH] Some improvements to jdt-ls-extensions building

---
 .../spring-boot-language-server/build.sh      | 21 +++++++++++++----
 .../vscode-spring-boot/scripts/preinstall.sh  | 23 ++++---------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/headless-services/spring-boot-language-server/build.sh b/headless-services/spring-boot-language-server/build.sh
index 995aac236..13a851f62 100755
--- a/headless-services/spring-boot-language-server/build.sh
+++ b/headless-services/spring-boot-language-server/build.sh
@@ -1,7 +1,18 @@
 #!/bin/bash
 set -e
-../mvnw \
-    -f ../pom.xml \
-    -pl spring-boot-language-server \
-    -am \
-    clean install
+modules=spring-boot-language-server,:org.springframework.tooling.jdt.ls.extension,:org.springframework.tooling.jdt.ls.commons.test
+cd ../jdt-ls-extension
+if command -v xvfb-run ; then
+    echo "Using xvfb to run in headless environment..."
+    xvfb-run ../mvnw \
+        -f ../pom.xml \
+        -pl $modules \
+        -am \
+        clean install
+else
+    ../mvnw \
+        -f ../pom.xml \
+        -pl $modules \
+        -am \
+        clean install
+fi
diff --git a/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh b/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
index 11d762621..0bdb0ddb8 100755
--- a/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
@@ -15,26 +15,11 @@ curl https://raw.githubusercontent.com/textmate/java.tmbundle/master/Syntaxes/Ja
 rm -fr ${workdir}/jars
 mkdir -p ${workdir}/jars
 
-# Use maven to build commons-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
-
 # 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