From 502d04d5a3c2cc43aa518ed97778e0ef665cb13d Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Tue, 27 Mar 2018 09:45:23 -0700
Subject: [PATCH] Cleanups before merging to master

Use proper jdt.ls snapshot udate site instead of locally built one.
Re-enable test running in spring-boot language server.
Remove debug flags from vscode-spring-boot launcher.
---
 .../org.springframework.tooling.jdt.ls.extension/pom.xml      | 4 ++--
 headless-services/spring-boot-language-server/build.sh        | 1 -
 vscode-extensions/vscode-spring-boot/lib/Main.ts              | 2 +-
 vscode-extensions/vscode-spring-boot/scripts/preinstall.sh    | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/headless-services/org.springframework.tooling.jdt.ls.extension/pom.xml b/headless-services/org.springframework.tooling.jdt.ls.extension/pom.xml
index 448754afd..aecd3471a 100644
--- a/headless-services/org.springframework.tooling.jdt.ls.extension/pom.xml
+++ b/headless-services/org.springframework.tooling.jdt.ls.extension/pom.xml
@@ -19,8 +19,8 @@
     <repository>
       <id>JDT.LS</id>
       <layout>p2</layout>
-      <url>${jdt.ls.updatesite}</url>
-<!--  <url>http://download.eclipse.org/jdtls/snapshots/repository/latest/</url> -->
+      <!-- <url>${jdt.ls.updatesite}</url> -->
+      <url>http://download.eclipse.org/jdtls/snapshots/repository/latest/</url>
     </repository>
   </repositories>
   <build>
diff --git a/headless-services/spring-boot-language-server/build.sh b/headless-services/spring-boot-language-server/build.sh
index 8a882147a..995aac236 100755
--- a/headless-services/spring-boot-language-server/build.sh
+++ b/headless-services/spring-boot-language-server/build.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 set -e
 ../mvnw \
-    -Dmaven.test.skip=true \
     -f ../pom.xml \
     -pl spring-boot-language-server \
     -am \
diff --git a/vscode-extensions/vscode-spring-boot/lib/Main.ts b/vscode-extensions/vscode-spring-boot/lib/Main.ts
index 14c864862..56f3b9b5f 100644
--- a/vscode-extensions/vscode-spring-boot/lib/Main.ts
+++ b/vscode-extensions/vscode-spring-boot/lib/Main.ts
@@ -18,7 +18,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) => {
diff --git a/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh b/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
index 0c8825b90..ae464c248 100755
--- a/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
@@ -18,7 +18,6 @@ mkdir -p ${workdir}/jars
 # Use maven to build jdt ls extension
 cd ../../headless-services/org.springframework.tooling.jdt.ls.extension
 ../mvnw \
-    -Djdt.ls.updatesite=file://${HOME}/git/eclipse.jdt.ls/org.eclipse.jdt.ls.repository/target/repository\
     clean package
 cp target/*.jar ${workdir}/jars/jdt-ls-extension.jar