Merge branch 'master' of github.com:spring-projects/sts4

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'));
     }
 
 }

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"

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"

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": {

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"

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);

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",

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"

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>

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);