Merge branch 'master' into jdt-classpath

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": "0.2.0",
+  "version": "0.2.1",
   "publisher": "Pivotal",
   "repository": {
     "type": "git",
@@ -58,6 +58,17 @@
         "configuration": "./properties-support/language-configuration.json"
       }
     ],
+    "configuration": {
+      "type": "object",
+      "title": "Boot-Java Configuration",
+      "properties": {
+        "boot-java.boot-hints.on": {
+          "type": "boolean",
+          "default": true,
+          "description": "Enable/Disable Spring running Boot application live hints decorators in the source code"
+        }
+      }
+    },
     "grammars": [
       {
         "language": "spring-boot-properties-yaml",