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

2017-08-21 11:06:50 -07:00
parent 8c4c23549f 694e9a9fa8
commit 56a509debe
22 changed files with 74 additions and 56 deletions
--- a/headless-services/boot-java-language-server/pom.xml
+++ b/headless-services/boot-java-language-server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>0.0.9-SNAPSHOT</version>
+		<version>0.0.10-SNAPSHOT</version>
 		<relativePath>../commons/pom.xml</relativePath>
 	</parent>

--- a/headless-services/boot-properties-language-server/pom.xml
+++ b/headless-services/boot-properties-language-server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>0.0.9-SNAPSHOT</version>
+		<version>0.0.10-SNAPSHOT</version>
 		<relativePath>../commons/pom.xml</relativePath>
 	</parent>
 	
--- a/headless-services/bosh-language-server/pom.xml
+++ b/headless-services/bosh-language-server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>0.0.9-SNAPSHOT</version>
+		<version>0.0.10-SNAPSHOT</version>
 		<relativePath>../commons/pom.xml</relativePath>
 	</parent>
 	
--- a/headless-services/commons/commons-boot-app-cli/pom.xml
+++ b/headless-services/commons/commons-boot-app-cli/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>0.0.9-SNAPSHOT</version>
+		<version>0.0.10-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/headless-services/commons/commons-cf/pom.xml
+++ b/headless-services/commons/commons-cf/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>0.0.9-SNAPSHOT</version>
+		<version>0.0.10-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/headless-services/commons/commons-gradle/pom.xml
+++ b/headless-services/commons/commons-gradle/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>0.0.9-SNAPSHOT</version>
+		<version>0.0.10-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/headless-services/commons/commons-java/pom.xml
+++ b/headless-services/commons/commons-java/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>0.0.9-SNAPSHOT</version>
+		<version>0.0.10-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
--- a/headless-services/commons/commons-language-server/pom.xml
+++ b/headless-services/commons/commons-language-server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>0.0.9-SNAPSHOT</version>
+		<version>0.0.10-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/headless-services/commons/commons-maven/pom.xml
+++ b/headless-services/commons/commons-maven/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>0.0.9-SNAPSHOT</version>
+		<version>0.0.10-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/headless-services/commons/commons-util/pom.xml
+++ b/headless-services/commons/commons-util/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>0.0.9-SNAPSHOT</version>
+		<version>0.0.10-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/headless-services/commons/commons-yaml/pom.xml
+++ b/headless-services/commons/commons-yaml/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>0.0.9-SNAPSHOT</version>
+		<version>0.0.10-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/headless-services/commons/java-properties/pom.xml
+++ b/headless-services/commons/java-properties/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>0.0.9-SNAPSHOT</version>
+		<version>0.0.10-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/headless-services/commons/language-server-test-harness/pom.xml
+++ b/headless-services/commons/language-server-test-harness/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>0.0.9-SNAPSHOT</version>
+		<version>0.0.10-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>org.springframework.ide.vscode</groupId>
 	<artifactId>commons-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>0.0.9-SNAPSHOT</version>
+	<version>0.0.10-SNAPSHOT</version>
 	<name>commons-parent</name>

 	<modules>
--- a/headless-services/concourse-language-server/pom.xml
+++ b/headless-services/concourse-language-server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>0.0.9-SNAPSHOT</version>
+		<version>0.0.10-SNAPSHOT</version>
 		<relativePath>../commons/pom.xml</relativePath>
 	</parent>
 	
--- a/headless-services/manifest-yaml-language-server/pom.xml
+++ b/headless-services/manifest-yaml-language-server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
-		<version>0.0.9-SNAPSHOT</version>
+		<version>0.0.10-SNAPSHOT</version>
 		<relativePath>../commons/pom.xml</relativePath>
 	</parent>

--- a/vscode-extensions/vscode-boot-java/package.json
+++ b/vscode-extensions/vscode-boot-java/package.json
@@ -3,7 +3,7 @@
  "displayName": "Spring Boot Java Support",
  "description": "Provides validation, content assist, and more working with Spring Boot applications Java code",
  "icon": "spring-boot-logo.png",
-  "version": "0.0.6",
+  "version": "0.0.10",
  "publisher": "Pivotal",
  "repository": {
    "type": "git",
@@ -19,7 +19,8 @@
    "Linters"
  ],
  "keywords": [
-    "java", "spring-boot"
+    "java",
+    "spring-boot"
  ],
  "activationEvents": [
    "onLanguage:java"
--- a/vscode-extensions/vscode-boot-properties/package.json
+++ b/vscode-extensions/vscode-boot-properties/package.json
@@ -3,7 +3,7 @@
  "displayName": "Spring Boot Application Properties Support",
  "description": "Provides validation and content assist for Spring Boot application.properties and application.yml file",
  "icon": "spring-boot-logo.png",
-  "version": "0.0.6",
+  "version": "0.0.10",
  "publisher": "Pivotal",
  "repository": {
    "type": "git",
@@ -19,7 +19,10 @@
    "Linters"
  ],
  "keywords": [
-    "java-properties", "spring-boot", "application-properties", "application-yaml"
+    "java-properties",
+    "spring-boot",
+    "application-properties",
+    "application-yaml"
  ],
  "activationEvents": [
    "onLanguage:ini",
--- 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": "0.0.9",
+  "version": "0.0.10",
  "publisher": "Pivotal",
  "repository": {
    "type": "git",
@@ -61,25 +61,31 @@
      }
    ],
    "configuration": {
-        "type": "object",
-        "title": "Bosh CLI Configuration",
-        "properties": {
-            "bosh.cli.command": {
-                "type": ["string" , "null"],
-                "default": "bosh",
-                "description": "Path to an executable to launch the bosh cli V2. A V2 cli is required! Set this to null to completely disable all editor features that require access to the bosh director"
-            },
-            "bosh.cli.target": {
-                "type": ["string", "null"],
-                "default": null,
-                "description": "Specifies the director/environment to target when executing bosh cli commands. I.e. this value is passed to the CLI via `-e` parameter."
-            },
-            "bosh.cli.timeout": {
-                "type": "integer",
-                "default": 3,
-                "description": "Number of seconds before CLI commands are terminated with a timeout"
-            }
+      "type": "object",
+      "title": "Bosh CLI Configuration",
+      "properties": {
+        "bosh.cli.command": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "default": "bosh",
+          "description": "Path to an executable to launch the bosh cli V2. A V2 cli is required! Set this to null to completely disable all editor features that require access to the bosh director"
+        },
+        "bosh.cli.target": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "default": null,
+          "description": "Specifies the director/environment to target when executing bosh cli commands. I.e. this value is passed to the CLI via `-e` parameter."
+        },
+        "bosh.cli.timeout": {
+          "type": "integer",
+          "default": 3,
+          "description": "Number of seconds before CLI commands are terminated with a timeout"
        }
+      }
    }
  },
  "main": "./out/lib/Main",
--- 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": "0.0.9",
+  "version": "0.0.10",
  "publisher": "Pivotal",
  "repository": {
    "type": "git",
--- 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": "0.0.9",
+  "version": "0.0.10",
  "publisher": "Pivotal",
  "repository": {
    "type": "git",
--- a/vscode-extensions/vscode-properties/package.json
+++ b/vscode-extensions/vscode-properties/package.json
@@ -3,7 +3,7 @@
  "displayName": "Java Properties files Support",
  "description": "Provides syntax highlighting for Java  Properties files",
  "icon": "icon.png",
-  "version": "0.0.6",
+  "version": "0.0.10",
  "publisher": "pivotal",
  "repository": {
    "type": "git",
@@ -17,21 +17,29 @@
    "Languages"
  ],
  "keywords": [
-    "properties", "java"
+    "properties",
+    "java"
  ],
  "contributes": {
-    "languages": [{
-			"id": "java-properties",
-			"aliases": ["Java-Properties", "java-proeprties"],
-      "extensions": [
-        ".properties"
-      ],
-			"configuration": "./language-configuration.json"
-    }],
-    "grammars": [{
-			"language": "java-properties",
-			"scopeName": "source.java-properties",
-			"path": "./syntaxes/JavaProperties.plist"
-    }]
+    "languages": [
+      {
+        "id": "java-properties",
+        "aliases": [
+          "Java-Properties",
+          "java-proeprties"
+        ],
+        "extensions": [
+          ".properties"
+        ],
+        "configuration": "./language-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "language": "java-properties",
+        "scopeName": "source.java-properties",
+        "path": "./syntaxes/JavaProperties.plist"
+      }
+    ]
  }
 }