From e914017909f6bb1e32227752cd747fcfc4eddb49 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 24 Nov 2017 00:31:44 -0500 Subject: [PATCH 01/11] Upgrade postinstall-build dependency --- atom-extensions/atom-commons/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json index 6e4d5a4bb..8d41270c8 100644 --- a/atom-extensions/atom-commons/package.json +++ b/atom-extensions/atom-commons/package.json @@ -12,7 +12,7 @@ "decompress": "^4.2.0", "portfinder": "^1.0.13", "remote-file-size": "^3.0.3", - "postinstall-build": "^3.0.0" + "postinstall-build": "5.0.1" }, "main": "./build/lib/index", "scripts": { From 32783763b253690e2f58526c8de4ed57369d627f Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 24 Nov 2017 00:47:54 -0500 Subject: [PATCH 02/11] Correct `prepublish` for the latest version of postinstall-build --- atom-extensions/atom-commons/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json index 8d41270c8..476577e3d 100644 --- a/atom-extensions/atom-commons/package.json +++ b/atom-extensions/atom-commons/package.json @@ -19,7 +19,7 @@ "clean": "rm -rf build", "compile": "babel lib --out-dir build/lib", "postinstall": "postinstall-build --only-as-dependency build \"npm run compile\"", - "prepublish": "npm run clean && npm run compile", + "prepublish": "npm run compile", "watch": "babel lib --out-dir build/lib -w" }, "atomTranspilers": [ From 25d2b4c0201af3b1ee434deebe0fec88c585ea47 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Fri, 24 Nov 2017 10:25:57 +0100 Subject: [PATCH 03/11] set max heap size for boot-java ls in eclipse context to 1024m --- .../tooling/boot/java/ls/SpringBootJavaLanguageServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServer.java index 4e2bbd1eb..d62767db3 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServer.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServer.java @@ -37,7 +37,7 @@ public class SpringBootJavaLanguageServer extends STS4LanguageServerProcessStrea commands.add("-Dlsp.lazy.completions.disable=true"); commands.add("-Dlsp.completions.indentation.enable=true"); - commands.add("-Xmx200m"); + commands.add("-Xmx1024m"); commands.add("-cp"); commands.add(getToolsJAR() + ":" + getLanguageServerJARLocation()); commands.add("org.springframework.boot.loader.JarLauncher"); From 37ca42c969d2e71d80a8e24d4eb1a9f6ec727f7b Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 24 Nov 2017 10:16:19 -0500 Subject: [PATCH 04/11] Fix Atom built artifact --- atom-extensions/atom-commons/package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json index 476577e3d..fa7343fc3 100644 --- a/atom-extensions/atom-commons/package.json +++ b/atom-extensions/atom-commons/package.json @@ -15,11 +15,14 @@ "postinstall-build": "5.0.1" }, "main": "./build/lib/index", + "files": [ + "build/" + ], "scripts": { "clean": "rm -rf build", "compile": "babel lib --out-dir build/lib", "postinstall": "postinstall-build --only-as-dependency build \"npm run compile\"", - "prepublish": "npm run compile", + "prepublish": "npm run clean && npm run compile", "watch": "babel lib --out-dir build/lib -w" }, "atomTranspilers": [ From 1c87a3878c79b03d7567f29ac2f2b479b813c819 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 24 Nov 2017 12:33:40 -0500 Subject: [PATCH 05/11] Debugging atom build --- concourse/tasks/build-atom-package.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index aac0eaa73..0efa43880 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -25,6 +25,10 @@ EOF npm install +cd $atom_package/node_modules/pivotal-atom-languageclient-commons +ls +cd $atom_package + # push code to release repository cd $workdir @@ -48,13 +52,17 @@ git add . git commit \ -m "Publish ${fatjar_version}" -# Publsuh linkable artifact to S3 +# Publish linkable artifact to S3 cd $atom_package npm install bundle-deps node ./node_modules/bundle-deps/bundle-deps . +cd $atom_package/node_modules/pivotal-atom-languageclient-commons +ls +cd $atom_package + basename=$(npm pack | tee /dev/tty) timestamp=`date -u +%Y%m%d%H%M` From c80cbe175106f4fe50cce9e8b45cf7b4fdc46421 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 24 Nov 2017 13:00:19 -0500 Subject: [PATCH 06/11] Fix Atom build by installing local atom-commons --- concourse/tasks/build-atom-package.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index 0efa43880..f5ca763de 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -15,7 +15,7 @@ fatjar_version=`cat fatjar/version` cd $atom_package -# npm install ${atom_commons} +npm install ${atom_commons} cat > properties.json << EOF { @@ -25,10 +25,6 @@ EOF npm install -cd $atom_package/node_modules/pivotal-atom-languageclient-commons -ls -cd $atom_package - # push code to release repository cd $workdir @@ -49,8 +45,12 @@ git config user.name "Alex Boyko" git add . +git_changes=git diff --cached --exit-code +if [$git_changes != 0] +then git commit \ -m "Publish ${fatjar_version}" +fi # Publish linkable artifact to S3 @@ -59,10 +59,6 @@ npm install bundle-deps node ./node_modules/bundle-deps/bundle-deps . -cd $atom_package/node_modules/pivotal-atom-languageclient-commons -ls -cd $atom_package - basename=$(npm pack | tee /dev/tty) timestamp=`date -u +%Y%m%d%H%M` From 3e131bfbd4006cdcce1d8f7b4c6bcbf32ec289f2 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 24 Nov 2017 13:11:54 -0500 Subject: [PATCH 07/11] Correct git check for Atom build --- concourse/tasks/build-atom-package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index f5ca763de..cec420f26 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -45,7 +45,7 @@ git config user.name "Alex Boyko" git add . -git_changes=git diff --cached --exit-code +git_changes=$(git diff --cached --exit-code) if [$git_changes != 0] then git commit \ From e4276eb62071db46accacc790d8f96e67e444b13 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 24 Nov 2017 13:22:10 -0500 Subject: [PATCH 08/11] Revert git change check --- concourse/tasks/build-atom-package.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index cec420f26..f187a7ea2 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -45,12 +45,8 @@ git config user.name "Alex Boyko" git add . -git_changes=$(git diff --cached --exit-code) -if [$git_changes != 0] -then git commit \ -m "Publish ${fatjar_version}" -fi # Publish linkable artifact to S3 From 6e704b9f05a480cb756ed0f0133b7d82cd8db5c5 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 24 Nov 2017 13:25:54 -0500 Subject: [PATCH 09/11] Properly setup atom-commons --- concourse/tasks/build-atom-package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index f187a7ea2..208eb7de0 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -10,8 +10,8 @@ atom_package=$workdir/sts4/atom-extensions/$package_name url=`cat fatjar/url` fatjar_version=`cat fatjar/version` -# cd $atom_commons -# npm install +cd $atom_commons +npm install cd $atom_package From 2b36f2db0c7a29b43d6bd1d251560cd70435aa98 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 24 Nov 2017 13:39:07 -0500 Subject: [PATCH 10/11] Correction to Atom build script --- concourse/tasks/build-atom-package.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index 208eb7de0..c068f2e41 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -3,8 +3,7 @@ set -e set -v workdir=`pwd` output=$workdir/out -# atom_commons=$workdir/sts4/atom-extensions/atom-commons -# atom_package=$workdir/package_sources +atom_commons=$workdir/sts4/atom-extensions/atom-commons atom_package=$workdir/sts4/atom-extensions/$package_name url=`cat fatjar/url` From f02222584e28aebfebea90b3b6864b9ea6ac8e0b Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 24 Nov 2017 14:05:15 -0500 Subject: [PATCH 11/11] Finalize Atom build fix --- 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 731c4d3e2..ce63cc3ba 100644 --- a/atom-extensions/atom-boot-java/package.json +++ b/atom-extensions/atom-boot-java/package.json @@ -24,7 +24,7 @@ "dependencies": { "atom-package-deps": "^4.6.0", "download": "^6.2.5", - "pivotal-atom-languageclient-commons": "0.0.16" + "pivotal-atom-languageclient-commons": "0.0.17" }, "devDependencies": { "coffeelint": "^1.10.1" diff --git a/atom-extensions/atom-boot-properties/package.json b/atom-extensions/atom-boot-properties/package.json index c1c4434b0..9bada2d40 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.16" + "pivotal-atom-languageclient-commons": "0.0.17" }, "devDependencies": { "coffeelint": "^1.10.1" diff --git a/atom-extensions/atom-bosh/package.json b/atom-extensions/atom-bosh/package.json index 1ecc4706c..51eb790e1 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.16" + "pivotal-atom-languageclient-commons": "0.0.17" }, "configSchema": { "bosh": { diff --git a/atom-extensions/atom-cf-manifest-yaml/package.json b/atom-extensions/atom-cf-manifest-yaml/package.json index b8c9db3ef..ab4625570 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.16" + "pivotal-atom-languageclient-commons": "0.0.17" }, "devDependencies": { "coffeelint": "^1.10.1" diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json index fa7343fc3..6a47be4b8 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.16", + "version": "0.0.17", "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 b4710a8e1..7ea9cee38 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.16" + "pivotal-atom-languageclient-commons": "0.0.17" }, "devDependencies": { "coffeelint": "^1.10.1"