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

2017-12-12 12:34:44 -05:00
parent 28f36ae9b7 ee3181b320
commit 5256d3418d
22 changed files with 33 additions and 21 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.2.0-SNAPSHOT</version>
+		<version>0.1.2-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.2.0-SNAPSHOT</version>
+		<version>0.1.2-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.2.0-SNAPSHOT</version>
+		<version>0.1.2-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.2.0-SNAPSHOT</version>
+		<version>0.1.2-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.2.0-SNAPSHOT</version>
+		<version>0.1.2-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.2.0-SNAPSHOT</version>
+		<version>0.1.2-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.2.0-SNAPSHOT</version>
+		<version>0.1.2-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.2.0-SNAPSHOT</version>
+		<version>0.1.2-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.2.0-SNAPSHOT</version>
+		<version>0.1.2-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.2.0-SNAPSHOT</version>
+		<version>0.1.2-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.2.0-SNAPSHOT</version>
+		<version>0.1.2-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.2.0-SNAPSHOT</version>
+		<version>0.1.2-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.2.0-SNAPSHOT</version>
+		<version>0.1.2-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.2.0-SNAPSHOT</version>
+	<version>0.1.2-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.2.0-SNAPSHOT</version>
+		<version>0.1.2-SNAPSHOT</version>
 		<relativePath>../commons/pom.xml</relativePath>
 	</parent>
 	
--- a/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java
+++ b/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java
@@ -4078,6 +4078,18 @@ public class ConcourseEditorTest {
 		);
 	}

+	@Test public void getStepVersionShouldAcceptMap() throws Exception {
+		//See https://github.com/spring-projects/sts4/pull/24
+		Editor editor = harness.newEditor(
+				"jobs:\n" +
+				"- name: do-stuff\n" +
+				"  plan:\n" +
+				"  - get: cf-deployment-git\n" +
+				"    version: { ref: ((cf_deployment_commit_ref)) }"
+		);
+		editor.assertProblems("cf-deployment-git|resource does not exist");
+	}
+
 	//////////////////////////////////////////////////////////////////////////////

 	private void assertContextualCompletions(String conText, String textBefore, String... textAfter) throws Exception {
--- 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.2.0-SNAPSHOT</version>
+		<version>0.1.2-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.1.0",
+  "version": "0.1.2",
  "publisher": "Pivotal",
  "repository": {
    "type": "git",
--- 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.1.0",
+  "version": "0.1.2",
  "publisher": "Pivotal",
  "repository": {
    "type": "git",
--- 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.1.0",
+  "version": "0.1.2",
  "publisher": "Pivotal",
  "repository": {
    "type": "git",
--- 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.1.0",
+  "version": "0.1.2",
  "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.1.0",
+  "version": "0.1.2",
  "publisher": "Pivotal",
  "repository": {
    "type": "git",