From 90e52ab6e001d06774eefa816e3d3658d9d80465 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Tue, 20 Mar 2018 14:56:33 -0700
Subject: [PATCH] Update build.sh to require less changes in jdt.ls and
 vscode-java

---
 vscode-extensions/vscode-spring-boot/build.sh    | 5 +++--
 vscode-extensions/vscode-spring-boot/lib/Main.ts | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/vscode-extensions/vscode-spring-boot/build.sh b/vscode-extensions/vscode-spring-boot/build.sh
index 273589182..d7695ffc6 100755
--- a/vscode-extensions/vscode-spring-boot/build.sh
+++ b/vscode-extensions/vscode-spring-boot/build.sh
@@ -6,7 +6,7 @@ workdir=$(pwd)
 # Build jdt.ls
 cd ${HOME}/git/eclipse.jdt.ls
 jdt_ls_repo=$(pwd)
-./mvnw -Pserver-distro clean package
+./mvnw -Pserver-distro -Pupdate-site clean package
 
 # Build vscode-java
 cd ${HOME}/git/vscode-java
@@ -15,7 +15,8 @@ mkdir server
 tar -xvzf ${jdt_ls_repo}/org.eclipse.jdt.ls.product/distro/jdt-language-server-*.tar.gz -C ./server
 npm install
 rm -fr *.vsix
-npm run vsce-package
+npm install -D vsce
+./node_modules/.bin/vsce package
 code --uninstall-extension redhat.java || echo "Not installed redhat.java"
 code --install-extension *.vsix
 
diff --git a/vscode-extensions/vscode-spring-boot/lib/Main.ts b/vscode-extensions/vscode-spring-boot/lib/Main.ts
index 07de35d22..6673402a2 100644
--- a/vscode-extensions/vscode-spring-boot/lib/Main.ts
+++ b/vscode-extensions/vscode-spring-boot/lib/Main.ts
@@ -20,7 +20,7 @@ const JAVA_LANGUAGE_ID = "java";
 export function activate(context: VSCode.ExtensionContext) {
     let options : commons.ActivatorOptions = {
         DEBUG: false,
-        CONNECT_TO_LS: true,
+        CONNECT_TO_LS: false,
         extensionId: 'vscode-spring-boot',
         preferJdk: true,
         checkjvm: (context: VSCode.ExtensionContext, jvm: commons.JVM) => {