From 508d181cf4acb7aae2ac0f6ca264395f7487dc9e Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Tue, 12 Dec 2017 20:37:47 -0500 Subject: [PATCH 1/6] Replace '/' concat with path.join(...) --- atom-extensions/atom-boot-java/lib/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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')); } } From fe8daa1207f09f0005fe94c3afbc40f1e9b2c121 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Tue, 12 Dec 2017 21:12:46 -0500 Subject: [PATCH 2/6] Include `styles` folder in the built artifact --- atom-extensions/atom-boot-java/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/atom-extensions/atom-boot-java/package.json b/atom-extensions/atom-boot-java/package.json index 66d26c47b..4d684c2a5 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": { From 7e3c1ed39ee1e879559d45b89812b74a2e2f835c Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Tue, 12 Dec 2017 21:47:11 -0500 Subject: [PATCH 3/6] Correct check for Java 9 --- .../atom-commons/lib/java-process-language-client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); From fbbf1b7c1ace443d4cc31b68bc907ca4cb53db5d Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Tue, 12 Dec 2017 21:52:53 -0500 Subject: [PATCH 4/6] Upgrade atom-commons --- atom-extensions/atom-boot-java/package.json | 2 +- atom-extensions/atom-boot-properties/package.json | 2 +- atom-extensions/atom-bosh/package.json | 2 +- atom-extensions/atom-cf-manifest-yaml/package.json | 2 +- atom-extensions/atom-commons/package.json | 2 +- atom-extensions/atom-concourse/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/atom-extensions/atom-boot-java/package.json b/atom-extensions/atom-boot-java/package.json index 4d684c2a5..9e5ef96ed 100644 --- a/atom-extensions/atom-boot-java/package.json +++ b/atom-extensions/atom-boot-java/package.json @@ -25,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/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" From 58cdd2b4f19d954dcc815577ebf0b6ddd18dfe6e Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Wed, 13 Dec 2017 10:20:57 +0100 Subject: [PATCH 5/6] added buildship release p2 repo for distribution build --- eclipse-distribution/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) 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 @@ p2 http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/ + + latest-buildship-release + p2 + http://download.eclipse.org/buildship/updates/e47/releases/2.x + maven-extras-mirror p2 From 43817b95a8f307234436e2a9d3f5a667163c9fb2 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Wed, 13 Dec 2017 12:30:46 -0500 Subject: [PATCH 6/6] Correct Java 9 detection for VSCode extensions --- vscode-extensions/commons-vscode/src/launch-util.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { 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);