Merge branch 'master' into wip-toggle-comment

This commit is contained in:
Kris De Volder
2018-11-06 14:35:51 -08:00
84 changed files with 211 additions and 1190 deletions

View File

@@ -2,7 +2,7 @@
<feature
id="org.springframework.tooling.boot.ls.feature"
label="Spring Boot Language Server Feature"
version="4.0.1.qualifier"
version="4.0.2.qualifier"
provider-name="Pivotal, Inc.">
<description>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -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.1.0.qualifier
Bundle-Version: 1.1.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",

View File

@@ -7,19 +7,19 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.springframework.tooling.boot.ls</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<dependencies>
<dependency>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>spring-boot-language-server</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.1-SNAPSHOT</version>
</dependency>
</dependencies>

View File

@@ -16,7 +16,7 @@ package org.springframework.tooling.boot.ls;
public class Constants {
public static final String PLUGIN_ID = "org.springframework.tooling.boot.ls";
public static final String LANGUAGE_SERVER_VERSION = "1.1.0-SNAPSHOT.jar";
public static final String LANGUAGE_SERVER_VERSION = "1.1.1-SNAPSHOT.jar";
public static final String PREF_BOOT_HINTS = "boot-java.boot-hints.on";
public static final String PREF_CHANGE_DETECTION = "boot-java.change-detection.on";

View File

@@ -2,7 +2,7 @@
<feature
id="org.springframework.tooling.bosh.ls.feature"
label="BOSH Language Server Feature"
version="4.0.1.qualifier"
version="4.0.2.qualifier"
provider-name="Pivotal, Inc.">
<description>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -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.1.0.qualifier
Bundle-Version: 1.1.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",

View File

@@ -7,19 +7,19 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.springframework.tooling.bosh.ls</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<dependencies>
<dependency>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>bosh-language-server</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.springframework.ide.eclipse</groupId>

View File

@@ -16,6 +16,6 @@ package org.springframework.tooling.bosh.ls;
public class Constants {
public static final String PLUGIN_ID = "org.springframework.tooling.bosh.ls";
public static final String LANGUAGE_SERVER_VERSION = "1.1.0-SNAPSHOT";
public static final String LANGUAGE_SERVER_VERSION = "1.1.1-SNAPSHOT";
}

View File

@@ -2,7 +2,7 @@
<feature
id="org.springframework.tooling.cloudfoundry.manifest.ls.feature"
label="%featureName"
version="4.0.1.qualifier"
version="4.0.2.qualifier"
provider-name="%providerName">
<description>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -2,7 +2,7 @@
<feature
id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature"
label="Cloud Foundry Manifest Language Server Generic Editor Integration Feature"
version="4.0.1.qualifier"
version="4.0.2.qualifier"
provider-name="Pivotal, Inc.">
<description>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -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.0.1.qualifier
Bundle-Version: 4.0.2.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",

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -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.1.0.qualifier
Bundle-Version: 1.1.1.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",

View File

@@ -7,19 +7,19 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.springframework.tooling.cloudfoundry.manifest.ls</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<dependencies>
<dependency>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>manifest-yaml-language-server</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.1-SNAPSHOT</version>
</dependency>
</dependencies>

View File

@@ -16,6 +16,6 @@ package org.springframework.tooling.cloudfoundry.manifest.ls;
public class Constants {
public static final String PLUGIN_ID = "org.springframework.tooling.cloudfoundry.manifest.ls";
public static final String LANGUAGE_SERVER_VERSION = "1.1.0-SNAPSHOT.jar";
public static final String LANGUAGE_SERVER_VERSION = "1.1.1-SNAPSHOT.jar";
}

View File

@@ -2,7 +2,7 @@
<feature
id="org.springframework.tooling.concourse.ls.feature"
label="Concourse Pipeline Language Server Feature"
version="4.0.1.qualifier"
version="4.0.2.qualifier"
provider-name="Pivotal, Inc.">
<description>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -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.1.0.qualifier
Bundle-Version: 1.1.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",

View File

@@ -7,19 +7,19 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.springframework.tooling.concourse.ls</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<dependencies>
<dependency>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>concourse-language-server</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.springframework.ide.eclipse</groupId>

View File

@@ -16,6 +16,6 @@ package org.springframework.tooling.concourse.ls;
public class Constants {
public static final String PLUGIN_ID = "org.springframework.tooling.concourse.ls";
public static final String LANGUAGE_SERVER_VERSION = "1.1.0-SNAPSHOT";
public static final String LANGUAGE_SERVER_VERSION = "1.1.1-SNAPSHOT";
}

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -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.0.1.qualifier
Bundle-Version: 4.0.2.qualifier
Bundle-Vendor: Pivotal, Inc.
Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0",
org.eclipse.ui,

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -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.0.1.qualifier
Bundle-Version: 4.0.2.qualifier
Require-Bundle: org.eclipse.ui,
org.eclipse.ui.workbench.texteditor,
org.eclipse.lsp4e;bundle-version="0.5.0",

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -5,7 +5,7 @@
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.0.1-SNAPSHOT</version>
<version>4.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<organization>
@@ -102,116 +102,6 @@
</properties>
</profile>
<profile>
<id>e47</id>
<properties>
<dist.target>e4.7.3</dist.target>
<dist.target.major>e4.7</dist.target.major>
<dist.platform.name>Oxygen</dist.platform.name>
<dist.platform.name.long>Oxygen.3 (4.7.3)</dist.platform.name.long>
<dist.platform.id>oxygen</dist.platform.id>
<dist.platform.version>4.7</dist.platform.version>
<package.qualifierPrefix>e47</package.qualifierPrefix>
</properties>
<repositories>
<repository>
<id>oxygen</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/oxygen/</url>
</repository>
<!-- <repository>
<id>staging</id>
<layout>p2</layout>
<url>http://download.eclipse.org/staging/oxygen/</url>
</repository> -->
<repository>
<id>orbit</id>
<layout>p2</layout>
<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/</url>
</repository>
<repository>
<id>lsp4j-snapshots</id>
<layout>p2</layout>
<url>http://services.typefox.io/open-source/jenkins/job/lsp4j/job/master/lastStableBuild/artifact/build/p2-repository/</url>
</repository>
<repository>
<id>e-i-commons</id>
<layout>p2</layout>
<url>http://dist.springframework.org/snapshot/IDE/nightly</url>
</repository>
<repository>
<id>lsp4e-050-stream</id>
<layout>p2</layout>
<url>http://download.eclipse.org/lsp4e/0.5.x-snapshots/</url>
</repository>
<repository>
<id>tm4e</id>
<layout>p2</layout>
<url>http://download.eclipse.org/tm4e/snapshots/</url>
</repository>
</repositories>
</profile>
<profile>
<id>e48</id>
<properties>
<dist.target>e4.8.0</dist.target>
<dist.target.major>e4.8</dist.target.major>
<dist.platform.name>Photon</dist.platform.name>
<dist.platform.name.long>Photon (4.8)</dist.platform.name.long>
<dist.platform.id>photon</dist.platform.id>
<dist.platform.version>4.8</dist.platform.version>
<package.qualifierPrefix>e48</package.qualifierPrefix>
</properties>
<repositories>
<repository>
<id>photon</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/photon/</url>
</repository>
<repository>
<id>staging</id>
<layout>p2</layout>
<url>http://download.eclipse.org/staging/photon/</url>
</repository>
<!-- <repository>
<id>platform-i-builds</id>
<layout>p2</layout>
<url>http://download.eclipse.org/eclipse/updates/4.8-I-builds/</url>
</repository> -->
<repository>
<id>orbit</id>
<layout>p2</layout>
<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository</url>
</repository>
<!-- <repository>
<id>orbit-i-builds</id>
<layout>p2</layout>
<url>http://download.eclipse.org/tools/orbit/downloads/latest-I/</url>
</repository> -->
<!-- <repository>
<id>lsp4j-snapshots</id>
<layout>p2</layout>
<url>http://services.typefox.io/open-source/jenkins/job/lsp4j/job/master/lastStableBuild/artifact/build/p2-repository/</url>
</repository> -->
<repository>
<id>e-i-commons</id>
<layout>p2</layout>
<url>http://dist.springframework.org/snapshot/IDE/nightly</url>
</repository>
<repository>
<id>lsp4e</id>
<layout>p2</layout>
<url>http://download.eclipse.org/lsp4e/snapshots/</url>
</repository>
<repository>
<id>tm4e</id>
<layout>p2</layout>
<url>http://download.eclipse.org/tm4e/snapshots/</url>
</repository>
</repositories>
</profile>
<profile>
<id>e49</id>
<properties>
@@ -229,11 +119,6 @@
<layout>p2</layout>
<url>http://download.eclipse.org/releases/2018-09/</url>
</repository>
<!-- <repository>
<id>staging</id>
<layout>p2</layout>
<url>http://download.eclipse.org/staging/2018-09/</url>
</repository> -->
<repository>
<id>orbit</id>
<layout>p2</layout>
@@ -242,18 +127,18 @@
<!-- <repository>
<id>e-i-commons</id>
<layout>p2</layout>
<url>http://dist.springframework.org/snapshot/IDE/nightly</url>
<url>http://dist.springframework.org/release/IDE/3.9.6.RELEASE</url>
</repository> -->
<repository>
<id>e-i-commons</id>
<layout>p2</layout>
<url>http://dist.springframework.org/release/IDE/3.9.6.RELEASE</url>
<url>http://dist.springframework.org/snapshot/IDE/nightly</url>
</repository>
<!-- <repository>
<repository>
<id>lsp4e</id>
<layout>p2</layout>
<url>http://download.eclipse.org/lsp4e/snapshots/</url>
</repository> -->
</repository>
<repository>
<id>tm4e</id>
<layout>p2</layout>