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

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.2.1",
+  "version": "0.3.0",
   "publisher": "Pivotal",
   "repository": {
     "type": "git",
@@ -65,11 +65,17 @@
       "title": "Bosh CLI Configuration",
       "properties": {
         "bosh.ls.java.heap": {
-          "type": ["string", "null"],
+          "type": [
+            "string",
+            "null"
+          ],
           "description": "Passed as an `-Xmx` argument to the language server JVM process"
         },
         "bosh.ls.java.home": {
-          "type": ["string", "null"],
+          "type": [
+            "string",
+            "null"
+          ],
           "description": "Overrides JAVA_HOME used for launching the language server JVM process"
         },
         "bosh.cli.command": {

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.2.1",
+  "version": "0.3.0",
   "publisher": "Pivotal",
   "repository": {
     "type": "git",

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.2.1",
+  "version": "0.3.0",
   "publisher": "Pivotal",
   "repository": {
     "type": "git",
@@ -50,11 +50,17 @@
       "title": "Cloudfoundry Manifest Language Server Configuration",
       "properties": {
         "cloudfoundry-manifest.ls.java.heap": {
-          "type": ["string", "null"],
+          "type": [
+            "string",
+            "null"
+          ],
           "description": "Passed as an `-Xmx` argument to the language server JVM process"
         },
         "cloudfoundry-manifest.ls.java.home": {
-          "type": ["string", "null"],
+          "type": [
+            "string",
+            "null"
+          ],
           "description": "Overrides JAVA_HOME used for launching the language server JVM process"
         }
       }

vscode-extensions/vscode-spring-boot/lib/Main.ts

@@ -19,24 +19,7 @@ const JAVA_LANGUAGE_ID = "java";
 /** Called when extension is activated */
 export function activate(context: VSCode.ExtensionContext) {
 
-    context.subscriptions.push(VSCode.commands.registerCommand('springboot.generate-concourse-pipeline', () => {
-        let q = (property, defaultValue) => {
-            defaultValue = defaultValue || '';
-            return ;
-        }
-        let projectRoot = VSCode.workspace.rootPath;
-        if (projectRoot) {
-            return generate_pipeline(projectRoot, (property, defaultValue) => 
-                new Promise<string>((resolve, reject) => {
-                    VSCode.window.showInputBox({
-                        prompt: `Enter '${property}': `,
-                        value: defaultValue,
-                        valueSelection: [0, defaultValue.length]
-                    }).then(resolve, reject);
-                })
-            );
-        }
-    }));
+    // registerPipelineGenerator(context);
 
     let options : commons.ActivatorOptions = {
         DEBUG: false,
@@ -62,3 +45,31 @@ export function activate(context: VSCode.ExtensionContext) {
 
     return commons.activate(options, context);
 }
+
+// NOTE: Be sure to add this under "contributes" in package.json to enable the command:
+//
+// "commands": [
+//     {
+//       "command": "springboot.generate-concourse-pipeline",
+//       "title": "Spring Boot: Generate Concourse Pipeline"
+//     }
+//   ],
+function registerPipelineGenerator(context: VSCode.ExtensionContext) {
+    context.subscriptions.push(VSCode.commands.registerCommand('springboot.generate-concourse-pipeline', () => {
+        let q = (property, defaultValue) => {
+            defaultValue = defaultValue || '';
+            return;
+        };
+        let projectRoot = VSCode.workspace.rootPath;
+        if (projectRoot) {
+            return generate_pipeline(projectRoot, (property, defaultValue) => new Promise<string>((resolve, reject) => {
+                VSCode.window.showInputBox({
+                    prompt: `Enter '${property}': `,
+                    value: defaultValue,
+                    valueSelection: [0, defaultValue.length]
+                }).then(resolve, reject);
+            }));
+        }
+    }));
+}
+

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.1",
+  "version": "0.3.0",
   "publisher": "Pivotal",
   "repository": {
     "type": "git",
@@ -31,12 +31,6 @@
     "onLanguage:java"
   ],
   "contributes": {
-    "commands": [
-      {
-        "command": "springboot.generate-concourse-pipeline",
-        "title": "Spring Boot: Generate Concourse Pipeline"
-      }
-    ],
     "javaExtensions": [
       "./jars/jdt-ls-commons.jar",
       "./jars/jdt-ls-extension.jar"