From 77429351b630a06b1956ff5808d045490b121b64 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 11 Sep 2019 15:35:08 -0700 Subject: [PATCH 01/17] Better error handling in jvm-launch-util --- nodejs-packages/jvm-launch-utils/package-lock.json | 2 +- nodejs-packages/jvm-launch-utils/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nodejs-packages/jvm-launch-utils/package-lock.json b/nodejs-packages/jvm-launch-utils/package-lock.json index 7696e0ca3..1459cba91 100644 --- a/nodejs-packages/jvm-launch-utils/package-lock.json +++ b/nodejs-packages/jvm-launch-utils/package-lock.json @@ -1,6 +1,6 @@ { "name": "@pivotal-tools/jvm-launch-utils", - "version": "0.0.11", + "version": "0.0.13", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/nodejs-packages/jvm-launch-utils/package.json b/nodejs-packages/jvm-launch-utils/package.json index 5b968a8f5..db7e6a98a 100644 --- a/nodejs-packages/jvm-launch-utils/package.json +++ b/nodejs-packages/jvm-launch-utils/package.json @@ -1,6 +1,6 @@ { "name": "@pivotal-tools/jvm-launch-utils", - "version": "0.0.12", + "version": "0.0.13", "description": "Provides utilities useful for launching Java processes from node packages.", "files": [ "src", From 3e5167bd16e1b352c93a6b986710079245f0f538 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 11 Sep 2019 15:43:06 -0700 Subject: [PATCH 02/17] Better error handling in jvm-launch-util --- nodejs-packages/jvm-launch-utils/package.json | 2 +- .../jvm-launch-utils/src/jvm-util.ts | 20 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/nodejs-packages/jvm-launch-utils/package.json b/nodejs-packages/jvm-launch-utils/package.json index db7e6a98a..721071ce7 100644 --- a/nodejs-packages/jvm-launch-utils/package.json +++ b/nodejs-packages/jvm-launch-utils/package.json @@ -1,6 +1,6 @@ { "name": "@pivotal-tools/jvm-launch-utils", - "version": "0.0.13", + "version": "0.0.14", "description": "Provides utilities useful for launching Java processes from node packages.", "files": [ "src", diff --git a/nodejs-packages/jvm-launch-utils/src/jvm-util.ts b/nodejs-packages/jvm-launch-utils/src/jvm-util.ts index dce8a43d6..e41b295d1 100644 --- a/nodejs-packages/jvm-launch-utils/src/jvm-util.ts +++ b/nodejs-packages/jvm-launch-utils/src/jvm-util.ts @@ -55,15 +55,19 @@ export interface JVM { * toolsjar and to check whether the JVM is a JDK. */ export function findJvm(javaHome?: string) : Promise { - let javaExe = findJavaExe(javaHome); - if (javaExe) { - return getJavaInfo(javaExe).then(javaProps => new JVMImpl( - javaProps.get("java.home"), - javaExe, - getMajorVersion(javaProps) - )); + try { + let javaExe = findJavaExe(javaHome); + if (javaExe) { + return getJavaInfo(javaExe).then(javaProps => new JVMImpl( + javaProps.get("java.home"), + javaExe, + getMajorVersion(javaProps) + )); + } + return Promise.resolve(null); + } catch (e) { + return Promise.reject(e); } - return Promise.resolve(null); } /** From eeb8ef41883a1cc4dddd382136d22601b71eb697 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 11 Sep 2019 15:50:29 -0700 Subject: [PATCH 03/17] Upgrade jvm-launch-util dep to 0.0.14 --- .../commons-vscode/package-lock.json | 8 +- vscode-extensions/commons-vscode/package.json | 8 +- .../vscode-spring-boot/package-lock.json | 85 ++++++++++++++++--- .../vscode-spring-boot/package.json | 2 +- 4 files changed, 84 insertions(+), 19 deletions(-) diff --git a/vscode-extensions/commons-vscode/package-lock.json b/vscode-extensions/commons-vscode/package-lock.json index c913e56ff..931abb6f6 100644 --- a/vscode-extensions/commons-vscode/package-lock.json +++ b/vscode-extensions/commons-vscode/package-lock.json @@ -1,13 +1,13 @@ { "name": "@pivotal-tools/commons-vscode", - "version": "0.2.2", + "version": "0.2.3", "lockfileVersion": 1, "requires": true, "dependencies": { "@pivotal-tools/jvm-launch-utils": { - "version": "0.0.12", - "resolved": "https://registry.npmjs.org/@pivotal-tools/jvm-launch-utils/-/jvm-launch-utils-0.0.12.tgz", - "integrity": "sha512-6VnPe6TkVYr9UCOOlVVEAxhC+mEVt4Hevzc4eoDvUKFxexOD8MY38z6VNpa+lyhdvF6p5+Its/zfCPhdQlbhrQ==" + "version": "0.0.14", + "resolved": "https://registry.npmjs.org/@pivotal-tools/jvm-launch-utils/-/jvm-launch-utils-0.0.14.tgz", + "integrity": "sha512-SndeImJC7YBX5qmwDQQKiW0abUpV9ffVT2CYFaVusgWLaZnkDn9hv5eb0b6W+O/z7mh2Qm8s8Cdzb3OPGGS3/Q==" }, "@types/node": { "version": "7.10.2", diff --git a/vscode-extensions/commons-vscode/package.json b/vscode-extensions/commons-vscode/package.json index 49a45d3d6..fe3e845e4 100644 --- a/vscode-extensions/commons-vscode/package.json +++ b/vscode-extensions/commons-vscode/package.json @@ -1,6 +1,6 @@ { "name": "@pivotal-tools/commons-vscode", - "version": "0.2.2", + "version": "0.2.3", "description": "commons-vscode", "license": "MIT", "repository": "", @@ -24,9 +24,9 @@ "prepack": "node ./node_modules/vscode/bin/install && tsc -p ./" }, "dependencies": { - "@pivotal-tools/jvm-launch-utils": "0.0.12", - "portfinder": "^0.4.0", - "deep-equal": "^1.0.1" + "@pivotal-tools/jvm-launch-utils": "0.0.14", + "deep-equal": "^1.0.1", + "portfinder": "^0.4.0" }, "devDependencies": { "typescript": "2.6.1", diff --git a/vscode-extensions/vscode-spring-boot/package-lock.json b/vscode-extensions/vscode-spring-boot/package-lock.json index 197c08230..114a222d2 100644 --- a/vscode-extensions/vscode-spring-boot/package-lock.json +++ b/vscode-extensions/vscode-spring-boot/package-lock.json @@ -1,22 +1,22 @@ { "name": "vscode-spring-boot", - "version": "1.10.0", + "version": "1.11.0", "lockfileVersion": 1, "requires": true, "dependencies": { "@pivotal-tools/commons-vscode": { - "version": "file:../commons-vscode/pivotal-tools-commons-vscode-0.2.2.tgz", - "integrity": "sha512-i/QoMGh2yISKeZp0/8bEXON+z5sf6eNngHSXdS+DxpXksXNNyXn8gwg1byVdBl0x5nN16BKGqH+/obQH+Fj9Pg==", + "version": "file:../commons-vscode/pivotal-tools-commons-vscode-0.2.3.tgz", + "integrity": "sha512-hM6lASViTLkilF/WSNxnBIumE+CjBUOFg/vCvpL+geETNlma/KJ/tlzJoVW1B4yyP1f5QQVmeHHAGOenSlSluw==", "requires": { - "@pivotal-tools/jvm-launch-utils": "0.0.12", + "@pivotal-tools/jvm-launch-utils": "0.0.14", "deep-equal": "^1.0.1", "portfinder": "^0.4.0" } }, "@pivotal-tools/jvm-launch-utils": { - "version": "0.0.12", - "resolved": "https://registry.npmjs.org/@pivotal-tools/jvm-launch-utils/-/jvm-launch-utils-0.0.12.tgz", - "integrity": "sha512-6VnPe6TkVYr9UCOOlVVEAxhC+mEVt4Hevzc4eoDvUKFxexOD8MY38z6VNpa+lyhdvF6p5+Its/zfCPhdQlbhrQ==" + "version": "0.0.14", + "resolved": "https://registry.npmjs.org/@pivotal-tools/jvm-launch-utils/-/jvm-launch-utils-0.0.14.tgz", + "integrity": "sha512-SndeImJC7YBX5qmwDQQKiW0abUpV9ffVT2CYFaVusgWLaZnkDn9hv5eb0b6W+O/z7mh2Qm8s8Cdzb3OPGGS3/Q==" }, "@types/node": { "version": "9.6.41", @@ -225,9 +225,25 @@ } }, "deep-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.0.tgz", + "integrity": "sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==", + "requires": { + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" + } + }, + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "requires": { + "object-keys": "^1.0.12" + } }, "delayed-stream": { "version": "1.0.0", @@ -383,6 +399,11 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", @@ -428,6 +449,14 @@ "har-schema": "^2.0.0" } }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "requires": { + "function-bind": "^1.1.1" + } + }, "has-flag": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", @@ -501,6 +530,24 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, + "is-arguments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", + "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==" + }, + "is-date-object": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", + "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=" + }, + "is-regex": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", + "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", + "requires": { + "has": "^1.0.1" + } + }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", @@ -693,6 +740,16 @@ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", "dev": true }, + "object-is": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz", + "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=" + }, + "object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" + }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -819,6 +876,14 @@ "util-deprecate": "^1.0.1" } }, + "regexp.prototype.flags": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz", + "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==", + "requires": { + "define-properties": "^1.1.2" + } + }, "request": { "version": "2.88.0", "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", diff --git a/vscode-extensions/vscode-spring-boot/package.json b/vscode-extensions/vscode-spring-boot/package.json index 08fac08b1..01da547d9 100644 --- a/vscode-extensions/vscode-spring-boot/package.json +++ b/vscode-extensions/vscode-spring-boot/package.json @@ -189,7 +189,7 @@ "vsce-package": "vsce package" }, "dependencies": { - "@pivotal-tools/commons-vscode": "file:../commons-vscode/pivotal-tools-commons-vscode-0.2.2.tgz", + "@pivotal-tools/commons-vscode": "file:../commons-vscode/pivotal-tools-commons-vscode-0.2.3.tgz", "vscode-languageclient": "5.2.1" }, "devDependencies": { From f7f30ef074a298f065eba905529715fe090827ef Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 12 Sep 2019 12:45:09 +0200 Subject: [PATCH 04/17] update to recent changes in lsp4e around symbol label providers --- .../META-INF/MANIFEST.MF | 2 +- .../ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF index 13e7111c0..053ca1739 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.springframework.tooling.ls.eclipse.gotosymbol;singleton Bundle-Version: 4.4.0.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.ui.workbench.texteditor, - org.eclipse.lsp4e;bundle-version="0.9.0", + org.eclipse.lsp4e;bundle-version="0.12.0", org.eclipse.lsp4j;bundle-version="0.6.0", org.eclipse.lsp4j.jsonrpc;bundle-version="0.6.0", org.eclipse.jface.text;bundle-version="3.12.0", diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java index cc67d08f2..ceb8a2658 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java @@ -24,8 +24,8 @@ import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.PopupDialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.resource.JFaceColors; -import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.viewers.ColumnViewerToolTipSupport; import org.eclipse.jface.viewers.ISelection; @@ -55,7 +55,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.TreeItem; @@ -103,13 +102,13 @@ public class GotoSymbolDialog extends PopupDialog { private Stylers stylers; private SymbolsLabelProvider symbolsLabelProvider; - public GotoSymbolsLabelProvider(Font base) { + public GotoSymbolsLabelProvider(Font base) { stylers = new Stylers(base); boolean showSymbolsLabelProviderLocation = false; /* dont show full location. we show relative location in our own implementation below */ boolean showKindInformation = false; symbolsLabelProvider = new SymbolsLabelProvider(showSymbolsLabelProviderLocation , showKindInformation) { @Override - protected int getMaxSeverity(IResource resource, Range range) + protected int getMaxSeverity(IResource resource, IDocument doc, Range range) throws CoreException, BadLocationException { int maxSeverity = -1; for (IMarker marker : resource.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO)) { From d5086d4df6c0b42101d701c1e4ea3cb778b622d4 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 12 Sep 2019 15:50:07 +0200 Subject: [PATCH 05/17] fixed typo --- .../ls/commons/classpath/SendClasspathNotificationsJob.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/classpath/SendClasspathNotificationsJob.java b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/classpath/SendClasspathNotificationsJob.java index e1277356b..609f47251 100644 --- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/classpath/SendClasspathNotificationsJob.java +++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/classpath/SendClasspathNotificationsJob.java @@ -126,14 +126,14 @@ public class SendClasspathNotificationsJob extends Job { if (projectLoc==null) { logger.log("Could not send event for project because no project location: "+jp.getElementName()); } else { - boolean exsits = projectExists(jp); + boolean exists = projectExists(jp); boolean open = true; // WARNING: calling jp.isOpen is unreliable and subject to race condition. After a POST_CHAGE project open event // this should be true but it typically is not unless you wait for some time. No idea how you would know // how long you should wait (200ms is not enough, and that seems pretty long). // So we will just pretend / assume project is always open. If resolving classpath fails because it is not // open... so be it (there will be no classpath... this is expected for closed project, so that is fine). - boolean deleted = !(exsits && open); - logger.log("exists = "+exsits +" open = "+open +" => deleted = "+deleted); + boolean deleted = !(exists && open); + logger.log("exists = "+exists +" open = "+open +" => deleted = "+deleted); String projectName = jp.getElementName(); Classpath classpath = Classpath.EMPTY; From f349518d7cb5195979e644600ededa37bcda2bee Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 12 Sep 2019 15:51:09 +0200 Subject: [PATCH 06/17] moved project sorting out of synchronized-based locking of subscriptions to avoid workspace blocking on startup --- .../ReusableClasspathListenerHandler.java | 145 +++++++++--------- 1 file changed, 75 insertions(+), 70 deletions(-) diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/classpath/ReusableClasspathListenerHandler.java b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/classpath/ReusableClasspathListenerHandler.java index 3ef95a2ba..dadb3b0c9 100644 --- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/classpath/ReusableClasspathListenerHandler.java +++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/classpath/ReusableClasspathListenerHandler.java @@ -14,11 +14,11 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Comparator; -import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.function.Supplier; import org.eclipse.core.resources.IProject; @@ -88,62 +88,65 @@ public class ReusableClasspathListenerHandler { class Subscriptions { - private Map subscribers = null; - private ClasspathListenerManager classpathListener = null; - private CallbackJob callbackJob = new CallbackJob(); - + private ConcurrentMap subscribers; + private ClasspathListenerManager classpathListener; + private CallbackJob callbackJob; - public synchronized void subscribe(String callbackCommandId, boolean isBatched) { - if (subscribers==null) { - //First subscriber - subscribers = new HashMap<>(); - } - if (!subscribers.containsKey(callbackCommandId)) { - logger.log("subscribing to classpath changes: " + callbackCommandId +" isBatched = "+isBatched); - classpathListener = new ClasspathListenerManager(logger, new ClasspathListener() { - @Override - public void classpathChanged(IJavaProject jp) { - sendNotification(jp, subscribers.keySet()); - } + public Subscriptions() { + this.subscribers = new ConcurrentHashMap<>(); + this.callbackJob = new CallbackJob(); + } + + public void subscribe(String callbackCommandId, boolean isBatched) { + // keep put of synchronized block to avoid workspace locks + IProject[] sortedProjects = getSortedProjects(); - @Override - public void projectBuilt(IJavaProject jp) { - sendNotificationOnProjectBuilt(jp, subscribers.keySet()); - } - - }); - final SendClasspathNotificationsJob job = new SendClasspathNotificationsJob(logger, conn, callbackCommandId, isBatched); - subscribers.put(callbackCommandId, job); - job.addJobChangeListener(new JobChangeAdapter() { - - @Override - public void done(IJobChangeEvent event) { - List projectNames = job.notificationsSentForProjects; - if (projectNames != null) { - callbackJob.queueProjects(projectNames); + synchronized(this) { + if (!subscribers.containsKey(callbackCommandId)) { + logger.log("subscribing to classpath changes: " + callbackCommandId +" isBatched = "+isBatched); + classpathListener = new ClasspathListenerManager(logger, new ClasspathListener() { + @Override + public void classpathChanged(IJavaProject jp) { + sendNotification(jp, subscribers.keySet()); } - } - - }); - logger.log("subsribers = " + subscribers); - sendInitialEvents(callbackCommandId); + + @Override + public void projectBuilt(IJavaProject jp) { + sendNotificationOnProjectBuilt(jp, subscribers.keySet()); + } + + }); + final SendClasspathNotificationsJob job = new SendClasspathNotificationsJob(logger, conn, callbackCommandId, isBatched); + subscribers.put(callbackCommandId, job); + job.addJobChangeListener(new JobChangeAdapter() { + + @Override + public void done(IJobChangeEvent event) { + List projectNames = job.notificationsSentForProjects; + if (projectNames != null) { + callbackJob.queueProjects(projectNames); + } + } + + }); + logger.log("subsribers = " + subscribers); + sendInitialEvents(callbackCommandId, sortedProjects); + } } } - private void sendInitialEvents(String callbackCommandId) { + private void sendInitialEvents(String callbackCommandId, IProject[] projects) { logger.log("Sending initial event for all projects ..."); - IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - if (projectSorterFactory != null) { - Arrays.sort(projects, projectSorterFactory.get()); - } + Set callbackIds = Collections.singleton(callbackCommandId); for (IProject p : projects) { logger.log("project "+p.getName() +" ..." ); + try { if (p.isAccessible() && p.hasNature(JavaCore.NATURE_ID)) { IJavaProject jp = JavaCore.create(p); - sendNotification(jp, Collections.singleton(callbackCommandId)); + sendNotification(jp, callbackIds); } else { logger.log("project "+p.getName() +" SKIPPED" ); } @@ -153,52 +156,54 @@ public class ReusableClasspathListenerHandler { } logger.log("Sending initial event for all projects DONE"); } + + private IProject[] getSortedProjects() { + IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); + if (projectSorterFactory != null) { + Arrays.sort(projects, projectSorterFactory.get()); + } + + return projects; + } private synchronized void sendNotification(IJavaProject jp, Collection callbackIds) { - if (subscribers!=null) { - for (String callbackId : callbackIds) { - SendClasspathNotificationsJob sendNotificationJob = subscribers.get(callbackId); - sendNotificationJob.queue.add(jp); - sendNotificationJob.schedule(); - } + for (String callbackId : callbackIds) { + SendClasspathNotificationsJob sendNotificationJob = subscribers.get(callbackId); + sendNotificationJob.queue.add(jp); + sendNotificationJob.schedule(); } } private synchronized void sendNotificationOnProjectBuilt(IJavaProject jp, Collection callbackIds) { - if (subscribers!=null) { - for (String callbackId : callbackIds) { - SendClasspathNotificationsJob sendNotificationJob = subscribers.get(callbackId); - sendNotificationJob.builtProjectQueue.add(jp); - sendNotificationJob.schedule(); - } + for (String callbackId : callbackIds) { + SendClasspathNotificationsJob sendNotificationJob = subscribers.get(callbackId); + sendNotificationJob.builtProjectQueue.add(jp); + sendNotificationJob.schedule(); } } public synchronized void unsubscribe(String callbackCommandId) { logger.log("unsubscribing from classpath changes: " + callbackCommandId); - if (subscribers != null) { - subscribers.remove(callbackCommandId); - if (subscribers.isEmpty()) { - subscribers = null; - if (classpathListener!=null) { - classpathListener.dispose(); - classpathListener = null; - } - } + subscribers.remove(callbackCommandId); + + if (subscribers.isEmpty() && classpathListener != null) { + classpathListener.dispose(); + classpathListener = null; } + logger.log("subsribers = " + subscribers); } public boolean isEmpty() { - return subscribers == null || subscribers.isEmpty(); + return subscribers.isEmpty(); } } - private Subscriptions subscribptions = new Subscriptions(); + private Subscriptions subscriptions = new Subscriptions(); public Object removeClasspathListener(String callbackCommandId) { logger.log("ClasspathListenerHandler removeClasspathListener " + callbackCommandId); - subscribptions.unsubscribe(callbackCommandId); + subscriptions.unsubscribe(callbackCommandId); logger.log("ClasspathListenerHandler removeClasspathListener " + callbackCommandId + " => OK"); return "ok"; } @@ -210,13 +215,13 @@ public class ReusableClasspathListenerHandler { public Object addClasspathListener(String callbackCommandId, boolean isBatched) { logger.log("ClasspathListenerHandler addClasspathListener " + callbackCommandId + "isBatched = "+isBatched); - subscribptions.subscribe(callbackCommandId, isBatched); + subscriptions.subscribe(callbackCommandId, isBatched); logger.log("ClasspathListenerHandler addClasspathListener " + callbackCommandId + " => OK"); return "ok"; } public boolean hasNoActiveSubscriptions() { - return subscribptions.isEmpty(); + return subscriptions.isEmpty(); } public void addNotificationsSentCallback(NotificationSentCallback callback) { From d8bda3812f5d00074d05450644f77099553831d4 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Thu, 12 Sep 2019 19:13:54 -0400 Subject: [PATCH 07/17] Fix unnecessary findType calls and NPEs in Boot LS --- .../ide/vscode/commons/jdtls/JdtLsIndex.java | 5 +++-- .../ide/vscode/boot/metadata/types/TypeUtil.java | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jdtls/JdtLsIndex.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jdtls/JdtLsIndex.java index 857526555..04a269c04 100644 --- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jdtls/JdtLsIndex.java +++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jdtls/JdtLsIndex.java @@ -122,14 +122,15 @@ public class JdtLsIndex implements ClasspathIndex { sourceTypeCache.put(fqName, type); } else { type = Optional.of(toType(data)); - if (Classpath.isBinary(data.getClasspathEntry().getCpe())) { + if (data.getClasspathEntry() != null && Classpath.isBinary(data.getClasspathEntry().getCpe())) { binaryTypeCache.put(fqName, type); } else { sourceTypeCache.put(fqName, type); } } } catch (Exception e) { - log.error("{}", e); + log.error("Find type failed for `{}` with {}", fqName, e); + return null; } } return type.orElse(null); diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java index 00e3e84f6..ffc51a5bc 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java @@ -600,9 +600,11 @@ public class TypeUtil { public boolean isEnum(Type type) { try { - IType eclipseType = findType(type.getErasure()); - if (eclipseType!=null) { - return eclipseType.isEnum(); + if (!isArray(type)) { + IType eclipseType = findType(type.getErasure()); + if (eclipseType!=null) { + return eclipseType.isEnum(); + } } } catch (Exception e) { log.error("", e); From 63a5a7ecbb5687eb64300651a5a9b489faefacb3 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 13 Sep 2019 14:33:54 -0400 Subject: [PATCH 08/17] Update XML indexer config in single future --- .../vscode/boot/app/SpringSymbolIndex.java | 70 +++++++++---------- .../test-projects/test-xml-hyperlinks/pom.xml | 2 +- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java index b976fd504..3478682bc 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java @@ -201,42 +201,42 @@ public class SpringSymbolIndex implements InitializingBean { } public CompletableFuture configureIndexer(SymbolIndexConfig config) { - List> futuresList = new ArrayList<>(); - synchronized (this) { - if (config.isScanXml() && !(Arrays.asList(this.indexers).contains(springIndexerXML))) { - this.indexers = new SpringIndexer[] {springIndexerJava, springIndexerXML}; - futuresList.add(CompletableFuture.runAsync(() -> springIndexerXML.setScanFolderGlobs(config.getXmlScanFoldersGlobs()))); - - List globPattern = Arrays.asList(springIndexerXML.getFileWatchPatterns()); - - watchXMLDeleteRegistration = getWorkspaceService().getFileObserver().onFileDeleted(globPattern, (file) -> { - deleteDocument(new TextDocumentIdentifier(file).getUri()); - }); - watchXMLCreatedRegistration = getWorkspaceService().getFileObserver().onFileCreated(globPattern, (file) -> { - createDocument(new TextDocumentIdentifier(file).getUri()); - }); - watchXMLChangedRegistration = getWorkspaceService().getFileObserver().onFileChanged(globPattern, (file) -> { - updateDocument(new TextDocumentIdentifier(file).getUri(), null, "xml changed"); - }); - + return CompletableFuture.runAsync(() -> { + synchronized (SpringSymbolIndex.this) { + if (config.isScanXml() && !(Arrays.asList(this.indexers).contains(springIndexerXML))) { + this.indexers = new SpringIndexer[] {springIndexerJava, springIndexerXML}; + springIndexerXML.setScanFolderGlobs(config.getXmlScanFoldersGlobs()); + + List globPattern = Arrays.asList(springIndexerXML.getFileWatchPatterns()); + + watchXMLDeleteRegistration = getWorkspaceService().getFileObserver().onFileDeleted(globPattern, (file) -> { + deleteDocument(new TextDocumentIdentifier(file).getUri()); + }); + watchXMLCreatedRegistration = getWorkspaceService().getFileObserver().onFileCreated(globPattern, (file) -> { + createDocument(new TextDocumentIdentifier(file).getUri()); + }); + watchXMLChangedRegistration = getWorkspaceService().getFileObserver().onFileChanged(globPattern, (file) -> { + updateDocument(new TextDocumentIdentifier(file).getUri(), null, "xml changed"); + }); + + } + else if (!config.isScanXml() && Arrays.asList(this.indexers).contains(springIndexerXML)) { + this.indexers = new SpringIndexer[] {springIndexerJava}; + springIndexerXML.setScanFolderGlobs(new String[0]); + + getWorkspaceService().getFileObserver().unsubscribe(watchXMLChangedRegistration); + getWorkspaceService().getFileObserver().unsubscribe(watchXMLCreatedRegistration); + getWorkspaceService().getFileObserver().unsubscribe(watchXMLDeleteRegistration); + + watchXMLChangedRegistration = null; + watchXMLCreatedRegistration = null; + watchXMLDeleteRegistration = null; + } else if (config.isScanXml()) { + springIndexerXML.setScanFolderGlobs(config.getXmlScanFoldersGlobs()); + } + springIndexerJava.setScanTestJavaSources(config.isScanTestJavaSources()); } - else if (!config.isScanXml() && Arrays.asList(this.indexers).contains(springIndexerXML)) { - this.indexers = new SpringIndexer[] {springIndexerJava}; - futuresList.add(CompletableFuture.runAsync(() -> springIndexerXML.setScanFolderGlobs(new String[0]))); - - getWorkspaceService().getFileObserver().unsubscribe(watchXMLChangedRegistration); - getWorkspaceService().getFileObserver().unsubscribe(watchXMLCreatedRegistration); - getWorkspaceService().getFileObserver().unsubscribe(watchXMLDeleteRegistration); - - watchXMLChangedRegistration = null; - watchXMLCreatedRegistration = null; - watchXMLDeleteRegistration = null; - } else if (config.isScanXml()) { - futuresList.add(CompletableFuture.runAsync(() -> springIndexerXML.setScanFolderGlobs(config.getXmlScanFoldersGlobs()))); - } - futuresList.add(CompletableFuture.runAsync(() -> springIndexerJava.setScanTestJavaSources(config.isScanTestJavaSources()))); - } - return CompletableFuture.allOf(futuresList.toArray(new CompletableFuture[futuresList.size()])); + }); } public void shutdown() { diff --git a/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-hyperlinks/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-hyperlinks/pom.xml index 28fcfd3e1..f7e29f8a5 100644 --- a/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-hyperlinks/pom.xml +++ b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-hyperlinks/pom.xml @@ -8,7 +8,7 @@ war 1.0.0-BUILD-SNAPSHOT - 1.6 + 1.7 3.1.1.RELEASE 1.6.10 1.6.6 From 5c35358451ec4508a78775e0ea6101f8e5d84f38 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Sun, 15 Sep 2019 21:35:38 -0400 Subject: [PATCH 09/17] Attempt to fix XML beans index on file change --- .../vscode/boot/app/SpringSymbolIndex.java | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java index 3478682bc..af2e36fa6 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java @@ -201,14 +201,13 @@ public class SpringSymbolIndex implements InitializingBean { } public CompletableFuture configureIndexer(SymbolIndexConfig config) { - return CompletableFuture.runAsync(() -> { - synchronized (SpringSymbolIndex.this) { - if (config.isScanXml() && !(Arrays.asList(this.indexers).contains(springIndexerXML))) { - this.indexers = new SpringIndexer[] {springIndexerJava, springIndexerXML}; + List> futuresList = new ArrayList<>(); + synchronized (this) { + if (config.isScanXml() && !(Arrays.asList(this.indexers).contains(springIndexerXML))) { + this.indexers = new SpringIndexer[] {springIndexerJava, springIndexerXML}; + futuresList.add(server.getAsync().execute(() -> { springIndexerXML.setScanFolderGlobs(config.getXmlScanFoldersGlobs()); - List globPattern = Arrays.asList(springIndexerXML.getFileWatchPatterns()); - watchXMLDeleteRegistration = getWorkspaceService().getFileObserver().onFileDeleted(globPattern, (file) -> { deleteDocument(new TextDocumentIdentifier(file).getUri()); }); @@ -218,25 +217,27 @@ public class SpringSymbolIndex implements InitializingBean { watchXMLChangedRegistration = getWorkspaceService().getFileObserver().onFileChanged(globPattern, (file) -> { updateDocument(new TextDocumentIdentifier(file).getUri(), null, "xml changed"); }); - - } - else if (!config.isScanXml() && Arrays.asList(this.indexers).contains(springIndexerXML)) { - this.indexers = new SpringIndexer[] {springIndexerJava}; + })); + } + else if (!config.isScanXml() && Arrays.asList(this.indexers).contains(springIndexerXML)) { + this.indexers = new SpringIndexer[] {springIndexerJava}; + futuresList.add(server.getAsync().execute(() -> { springIndexerXML.setScanFolderGlobs(new String[0]); - + getWorkspaceService().getFileObserver().unsubscribe(watchXMLChangedRegistration); getWorkspaceService().getFileObserver().unsubscribe(watchXMLCreatedRegistration); getWorkspaceService().getFileObserver().unsubscribe(watchXMLDeleteRegistration); - + watchXMLChangedRegistration = null; watchXMLCreatedRegistration = null; watchXMLDeleteRegistration = null; - } else if (config.isScanXml()) { - springIndexerXML.setScanFolderGlobs(config.getXmlScanFoldersGlobs()); - } - springIndexerJava.setScanTestJavaSources(config.isScanTestJavaSources()); + })); + } else if (config.isScanXml()) { + futuresList.add(CompletableFuture.runAsync(() -> springIndexerXML.setScanFolderGlobs(config.getXmlScanFoldersGlobs()))); } - }); + futuresList.add(server.getAsync().execute(() -> springIndexerJava.setScanTestJavaSources(config.isScanTestJavaSources()))); + } + return CompletableFuture.allOf(futuresList.toArray(new CompletableFuture[futuresList.size()])); } public void shutdown() { From 8c3d55e4ecc519cb312e18a240d705abfc7d3282 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Mon, 16 Sep 2019 11:49:07 -0400 Subject: [PATCH 10/17] Final fix for symbol indexer config --- .../vscode/boot/app/SpringSymbolIndex.java | 75 +++++++++---------- .../test/SpringIndexerMultiProjectTest.java | 2 +- .../java/utils/test/SpringIndexerTest.java | 6 +- .../test/SpringIndexerXMLProjectTest.java | 18 ++--- 4 files changed, 47 insertions(+), 54 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java index af2e36fa6..43a69bb93 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java @@ -175,13 +175,16 @@ public class SpringSymbolIndex implements InitializingBean { this.updateDocument(docURI, content, "didSave event"); } }); - config.addListener(evt -> { - this.configureIndexer(SymbolIndexConfig.builder() - .scanXml(config.isSpringXMLSupportEnabled()) - .xmlScanFoldersGlobs(config.xmlBeansFoldersToScan()) - .scanTestJavaSources(config.isScanJavaTestSourcesEnabled()) - .build()); - }); + config.addListener(evt -> + server.getAsync().execute(() -> + configureIndexer(SymbolIndexConfig.builder() + .scanXml(config.isSpringXMLSupportEnabled()) + .xmlScanFoldersGlobs(config.xmlBeansFoldersToScan()) + .scanTestJavaSources(config.isScanJavaTestSourcesEnabled()) + .build() + ) + ) + ); server.doOnInitialized(this::serverInitialized); server.onShutdown(this::shutdown); } @@ -200,44 +203,40 @@ public class SpringSymbolIndex implements InitializingBean { }); } - public CompletableFuture configureIndexer(SymbolIndexConfig config) { - List> futuresList = new ArrayList<>(); + public void configureIndexer(SymbolIndexConfig config) { synchronized (this) { if (config.isScanXml() && !(Arrays.asList(this.indexers).contains(springIndexerXML))) { - this.indexers = new SpringIndexer[] {springIndexerJava, springIndexerXML}; - futuresList.add(server.getAsync().execute(() -> { - springIndexerXML.setScanFolderGlobs(config.getXmlScanFoldersGlobs()); - List globPattern = Arrays.asList(springIndexerXML.getFileWatchPatterns()); - watchXMLDeleteRegistration = getWorkspaceService().getFileObserver().onFileDeleted(globPattern, (file) -> { - deleteDocument(new TextDocumentIdentifier(file).getUri()); - }); - watchXMLCreatedRegistration = getWorkspaceService().getFileObserver().onFileCreated(globPattern, (file) -> { - createDocument(new TextDocumentIdentifier(file).getUri()); - }); - watchXMLChangedRegistration = getWorkspaceService().getFileObserver().onFileChanged(globPattern, (file) -> { - updateDocument(new TextDocumentIdentifier(file).getUri(), null, "xml changed"); - }); - })); - } - else if (!config.isScanXml() && Arrays.asList(this.indexers).contains(springIndexerXML)) { - this.indexers = new SpringIndexer[] {springIndexerJava}; - futuresList.add(server.getAsync().execute(() -> { - springIndexerXML.setScanFolderGlobs(new String[0]); + this.indexers = new SpringIndexer[] { springIndexerJava, springIndexerXML }; + springIndexerXML.setScanFolderGlobs(config.getXmlScanFoldersGlobs()); + List globPattern = Arrays.asList(springIndexerXML.getFileWatchPatterns()); + watchXMLDeleteRegistration = getWorkspaceService().getFileObserver().onFileDeleted(globPattern, + (file) -> { + deleteDocument(new TextDocumentIdentifier(file).getUri()); + }); + watchXMLCreatedRegistration = getWorkspaceService().getFileObserver().onFileCreated(globPattern, + (file) -> { + createDocument(new TextDocumentIdentifier(file).getUri()); + }); + watchXMLChangedRegistration = getWorkspaceService().getFileObserver().onFileChanged(globPattern, + (file) -> { + updateDocument(new TextDocumentIdentifier(file).getUri(), null, "xml changed"); + }); + } else if (!config.isScanXml() && Arrays.asList(this.indexers).contains(springIndexerXML)) { + this.indexers = new SpringIndexer[] { springIndexerJava }; + springIndexerXML.setScanFolderGlobs(new String[0]); - getWorkspaceService().getFileObserver().unsubscribe(watchXMLChangedRegistration); - getWorkspaceService().getFileObserver().unsubscribe(watchXMLCreatedRegistration); - getWorkspaceService().getFileObserver().unsubscribe(watchXMLDeleteRegistration); + getWorkspaceService().getFileObserver().unsubscribe(watchXMLChangedRegistration); + getWorkspaceService().getFileObserver().unsubscribe(watchXMLCreatedRegistration); + getWorkspaceService().getFileObserver().unsubscribe(watchXMLDeleteRegistration); - watchXMLChangedRegistration = null; - watchXMLCreatedRegistration = null; - watchXMLDeleteRegistration = null; - })); + watchXMLChangedRegistration = null; + watchXMLCreatedRegistration = null; + watchXMLDeleteRegistration = null; } else if (config.isScanXml()) { - futuresList.add(CompletableFuture.runAsync(() -> springIndexerXML.setScanFolderGlobs(config.getXmlScanFoldersGlobs()))); + springIndexerXML.setScanFolderGlobs(config.getXmlScanFoldersGlobs()); } - futuresList.add(server.getAsync().execute(() -> springIndexerJava.setScanTestJavaSources(config.isScanTestJavaSources()))); + springIndexerJava.setScanTestJavaSources(config.isScanTestJavaSources()); } - return CompletableFuture.allOf(futuresList.toArray(new CompletableFuture[futuresList.size()])); } public void shutdown() { diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerMultiProjectTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerMultiProjectTest.java index 56044b0b3..0271f5bba 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerMultiProjectTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerMultiProjectTest.java @@ -53,7 +53,7 @@ public class SpringIndexerMultiProjectTest { @Before public void setup() throws Exception { harness.intialize(null); - indexer.configureIndexer(SymbolIndexConfig.builder().scanXml(false).build()).get(5, TimeUnit.SECONDS); + indexer.configureIndexer(SymbolIndexConfig.builder().scanXml(false).build()); projectUri1 = UriUtil.toUri(new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-large-multiproject-1/").toURI())).toString(); projectFinder.find(new TextDocumentIdentifier(projectUri1)).get(); diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java index 1e7442148..9ecf79d58 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java @@ -60,7 +60,7 @@ public class SpringIndexerTest { @Before public void setup() throws Exception { harness.intialize(null); - indexer.configureIndexer(SymbolIndexConfig.builder().scanXml(false).build()).get(5, TimeUnit.SECONDS);; + indexer.configureIndexer(SymbolIndexConfig.builder().scanXml(false).build()); directory = new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-parent/test-annotation-indexing/").toURI()); projectDir = directory.toURI().toString(); @@ -96,14 +96,14 @@ public class SpringIndexerTest { @Test public void testScanTestJavaSources() throws Exception { - indexer.configureIndexer(SymbolIndexConfig.builder().scanTestJavaSources(true).build()).get(1, TimeUnit.SECONDS); + indexer.configureIndexer(SymbolIndexConfig.builder().scanTestJavaSources(true).build()); List allSymbols = indexer.getAllSymbols(""); assertEquals(8, allSymbols.size()); String docUri = directory.toPath().resolve("src/test/java/demo/ApplicationTests.java").toUri().toString(); assertTrue(containsSymbol(allSymbols, "@SpringBootTest", docUri, 8, 0, 8, 15)); - indexer.configureIndexer(SymbolIndexConfig.builder().scanTestJavaSources(false).build()).get(1, TimeUnit.SECONDS); + indexer.configureIndexer(SymbolIndexConfig.builder().scanTestJavaSources(false).build()); allSymbols = indexer.getAllSymbols(""); assertEquals(7, allSymbols.size()); assertFalse(containsSymbol(allSymbols, "@SpringBootTest", docUri, 8, 0, 8, 15)); diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerXMLProjectTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerXMLProjectTest.java index d1d30fd88..c7f4f247d 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerXMLProjectTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerXMLProjectTest.java @@ -59,8 +59,7 @@ public class SpringIndexerXMLProjectTest { indexer.configureIndexer(SymbolIndexConfig.builder() .scanXml(true) .xmlScanFoldersGlobs(new String[] { "**/src/main/**", "**/config" }) - .build()) - .get(5, TimeUnit.SECONDS);; + .build()); project = projects.mavenProject("test-annotation-indexing-xml-project"); harness.useProject(project); @@ -124,40 +123,35 @@ public class SpringIndexerXMLProjectTest { indexer.configureIndexer(SymbolIndexConfig.builder() .scanXml(true) - .build()) - .get(2, TimeUnit.SECONDS);; + .build()); allSymbols = indexer.getAllSymbols(""); assertEquals(0, allSymbols.size()); indexer.configureIndexer(SymbolIndexConfig.builder() .scanXml(true) .xmlScanFoldersGlobs(new String[] { "**/src/main/**" }) - .build()) - .get(2, TimeUnit.SECONDS); + .build()); allSymbols = indexer.getAllSymbols(""); assertEquals(1, allSymbols.size()); indexer.configureIndexer(SymbolIndexConfig.builder() .scanXml(true) .xmlScanFoldersGlobs(new String[] { "**/config", "**/src/main/**" }) - .build()) - .get(2, TimeUnit.SECONDS); + .build()); allSymbols = indexer.getAllSymbols(""); assertEquals(5, allSymbols.size()); indexer.configureIndexer(SymbolIndexConfig.builder() .scanXml(true) .xmlScanFoldersGlobs(new String[] { "**/config" }) - .build()) - .get(2, TimeUnit.SECONDS); + .build()); allSymbols = indexer.getAllSymbols(""); assertEquals(4, allSymbols.size()); indexer.configureIndexer(SymbolIndexConfig.builder() .scanXml(false) .xmlScanFoldersGlobs(new String[] { "**/config", "**/src/main/**" }) - .build()) - .get(2, TimeUnit.SECONDS); + .build()); allSymbols = indexer.getAllSymbols(""); assertEquals(0, allSymbols.size()); } From fbc74585b341cae2ccaa28b39a9f094575dfc4c1 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Tue, 17 Sep 2019 08:56:05 +0200 Subject: [PATCH 11/17] update for final 3.9.10 release bits --- eclipse-distribution/pom.xml | 8 +++--- eclipse-language-servers/pom.xml | 47 ++++++++++++++------------------ 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml index d855198c2..131e0df60 100644 --- a/eclipse-distribution/pom.xml +++ b/eclipse-distribution/pom.xml @@ -71,12 +71,12 @@ nightly ${dist.type}/${dist.key}/${dist.project}/${dist.pathpostfix} - https://dist.springsource.com/snapshot/TOOLS/eclipse-integration-commons/nightly - https://dist.springframework.org/snapshot/IDE/nightly + - + https://dist.springsource.com/release/TOOLS/eclipse-integration-commons/3.9.10.RELEASE/ + https://dist.springframework.org/release/IDE/3.9.10.RELEASE https://dist.springsource.com/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version} diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml index 4a4cbc1a3..9f95cc2cf 100644 --- a/eclipse-language-servers/pom.xml +++ b/eclipse-language-servers/pom.xml @@ -185,16 +185,16 @@ p2 https://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository - e-i-commons p2 - https://dist.springframework.org/snapshot/IDE/nightly + https://dist.springframework.org/release/IDE/3.9.10.RELEASE + lsp4e p2 @@ -225,26 +225,21 @@ p2 https://download.eclipse.org/releases/2019-06/ - orbit p2 https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository - e-i-commons p2 - https://dist.springframework.org/snapshot/IDE/nightly + https://dist.springframework.org/release/IDE/3.9.10.RELEASE + lsp4e p2 @@ -275,26 +270,26 @@ p2 https://download.eclipse.org/releases/2019-09/ - + orbit p2 - https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository + https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository + + + e-i-commons + p2 + https://dist.springframework.org/release/IDE/3.9.10.RELEASE - e-i-commons p2 https://dist.springframework.org/snapshot/IDE/nightly - + --> lsp4e p2 From 2aa9c7f2a3e14c598877789e40dd19210707781a Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Tue, 17 Sep 2019 13:51:40 +0200 Subject: [PATCH 12/17] updated changelogs for vscode extensions for 4.4.0 release --- vscode-extensions/vscode-bosh/CHANGELOG.md | 4 ++++ vscode-extensions/vscode-concourse/CHANGELOG.md | 6 ++++++ vscode-extensions/vscode-manifest-yaml/CHANGELOG.md | 4 ++++ vscode-extensions/vscode-spring-boot/CHANGELOG.md | 5 +++++ 4 files changed, 19 insertions(+) diff --git a/vscode-extensions/vscode-bosh/CHANGELOG.md b/vscode-extensions/vscode-bosh/CHANGELOG.md index cf5dc1dbb..db7ca9f94 100644 --- a/vscode-extensions/vscode-bosh/CHANGELOG.md +++ b/vscode-extensions/vscode-bosh/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2019-09-19 (4.4.0 RELEASE) + +* _(VSCode)_ fixed: show error message when manually configured JDK is not there + ## 2019-08-13 (4.3.2 RELEASE) * _(VSCode)_ fixed: Spring boot tool vscode extension is causing system to run out of disk space ([#328](https://github.com/spring-projects/sts4/issues/328)) diff --git a/vscode-extensions/vscode-concourse/CHANGELOG.md b/vscode-extensions/vscode-concourse/CHANGELOG.md index 7b382bec0..f3473cf53 100644 --- a/vscode-extensions/vscode-concourse/CHANGELOG.md +++ b/vscode-extensions/vscode-concourse/CHANGELOG.md @@ -1,3 +1,9 @@ +## 2019-09-19 (4.4.0 RELEASE) + +* _(Concourse)_ fixed: in_parallel - support both array of steps; and explicit "steps" child ([#345](https://github.com/spring-projects/sts4/issues/345)) +* _(Concourse)_ fixed: support 'inputs' property for type 'PutStep' ([#341](https://github.com/spring-projects/sts4/issues/341)) +* _(VSCode)_ fixed: show error message when manually configured JDK is not there + ## 2019-08-13 (4.3.2 RELEASE) * _(Concourse)_ fixed: VS Code Extensions missing Cloud Foundry params options ([#330](https://github.com/spring-projects/sts4/issues/330)) diff --git a/vscode-extensions/vscode-manifest-yaml/CHANGELOG.md b/vscode-extensions/vscode-manifest-yaml/CHANGELOG.md index 860bb2a1d..98e270223 100644 --- a/vscode-extensions/vscode-manifest-yaml/CHANGELOG.md +++ b/vscode-extensions/vscode-manifest-yaml/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2019-09-19 (4.4.0 RELEASE) + +* _(VSCode)_ fixed: show error message when manually configured JDK is not there + ## 2019-08-13 (4.3.2 RELEASE) * _(CF Manifest)_ fixed: docker not supported in vscode manifest extension ([#302](https://github.com/spring-projects/sts4/issues/302)) diff --git a/vscode-extensions/vscode-spring-boot/CHANGELOG.md b/vscode-extensions/vscode-spring-boot/CHANGELOG.md index 9fcf3a795..9d2624eaf 100644 --- a/vscode-extensions/vscode-spring-boot/CHANGELOG.md +++ b/vscode-extensions/vscode-spring-boot/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2019-09-19 (4.4.0 RELEASE) + +* _(Spring Boot)_ fixed: Adding/removing bean in XML file doesn't update the symbol index +* _(VSCode)_ fixed: show error message when manually configured JDK is not there + ## 2019-08-13 (4.3.2 RELEASE) * _(Spring Boot)_ fixed: CTRL-click navigation does not handle properties on super class correctly ([#326](https://github.com/spring-projects/sts4/issues/326)) From 93918d150d58ba7ade5c425b2bd9ca46b97e94a3 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 19 Sep 2019 12:06:43 +0200 Subject: [PATCH 13/17] updated versions to 4.4.1 --- .../org.springframework.boot.ide.branding.feature/feature.xml | 2 +- .../org.springframework.boot.ide.branding.feature/pom.xml | 2 +- .../org.springframework.boot.ide.branding/META-INF/MANIFEST.MF | 2 +- .../org.springframework.boot.ide.branding/pom.xml | 2 +- .../org.springframework.boot.ide.product | 2 +- .../org.springframework.boot.ide.product.e410/pom.xml | 2 +- .../org.springframework.boot.ide.product | 2 +- .../org.springframework.boot.ide.product.e411/pom.xml | 2 +- .../org.springframework.boot.ide.product | 2 +- .../org.springframework.boot.ide.product.e412/pom.xml | 2 +- .../org.springframework.boot.ide.product | 2 +- .../org.springframework.boot.ide.product.e413/pom.xml | 2 +- .../org.springframework.boot.ide.product | 2 +- .../org.springframework.boot.ide.product.e49/pom.xml | 2 +- eclipse-distribution/pom.xml | 2 +- .../org.springframework.boot.ide.main.feature/feature.xml | 2 +- .../org.springframework.boot.ide.main.feature/pom.xml | 2 +- .../org.springframework.tooling.boot.ls.feature/feature.xml | 2 +- .../org.springframework.tooling.boot.ls.feature/pom.xml | 2 +- .../org.springframework.tooling.boot.ls/pom.xml | 2 +- .../org.springframework.tooling.bosh.ls.feature/feature.xml | 2 +- .../org.springframework.tooling.bosh.ls.feature/pom.xml | 2 +- .../org.springframework.tooling.bosh.ls/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.springframework.tooling.concourse.ls.feature/pom.xml | 2 +- .../org.springframework.tooling.concourse.ls/pom.xml | 2 +- .../org.springframework.tooling.ls.eclipse.commons.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.springframework.tooling.ls.eclipse.commons/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml | 2 +- .../pom.xml | 2 +- .../org.springframework.tooling.ls.repository/pom.xml | 2 +- eclipse-language-servers/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.springframework.tooling.jdt.ls.commons.test/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.springframework.tooling.jdt.ls.commons/pom.xml | 2 +- 45 files changed, 45 insertions(+), 45 deletions(-) diff --git a/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml b/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml index 3e6f11a00..7e833db64 100644 --- a/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml +++ b/eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml @@ -2,7 +2,7 @@ org.springframework.boot.ide org.springframework.boot.ide - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/META-INF/MANIFEST.MF b/eclipse-distribution/org.springframework.boot.ide.branding/META-INF/MANIFEST.MF index 745ae6845..9622ae03d 100644 --- a/eclipse-distribution/org.springframework.boot.ide.branding/META-INF/MANIFEST.MF +++ b/eclipse-distribution/org.springframework.boot.ide.branding/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.springframework.boot.ide.branding;singleton:=true -Bundle-Version: 4.4.0.qualifier +Bundle-Version: 4.4.1.qualifier Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.equinox.p2.ui, diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml b/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml index 195674048..142cc4b7b 100644 --- a/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml +++ b/eclipse-distribution/org.springframework.boot.ide.branding/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot.ide org.springframework.boot.ide - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product index ee779cf18..4f54d4fa8 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product +++ b/eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product @@ -1,6 +1,6 @@ - + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e410/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e410/pom.xml index 47681364d..597c71509 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e410/pom.xml +++ b/eclipse-distribution/org.springframework.boot.ide.product.e410/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot.ide org.springframework.boot.ide - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e411/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e411/org.springframework.boot.ide.product index 51eaaa06a..87d8992c8 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e411/org.springframework.boot.ide.product +++ b/eclipse-distribution/org.springframework.boot.ide.product.e411/org.springframework.boot.ide.product @@ -1,6 +1,6 @@ - + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e411/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e411/pom.xml index e280d98e3..30431ec14 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e411/pom.xml +++ b/eclipse-distribution/org.springframework.boot.ide.product.e411/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot.ide org.springframework.boot.ide - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e412/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e412/org.springframework.boot.ide.product index 502b79a69..8e6a5c0a7 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e412/org.springframework.boot.ide.product +++ b/eclipse-distribution/org.springframework.boot.ide.product.e412/org.springframework.boot.ide.product @@ -1,6 +1,6 @@ - + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e412/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e412/pom.xml index e280d98e3..30431ec14 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e412/pom.xml +++ b/eclipse-distribution/org.springframework.boot.ide.product.e412/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot.ide org.springframework.boot.ide - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e413/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e413/org.springframework.boot.ide.product index 12ed14fe9..8ad373148 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e413/org.springframework.boot.ide.product +++ b/eclipse-distribution/org.springframework.boot.ide.product.e413/org.springframework.boot.ide.product @@ -1,6 +1,6 @@ - + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e413/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e413/pom.xml index 889fe50dc..61ecba0fd 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e413/pom.xml +++ b/eclipse-distribution/org.springframework.boot.ide.product.e413/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot.ide org.springframework.boot.ide - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e49/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e49/org.springframework.boot.ide.product index 835dd7a51..06c2b6483 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e49/org.springframework.boot.ide.product +++ b/eclipse-distribution/org.springframework.boot.ide.product.e49/org.springframework.boot.ide.product @@ -1,6 +1,6 @@ - + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e49/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e49/pom.xml index 6bf2bbc77..f98f30a34 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e49/pom.xml +++ b/eclipse-distribution/org.springframework.boot.ide.product.e49/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot.ide org.springframework.boot.ide - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml index 131e0df60..36d38b0bd 100644 --- a/eclipse-distribution/pom.xml +++ b/eclipse-distribution/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot.ide org.springframework.boot.ide - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT pom diff --git a/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml index 3b2cf879c..9ce84a46c 100644 --- a/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml +++ b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/eclipse-extensions/org.springframework.boot.ide.main.feature/pom.xml b/eclipse-extensions/org.springframework.boot.ide.main.feature/pom.xml index af4e6d3c8..f2565b637 100644 --- a/eclipse-extensions/org.springframework.boot.ide.main.feature/pom.xml +++ b/eclipse-extensions/org.springframework.boot.ide.main.feature/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot.ide org.springframework.boot.ide - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../../eclipse-distribution/pom.xml diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml index aad34c9a7..5db55df0b 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/pom.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/pom.xml index 4725ee6b5..cb981c9f9 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls.feature/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml index c67d51c28..2dfda0985 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml index 3e5b35eaf..9ae927fce 100644 --- a/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml +++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/pom.xml b/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/pom.xml index 9c48635c7..adef4ecb8 100644 --- a/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml index c30b15e6a..3b0d3de32 100644 --- a/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.xml index 608156c76..726f2dabc 100644 --- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.xml +++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/pom.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/pom.xml index 59f35447e..26b8aed47 100644 --- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml index 87d7569ee..09c1a6bbf 100644 --- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml +++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/pom.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/pom.xml index 448fb5dd8..443f18f1a 100644 --- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF index 366dc8a1f..ae49ad993 100644 --- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Cloud Foundry Manifest Language Server Generic Editor Integration Bundle-Vendor: Pivotal, Inc. Bundle-SymbolicName: org.springframework.tooling.cloudfoundry.manifest.ls.integration;singleton:=true -Bundle-Version: 4.4.0.qualifier +Bundle-Version: 4.4.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0", org.eclipse.core.runtime;bundle-version="3.12.0", diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/pom.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/pom.xml index 942e44120..6b93bbbe3 100644 --- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml index 0c813a352..304129433 100644 --- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml index 554b58f43..d63698bbb 100644 --- a/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml +++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/pom.xml b/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/pom.xml index 40ef315c6..3cc0464da 100644 --- a/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml index 595ab309d..ea9be0f09 100644 --- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons.test/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons.test/pom.xml index c99214d0f..84aecd637 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons.test/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons.test/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF index 3bc469342..f7331c870 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Eclipse Language Server Commons Bundle-SymbolicName: org.springframework.tooling.ls.eclipse.commons;singleton:=true -Bundle-Version: 4.4.0.qualifier +Bundle-Version: 4.4.1.qualifier Bundle-Vendor: Pivotal, Inc. Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0", org.eclipse.ui, diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/pom.xml index df3fe7756..2d29fee3a 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF index 053ca1739..f004b7944 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Goto Symbol Popup Bundle-SymbolicName: org.springframework.tooling.ls.eclipse.gotosymbol;singleton:=true -Bundle-Version: 4.4.0.qualifier +Bundle-Version: 4.4.1.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.ui.workbench.texteditor, org.eclipse.lsp4e;bundle-version="0.12.0", diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml index cfb466e66..71015f434 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml index 20198aa6e..c91bc1bbe 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml index 12f5d01f9..b2cf15ff0 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT ../pom.xml diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml index 9f95cc2cf..5ad3b99f9 100644 --- a/eclipse-language-servers/pom.xml +++ b/eclipse-language-servers/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot.ide org.springframework.boot.ide.servers - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT pom diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/META-INF/MANIFEST.MF b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/META-INF/MANIFEST.MF index 80d298143..d1bdbc78b 100644 --- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/META-INF/MANIFEST.MF +++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Commons Bundle-SymbolicName: org.springframework.tooling.jdt.ls.commons.test -Bundle-Version: 4.4.0.qualifier +Bundle-Version: 4.4.1.qualifier Automatic-Module-Name: org.springframework.tooling.jdt.ls.commons.test Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.springframework.tooling.jdt.ls.commons, diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/pom.xml b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/pom.xml index 449090983..b26adabf4 100644 --- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/pom.xml +++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/pom.xml @@ -5,7 +5,7 @@ eclipse-test-plugin org.springframework.ide.vscode org.springframework.tooling.jdt.ls.commons.test - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT org.springframework.tooling.jdt.ls.commons.test diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/META-INF/MANIFEST.MF b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/META-INF/MANIFEST.MF index ca4e69b3c..3315fabe8 100644 --- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/META-INF/MANIFEST.MF +++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Client-side JDT extension for language servers Bundle-SymbolicName: org.springframework.tooling.jdt.ls.commons -Bundle-Version: 4.4.0.qualifier +Bundle-Version: 4.4.1.qualifier Bundle-Vendor: Pivotal, Inc. Automatic-Module-Name: org.springframework.tooling.jdt.ls.commons Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/pom.xml b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/pom.xml index 6d4cf410b..8d1847b6f 100644 --- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/pom.xml +++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/pom.xml @@ -5,7 +5,7 @@ eclipse-plugin org.springframework.ide.vscode org.springframework.tooling.jdt.ls.commons - 4.4.0-SNAPSHOT + 4.4.1-SNAPSHOT org.springframework.tooling.jdt.ls.commons From 6f451ee7fec69cdd99676303837068ed3cb1f676 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 19 Sep 2019 15:17:19 +0000 Subject: [PATCH 14/17] Bump version to 1.12.0 --- atom-extensions/atom-bosh/package.json | 2 +- atom-extensions/atom-cf-manifest-yaml/package.json | 2 +- atom-extensions/atom-concourse/package.json | 2 +- atom-extensions/atom-spring-boot/package.json | 2 +- headless-services/bosh-language-server/pom.xml | 2 +- headless-services/commons/commons-boot-app-cli/pom.xml | 2 +- headless-services/commons/commons-cf/pom.xml | 2 +- headless-services/commons/commons-gradle/pom.xml | 2 +- headless-services/commons/commons-java/pom.xml | 2 +- headless-services/commons/commons-language-server/pom.xml | 2 +- headless-services/commons/commons-lsp-extensions/pom.xml | 2 +- headless-services/commons/commons-maven/pom.xml | 2 +- headless-services/commons/commons-util/pom.xml | 2 +- headless-services/commons/commons-yaml/pom.xml | 2 +- headless-services/commons/java-properties/pom.xml | 2 +- headless-services/commons/language-server-starter/pom.xml | 2 +- headless-services/commons/language-server-test-harness/pom.xml | 2 +- headless-services/commons/pom.xml | 2 +- headless-services/concourse-language-server/pom.xml | 2 +- .../org.springframework.tooling.jdt.ls.commons/pom.xml | 2 +- headless-services/manifest-yaml-language-server/pom.xml | 2 +- headless-services/spring-boot-language-server/pom.xml | 2 +- theia-extensions/theia-bosh/bosh/README.md | 2 +- theia-extensions/theia-bosh/bosh/package.json | 2 +- theia-extensions/theia-bosh/browser-app/package.json | 2 +- theia-extensions/theia-bosh/electron-app/package.json | 2 +- theia-extensions/theia-bosh/lerna.json | 2 +- .../theia-cf-manifest-yaml/browser-app/package.json | 2 +- .../theia-cf-manifest-yaml/cf-manifest-yaml/README.md | 2 +- .../theia-cf-manifest-yaml/cf-manifest-yaml/package.json | 2 +- .../theia-cf-manifest-yaml/electron-app/package.json | 2 +- theia-extensions/theia-cf-manifest-yaml/lerna.json | 2 +- theia-extensions/theia-concourse/browser-app/package.json | 2 +- theia-extensions/theia-concourse/concourse/README.md | 2 +- theia-extensions/theia-concourse/concourse/package.json | 2 +- theia-extensions/theia-concourse/electron-app/package.json | 2 +- theia-extensions/theia-concourse/lerna.json | 2 +- theia-extensions/theia-spring-boot/browser-app/package.json | 2 +- theia-extensions/theia-spring-boot/electron-app/package.json | 2 +- theia-extensions/theia-spring-boot/lerna.json | 2 +- theia-extensions/theia-spring-boot/spring-boot/README.md | 2 +- theia-extensions/theia-spring-boot/spring-boot/package.json | 2 +- vscode-extensions/vscode-bosh/package.json | 2 +- vscode-extensions/vscode-concourse/package.json | 2 +- vscode-extensions/vscode-manifest-yaml/package.json | 2 +- vscode-extensions/vscode-spring-boot/package.json | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) diff --git a/atom-extensions/atom-bosh/package.json b/atom-extensions/atom-bosh/package.json index 3fb52c94f..24b60e8e1 100644 --- a/atom-extensions/atom-bosh/package.json +++ b/atom-extensions/atom-bosh/package.json @@ -1,6 +1,6 @@ { "name": "bosh-yaml", - "version": "1.11.0", + "version": "1.12.0", "description": "Provides validation and content assist for various Bosh configuration files", "repository": "https://github.com/spring-projects/atom-bosh", "icon": "icon.png", diff --git a/atom-extensions/atom-cf-manifest-yaml/package.json b/atom-extensions/atom-cf-manifest-yaml/package.json index f3e9a29d0..4a1f3cbb8 100644 --- a/atom-extensions/atom-cf-manifest-yaml/package.json +++ b/atom-extensions/atom-cf-manifest-yaml/package.json @@ -1,6 +1,6 @@ { "name": "cf-manifest-yaml", - "version": "1.11.0", + "version": "1.12.0", "description": "Cloud Foundry Deployment Manifest YAML support for Atom", "repository": "https://github.com/spring-projects/atom-cf-manifest-yaml", "icon": "icon.png", diff --git a/atom-extensions/atom-concourse/package.json b/atom-extensions/atom-concourse/package.json index d2cd2c93d..dc2ca39f0 100644 --- a/atom-extensions/atom-concourse/package.json +++ b/atom-extensions/atom-concourse/package.json @@ -1,6 +1,6 @@ { "name": "concourse-pipeline-yaml", - "version": "1.11.0", + "version": "1.12.0", "description": "Provides validation and content assist for Concourse CI pipeline and task configuration yml files", "repository": "https://github.com/spring-projects/atom-concourse", "icon": "icon.png", diff --git a/atom-extensions/atom-spring-boot/package.json b/atom-extensions/atom-spring-boot/package.json index 45f5b01f8..7ed0f8ed8 100644 --- a/atom-extensions/atom-spring-boot/package.json +++ b/atom-extensions/atom-spring-boot/package.json @@ -1,6 +1,6 @@ { "name": "spring-boot", - "version": "1.11.0", + "version": "1.12.0", "description": "Spring Boot support for Atom", "repository": "https://github.com/spring-projects/atom-spring-boot", "icon": "icon.png", diff --git a/headless-services/bosh-language-server/pom.xml b/headless-services/bosh-language-server/pom.xml index ffc71d467..ad8cbd83b 100644 --- a/headless-services/bosh-language-server/pom.xml +++ b/headless-services/bosh-language-server/pom.xml @@ -9,7 +9,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../commons/pom.xml diff --git a/headless-services/commons/commons-boot-app-cli/pom.xml b/headless-services/commons/commons-boot-app-cli/pom.xml index 42ba0bcc5..084da2c7b 100644 --- a/headless-services/commons/commons-boot-app-cli/pom.xml +++ b/headless-services/commons/commons-boot-app-cli/pom.xml @@ -9,7 +9,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../pom.xml diff --git a/headless-services/commons/commons-cf/pom.xml b/headless-services/commons/commons-cf/pom.xml index 2f1d2a770..d3ef26518 100644 --- a/headless-services/commons/commons-cf/pom.xml +++ b/headless-services/commons/commons-cf/pom.xml @@ -8,7 +8,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../pom.xml diff --git a/headless-services/commons/commons-gradle/pom.xml b/headless-services/commons/commons-gradle/pom.xml index ba50023ee..5dfefb778 100644 --- a/headless-services/commons/commons-gradle/pom.xml +++ b/headless-services/commons/commons-gradle/pom.xml @@ -9,7 +9,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../pom.xml diff --git a/headless-services/commons/commons-java/pom.xml b/headless-services/commons/commons-java/pom.xml index b81aef603..81d8a77a0 100644 --- a/headless-services/commons/commons-java/pom.xml +++ b/headless-services/commons/commons-java/pom.xml @@ -8,7 +8,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../pom.xml diff --git a/headless-services/commons/commons-language-server/pom.xml b/headless-services/commons/commons-language-server/pom.xml index 0bbecfb87..b810b3a18 100644 --- a/headless-services/commons/commons-language-server/pom.xml +++ b/headless-services/commons/commons-language-server/pom.xml @@ -8,7 +8,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../pom.xml diff --git a/headless-services/commons/commons-lsp-extensions/pom.xml b/headless-services/commons/commons-lsp-extensions/pom.xml index afe7b6a52..bb63df3af 100644 --- a/headless-services/commons/commons-lsp-extensions/pom.xml +++ b/headless-services/commons/commons-lsp-extensions/pom.xml @@ -7,7 +7,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../pom.xml diff --git a/headless-services/commons/commons-maven/pom.xml b/headless-services/commons/commons-maven/pom.xml index 890c3127c..d5abea05c 100644 --- a/headless-services/commons/commons-maven/pom.xml +++ b/headless-services/commons/commons-maven/pom.xml @@ -10,7 +10,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../pom.xml diff --git a/headless-services/commons/commons-util/pom.xml b/headless-services/commons/commons-util/pom.xml index 76f704dd5..c2cd31d50 100644 --- a/headless-services/commons/commons-util/pom.xml +++ b/headless-services/commons/commons-util/pom.xml @@ -8,7 +8,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../pom.xml diff --git a/headless-services/commons/commons-yaml/pom.xml b/headless-services/commons/commons-yaml/pom.xml index 22aa073f9..93b3740f5 100644 --- a/headless-services/commons/commons-yaml/pom.xml +++ b/headless-services/commons/commons-yaml/pom.xml @@ -9,7 +9,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../pom.xml diff --git a/headless-services/commons/java-properties/pom.xml b/headless-services/commons/java-properties/pom.xml index b9b70f781..6f8614c4d 100644 --- a/headless-services/commons/java-properties/pom.xml +++ b/headless-services/commons/java-properties/pom.xml @@ -7,7 +7,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../pom.xml diff --git a/headless-services/commons/language-server-starter/pom.xml b/headless-services/commons/language-server-starter/pom.xml index 0f3df2e6a..a1db6d353 100644 --- a/headless-services/commons/language-server-starter/pom.xml +++ b/headless-services/commons/language-server-starter/pom.xml @@ -9,7 +9,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../pom.xml diff --git a/headless-services/commons/language-server-test-harness/pom.xml b/headless-services/commons/language-server-test-harness/pom.xml index 12b5eb90d..60acb1d85 100644 --- a/headless-services/commons/language-server-test-harness/pom.xml +++ b/headless-services/commons/language-server-test-harness/pom.xml @@ -8,7 +8,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../pom.xml diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml index 0ee50f03a..adaad10e3 100644 --- a/headless-services/commons/pom.xml +++ b/headless-services/commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.ide.vscode commons-parent pom - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT commons-parent diff --git a/headless-services/concourse-language-server/pom.xml b/headless-services/concourse-language-server/pom.xml index 5c13662cc..01c3d7246 100644 --- a/headless-services/concourse-language-server/pom.xml +++ b/headless-services/concourse-language-server/pom.xml @@ -9,7 +9,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../commons/pom.xml diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/pom.xml b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/pom.xml index 8d1847b6f..edfc9236f 100644 --- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/pom.xml +++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/pom.xml @@ -19,7 +19,7 @@ org.springframework.ide.vscode commons-lsp-extensions - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT diff --git a/headless-services/manifest-yaml-language-server/pom.xml b/headless-services/manifest-yaml-language-server/pom.xml index b71b451b4..e1d7cc735 100644 --- a/headless-services/manifest-yaml-language-server/pom.xml +++ b/headless-services/manifest-yaml-language-server/pom.xml @@ -9,7 +9,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../commons/pom.xml diff --git a/headless-services/spring-boot-language-server/pom.xml b/headless-services/spring-boot-language-server/pom.xml index e219670e1..bfd74399b 100644 --- a/headless-services/spring-boot-language-server/pom.xml +++ b/headless-services/spring-boot-language-server/pom.xml @@ -9,7 +9,7 @@ org.springframework.ide.vscode commons-parent - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT ../commons/pom.xml diff --git a/theia-extensions/theia-bosh/bosh/README.md b/theia-extensions/theia-bosh/bosh/README.md index c37ef8700..9aab11327 100644 --- a/theia-extensions/theia-bosh/bosh/README.md +++ b/theia-extensions/theia-bosh/bosh/README.md @@ -154,4 +154,4 @@ Please report bugs, issues and feature requests on the [Github STS4 issue tracke [goto_symbol]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-bosh/bosh/readme-imgs/doc-symbol.png -**Version: 1.11.0** +**Version: 1.12.0** diff --git a/theia-extensions/theia-bosh/bosh/package.json b/theia-extensions/theia-bosh/bosh/package.json index 3ed180109..9cdc14353 100644 --- a/theia-extensions/theia-bosh/bosh/package.json +++ b/theia-extensions/theia-bosh/bosh/package.json @@ -6,7 +6,7 @@ "keywords": [ "theia-extension" ], - "version": "1.11.0", + "version": "1.12.0", "files": [ "lib", "src", diff --git a/theia-extensions/theia-bosh/browser-app/package.json b/theia-extensions/theia-bosh/browser-app/package.json index 86e0a14a2..bd4b56519 100644 --- a/theia-extensions/theia-bosh/browser-app/package.json +++ b/theia-extensions/theia-bosh/browser-app/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "browser-app", - "version": "1.11.0", + "version": "1.12.0", "dependencies": { "@pivotal-tools/theia-bosh": "file:../bosh", "@theia/core": "latest", diff --git a/theia-extensions/theia-bosh/electron-app/package.json b/theia-extensions/theia-bosh/electron-app/package.json index 12ed7d3df..2fdf82fa2 100644 --- a/theia-extensions/theia-bosh/electron-app/package.json +++ b/theia-extensions/theia-bosh/electron-app/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "electron-app", - "version": "1.11.0", + "version": "1.12.0", "dependencies": { "@pivotal-tools/theia-bosh": "file:../bosh", "@theia/core": "latest", diff --git a/theia-extensions/theia-bosh/lerna.json b/theia-extensions/theia-bosh/lerna.json index e637fd78b..5122be242 100644 --- a/theia-extensions/theia-bosh/lerna.json +++ b/theia-extensions/theia-bosh/lerna.json @@ -1,6 +1,6 @@ { "lerna": "3.13.1", - "version": "1.11.0", + "version": "1.12.0", "useWorkspaces": true, "npmClient": "yarn", "command": { diff --git a/theia-extensions/theia-cf-manifest-yaml/browser-app/package.json b/theia-extensions/theia-cf-manifest-yaml/browser-app/package.json index 9e1de6ff4..3cc71725f 100644 --- a/theia-extensions/theia-cf-manifest-yaml/browser-app/package.json +++ b/theia-extensions/theia-cf-manifest-yaml/browser-app/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "browser-app", - "version": "1.11.0", + "version": "1.12.0", "dependencies": { "@pivotal-tools/theia-cf-manifest-yaml": "file:../cf-manifest-yaml", "@theia/core": "latest", diff --git a/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/README.md b/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/README.md index 9169f357f..ffedc4bf8 100644 --- a/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/README.md +++ b/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/README.md @@ -47,4 +47,4 @@ read its detailed documentation. [dcfca]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/readme-imgs/dynamic-ca.png [hovers]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/readme-imgs/hovers.png -**Version: 1.11.0** +**Version: 1.12.0** diff --git a/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/package.json b/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/package.json index 29cf4e2d1..e3fde4317 100644 --- a/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/package.json +++ b/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/package.json @@ -6,7 +6,7 @@ "keywords": [ "theia-extension" ], - "version": "1.11.0", + "version": "1.12.0", "files": [ "lib", "src", diff --git a/theia-extensions/theia-cf-manifest-yaml/electron-app/package.json b/theia-extensions/theia-cf-manifest-yaml/electron-app/package.json index 3953ec49d..efd6ce846 100644 --- a/theia-extensions/theia-cf-manifest-yaml/electron-app/package.json +++ b/theia-extensions/theia-cf-manifest-yaml/electron-app/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "electron-app", - "version": "1.11.0", + "version": "1.12.0", "dependencies": { "@pivotal-tools/theia-cf-manifest-yaml": "file:../cf-manifest-yaml", "@theia/core": "latest", diff --git a/theia-extensions/theia-cf-manifest-yaml/lerna.json b/theia-extensions/theia-cf-manifest-yaml/lerna.json index e637fd78b..5122be242 100644 --- a/theia-extensions/theia-cf-manifest-yaml/lerna.json +++ b/theia-extensions/theia-cf-manifest-yaml/lerna.json @@ -1,6 +1,6 @@ { "lerna": "3.13.1", - "version": "1.11.0", + "version": "1.12.0", "useWorkspaces": true, "npmClient": "yarn", "command": { diff --git a/theia-extensions/theia-concourse/browser-app/package.json b/theia-extensions/theia-concourse/browser-app/package.json index 0b2495c6c..4be13c1a1 100644 --- a/theia-extensions/theia-concourse/browser-app/package.json +++ b/theia-extensions/theia-concourse/browser-app/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "browser-app", - "version": "1.11.0", + "version": "1.12.0", "dependencies": { "@pivotal-tools/theia-concourse": "file:../concourse", "@theia/core": "latest", diff --git a/theia-extensions/theia-concourse/concourse/README.md b/theia-extensions/theia-concourse/concourse/README.md index f7a565fc8..20c2bea62 100644 --- a/theia-extensions/theia-concourse/concourse/README.md +++ b/theia-extensions/theia-concourse/concourse/README.md @@ -87,4 +87,4 @@ Please report bugs, issues and feature requests on the [Github STS4 issue tracke [goto_symbol]: https://raw.githubusercontent.com/spring-projects/sts4/54cf0994b69ef1770ca597a8da325022b19cee69/theia-extensions/theia-concourse/concourse/readme-imgs/doc-symbols.png -**Version: 1.11.0** +**Version: 1.12.0** diff --git a/theia-extensions/theia-concourse/concourse/package.json b/theia-extensions/theia-concourse/concourse/package.json index 50804043e..fae1fca5b 100644 --- a/theia-extensions/theia-concourse/concourse/package.json +++ b/theia-extensions/theia-concourse/concourse/package.json @@ -6,7 +6,7 @@ "keywords": [ "theia-extension" ], - "version": "1.11.0", + "version": "1.12.0", "files": [ "lib", "src", diff --git a/theia-extensions/theia-concourse/electron-app/package.json b/theia-extensions/theia-concourse/electron-app/package.json index 50ee9dd03..c07a79d34 100644 --- a/theia-extensions/theia-concourse/electron-app/package.json +++ b/theia-extensions/theia-concourse/electron-app/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "electron-app", - "version": "1.11.0", + "version": "1.12.0", "dependencies": { "@pivotal-tools/theia-concourse": "file:../concourse", "@theia/core": "latest", diff --git a/theia-extensions/theia-concourse/lerna.json b/theia-extensions/theia-concourse/lerna.json index e637fd78b..5122be242 100644 --- a/theia-extensions/theia-concourse/lerna.json +++ b/theia-extensions/theia-concourse/lerna.json @@ -1,6 +1,6 @@ { "lerna": "3.13.1", - "version": "1.11.0", + "version": "1.12.0", "useWorkspaces": true, "npmClient": "yarn", "command": { diff --git a/theia-extensions/theia-spring-boot/browser-app/package.json b/theia-extensions/theia-spring-boot/browser-app/package.json index d68bbf03b..d74fb7c6b 100644 --- a/theia-extensions/theia-spring-boot/browser-app/package.json +++ b/theia-extensions/theia-spring-boot/browser-app/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "browser-app", - "version": "1.11.0", + "version": "1.12.0", "dependencies": { "@pivotal-tools/theia-spring-boot": "file:../spring-boot", "@theia/core": "latest", diff --git a/theia-extensions/theia-spring-boot/electron-app/package.json b/theia-extensions/theia-spring-boot/electron-app/package.json index c38be35b4..dfcb804c3 100644 --- a/theia-extensions/theia-spring-boot/electron-app/package.json +++ b/theia-extensions/theia-spring-boot/electron-app/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "electron-app", - "version": "1.11.0", + "version": "1.12.0", "dependencies": { "@pivotal-tools/theia-spring-boot": "file:../spring-boot", "@theia/core": "latest", diff --git a/theia-extensions/theia-spring-boot/lerna.json b/theia-extensions/theia-spring-boot/lerna.json index e637fd78b..5122be242 100644 --- a/theia-extensions/theia-spring-boot/lerna.json +++ b/theia-extensions/theia-spring-boot/lerna.json @@ -1,6 +1,6 @@ { "lerna": "3.13.1", - "version": "1.11.0", + "version": "1.12.0", "useWorkspaces": true, "npmClient": "yarn", "command": { diff --git a/theia-extensions/theia-spring-boot/spring-boot/README.md b/theia-extensions/theia-spring-boot/spring-boot/README.md index dc2b47940..ef5558823 100644 --- a/theia-extensions/theia-spring-boot/spring-boot/README.md +++ b/theia-extensions/theia-spring-boot/spring-boot/README.md @@ -119,4 +119,4 @@ Released versions of this extension can be installed directly from npm registry. [java-navigation]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-spring-boot/spring-boot/readme-imgs/workspace-symbol.png -**Version: 1.11.0** +**Version: 1.12.0** diff --git a/theia-extensions/theia-spring-boot/spring-boot/package.json b/theia-extensions/theia-spring-boot/spring-boot/package.json index 02c56e5a2..26b8f50d3 100644 --- a/theia-extensions/theia-spring-boot/spring-boot/package.json +++ b/theia-extensions/theia-spring-boot/spring-boot/package.json @@ -6,7 +6,7 @@ "keywords": [ "theia-extension" ], - "version": "1.11.0", + "version": "1.12.0", "files": [ "lib", "src", diff --git a/vscode-extensions/vscode-bosh/package.json b/vscode-extensions/vscode-bosh/package.json index e1ec6e902..3110f864c 100644 --- a/vscode-extensions/vscode-bosh/package.json +++ b/vscode-extensions/vscode-bosh/package.json @@ -3,7 +3,7 @@ "displayName": "Bosh Editor", "description": "Provides validation and content assist for various Bosh configuration files", "icon": "icon.png", - "version": "1.11.0", + "version": "1.12.0", "publisher": "Pivotal", "repository": { "type": "git", diff --git a/vscode-extensions/vscode-concourse/package.json b/vscode-extensions/vscode-concourse/package.json index cd7f3c6fa..7f05f0394 100644 --- a/vscode-extensions/vscode-concourse/package.json +++ b/vscode-extensions/vscode-concourse/package.json @@ -3,7 +3,7 @@ "displayName": "Concourse CI Pipeline Editor", "description": "Provides validation and content assist for Concourse CI pipeline and task configuration yml files", "icon": "icon.png", - "version": "1.11.0", + "version": "1.12.0", "publisher": "Pivotal", "repository": { "type": "git", diff --git a/vscode-extensions/vscode-manifest-yaml/package.json b/vscode-extensions/vscode-manifest-yaml/package.json index c73cacf53..3c7b0cbf5 100644 --- a/vscode-extensions/vscode-manifest-yaml/package.json +++ b/vscode-extensions/vscode-manifest-yaml/package.json @@ -3,7 +3,7 @@ "displayName": "Cloudfoundry Manifest YML Support", "description": "Adds linting, content assist and hoverinfo's for Cloudfoundry Deployment Manifests (a.k.a. `manifest.yml`) files.", "icon": "icon.png", - "version": "1.11.0", + "version": "1.12.0", "publisher": "Pivotal", "repository": { "type": "git", diff --git a/vscode-extensions/vscode-spring-boot/package.json b/vscode-extensions/vscode-spring-boot/package.json index 01da547d9..26d5949ac 100644 --- a/vscode-extensions/vscode-spring-boot/package.json +++ b/vscode-extensions/vscode-spring-boot/package.json @@ -3,7 +3,7 @@ "displayName": "Spring Boot Tools", "description": "Provides validation and content assist for Spring Boot `application.properties`, `application.yml` properties files. As well as Boot-specific support for `.java` files.", "icon": "spring-boot-logo.png", - "version": "1.11.0", + "version": "1.12.0", "publisher": "Pivotal", "repository": { "type": "git", From 27d689f0c3dbc32ebd16d63ba89cc042cf5e3a45 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Thu, 19 Sep 2019 11:38:36 -0400 Subject: [PATCH 15/17] Bump LS Eclipse bits to 1.12.0 --- .../org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF | 2 +- .../org.springframework.tooling.boot.ls/pom.xml | 2 +- .../org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF | 2 +- .../org.springframework.tooling.bosh.ls/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.springframework.tooling.concourse.ls/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF index 6c3d227dc..235a24dd2 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Spring Boot Language Server Bundle-Vendor: Pivotal, Inc. Bundle-SymbolicName: org.springframework.tooling.boot.ls;singleton:=true -Bundle-Version: 1.11.0.qualifier +Bundle-Version: 1.12.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0", org.eclipse.core.runtime;bundle-version="3.12.0", diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml index 2dfda0985..fa070778f 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml @@ -12,7 +12,7 @@ org.springframework.tooling.boot.ls - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT eclipse-plugin diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF index 5fc9661c8..ec6212761 100644 --- a/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: BOSH Manifest Language Server Bundle-Vendor: Pivotal, Inc. Bundle-SymbolicName: org.springframework.tooling.bosh.ls;singleton:=true -Bundle-Version: 1.11.0.qualifier +Bundle-Version: 1.12.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0", org.eclipse.core.runtime;bundle-version="3.12.0", diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml index 3b0d3de32..2d8fbf607 100644 --- a/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml @@ -12,7 +12,7 @@ org.springframework.tooling.bosh.ls - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT eclipse-plugin diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF index 440104e1c..12cd9f9fd 100644 --- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Cloud Foundry Manifest Language Server Bundle-Vendor: Pivotal, Inc. Bundle-SymbolicName: org.springframework.tooling.cloudfoundry.manifest.ls;singleton:=true -Bundle-Version: 1.11.0.qualifier +Bundle-Version: 1.12.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0", org.eclipse.core.runtime;bundle-version="3.12.0", diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml index 304129433..01a6835ec 100644 --- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml @@ -12,7 +12,7 @@ org.springframework.tooling.cloudfoundry.manifest.ls - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT eclipse-plugin diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF index 7281034b7..9f3e91819 100644 --- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Concourse Pipeline Language Server Bundle-Vendor: Pivotal, Inc. Bundle-SymbolicName: org.springframework.tooling.concourse.ls;singleton:=true -Bundle-Version: 1.11.0.qualifier +Bundle-Version: 1.12.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0", org.eclipse.core.runtime;bundle-version="3.12.0", diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml index ea9be0f09..cd0c017ad 100644 --- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml @@ -12,7 +12,7 @@ org.springframework.tooling.concourse.ls - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT eclipse-plugin From d5a68805ff0a385be759bafe3500a4773b6c2d72 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Fri, 20 Sep 2019 08:50:58 +0200 Subject: [PATCH 16/17] adopt renamed tm4e feature id --- .../category.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml index 5c9e28aa8..84a48d0c6 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml +++ b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml @@ -52,7 +52,7 @@ - + From 79e7f66b2e7ae046783054fc7b401116c02cf845 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Fri, 20 Sep 2019 12:21:12 +0200 Subject: [PATCH 17/17] adopt renamed tm4e feature id --- .../org.springframework.boot.ide.product.e412/category.xml | 2 +- .../org.springframework.boot.ide.product.e413/category.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e412/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e412/category.xml index 2088fa91a..a7abeb653 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e412/category.xml +++ b/eclipse-distribution/org.springframework.boot.ide.product.e412/category.xml @@ -144,7 +144,7 @@ - + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e413/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e413/category.xml index baa96235b..492d9b336 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e413/category.xml +++ b/eclipse-distribution/org.springframework.boot.ide.product.e413/category.xml @@ -138,7 +138,7 @@ - +