diff --git a/atom-extensions/atom-boot-java/lib/main.js b/atom-extensions/atom-boot-java/lib/main.js
index 2deeda8c6..ad7f793d0 100644
--- a/atom-extensions/atom-boot-java/lib/main.js
+++ b/atom-extensions/atom-boot-java/lib/main.js
@@ -83,7 +83,7 @@ class BootJavaLanguageClient extends JavaProcessLanguageClient {
     }
 
     filterChangeWatchedFiles(filePath) {
-        return filePath.endsWith('.gradle') || filePath.endsWith('/pom.xml');
+        return filePath.endsWith('.gradle') || filePath.endsWith(path.join('', 'pom.xml'));
     }
 
 }
diff --git a/atom-extensions/atom-boot-java/package.json b/atom-extensions/atom-boot-java/package.json
index 66d26c47b..9e5ef96ed 100644
--- a/atom-extensions/atom-boot-java/package.json
+++ b/atom-extensions/atom-boot-java/package.json
@@ -12,6 +12,7 @@
   "files": [
     "lib/",
     "server/",
+    "styles/",
     "properties.json"
   ],
   "configSchema": {
@@ -24,7 +25,7 @@
   "dependencies": {
     "atom-package-deps": "^4.6.0",
     "download": "^6.2.5",
-    "pivotal-atom-languageclient-commons": "0.0.17"
+    "pivotal-atom-languageclient-commons": "0.0.18"
   },
   "devDependencies": {
     "coffeelint": "^1.10.1"
diff --git a/atom-extensions/atom-boot-properties/package.json b/atom-extensions/atom-boot-properties/package.json
index c3f213941..43b3f7201 100644
--- a/atom-extensions/atom-boot-properties/package.json
+++ b/atom-extensions/atom-boot-properties/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "atom-package-deps": "^4.6.0",
     "download": "^6.2.5",
-    "pivotal-atom-languageclient-commons": "0.0.17"
+    "pivotal-atom-languageclient-commons": "0.0.18"
   },
   "devDependencies": {
     "coffeelint": "^1.10.1"
diff --git a/atom-extensions/atom-bosh/package.json b/atom-extensions/atom-bosh/package.json
index cd8610c7e..80003f029 100644
--- a/atom-extensions/atom-bosh/package.json
+++ b/atom-extensions/atom-bosh/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "atom-package-deps": "^4.6.0",
     "download": "^6.2.5",
-    "pivotal-atom-languageclient-commons": "0.0.17"
+    "pivotal-atom-languageclient-commons": "0.0.18"
   },
   "configSchema": {
     "bosh": {
diff --git a/atom-extensions/atom-cf-manifest-yaml/package.json b/atom-extensions/atom-cf-manifest-yaml/package.json
index 6094f04df..235a44395 100644
--- a/atom-extensions/atom-cf-manifest-yaml/package.json
+++ b/atom-extensions/atom-cf-manifest-yaml/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "atom-package-deps": "^4.6.0",
     "download": "^6.2.5",
-    "pivotal-atom-languageclient-commons": "0.0.17"
+    "pivotal-atom-languageclient-commons": "0.0.18"
   },
   "devDependencies": {
     "coffeelint": "^1.10.1"
diff --git a/atom-extensions/atom-commons/lib/java-process-language-client.js b/atom-extensions/atom-commons/lib/java-process-language-client.js
index 77af37405..4c00a6b36 100644
--- a/atom-extensions/atom-commons/lib/java-process-language-client.js
+++ b/atom-extensions/atom-commons/lib/java-process-language-client.js
@@ -222,7 +222,7 @@ export class JavaProcessLanguageClient extends AutoLanguageClient {
             cp.execFile(javaExecutablePath, ['-version'], {}, (error, stdout, stderr) => {
                 if (stderr.indexOf('1.8') >= 0) {
                     resolve(8);
-                } else if (stderr.indexOf('java version "9"') >= 0) {
+                } else if (stderr.indexOf('java version "9') >= 0) {
                     resolve(9);
                 } else {
                     resolve(0);
diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json
index 6a47be4b8..577b577db 100644
--- a/atom-extensions/atom-commons/package.json
+++ b/atom-extensions/atom-commons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pivotal-atom-languageclient-commons",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "Atom language client commons for STS4 language servers",
   "repository": "https://github.com/spring-projects/sts4",
   "license": "MIT",
diff --git a/atom-extensions/atom-concourse/package.json b/atom-extensions/atom-concourse/package.json
index 003d523cf..8027fb3ad 100644
--- a/atom-extensions/atom-concourse/package.json
+++ b/atom-extensions/atom-concourse/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "atom-package-deps": "^4.6.0",
     "download": "^6.2.5",
-    "pivotal-atom-languageclient-commons": "0.0.17"
+    "pivotal-atom-languageclient-commons": "0.0.18"
   },
   "devDependencies": {
     "coffeelint": "^1.10.1"
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 92866827f..269c053b7 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -144,6 +144,11 @@
 					<layout>p2</layout>
 					<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/</url>
 				</repository>
+				<repository>
+					<id>latest-buildship-release</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/buildship/updates/e47/releases/2.x</url>
+				</repository>
 				<repository>
 					<id>maven-extras-mirror</id>
 					<layout>p2</layout>
diff --git a/vscode-extensions/commons-vscode/src/launch-util.ts b/vscode-extensions/commons-vscode/src/launch-util.ts
index cab7bb3b3..f2a895637 100644
--- a/vscode-extensions/commons-vscode/src/launch-util.ts
+++ b/vscode-extensions/commons-vscode/src/launch-util.ts
@@ -201,7 +201,7 @@ function javaVersion(javaExecutablePath: string): Promise<number> {
         ChildProcess.execFile(javaExecutablePath, ['-version'], {}, (error, stdout, stderr) => {
             if (stderr.indexOf('1.8') >= 0) {
                 resolve(8);
-            } else if (stderr.indexOf('java version "9"') >= 0) {
+            } else if (stderr.indexOf('java version "9') >= 0) {
                 resolve(9);
             } else {
                 resolve(0);