From b95729632aa5667af1d35ceb75e6560096756a76 Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Wed, 13 May 2020 09:34:22 +0200
Subject: [PATCH 1/3] updated orbit repo for e416 target def

---
 eclipse-distribution/pom.xml     | 2 +-
 eclipse-language-servers/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index cec34b74a..8981f270f 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -424,7 +424,7 @@
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository</url>
+					<url>https://download.eclipse.org/tools/orbit/downloads/drops/S20200427151422/repository</url>
 				</repository>
 				<repository>
 					<id>latest-m2e-wtp</id>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 0de2eb7ce..0d5ae8517 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -289,7 +289,7 @@
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository</url>
+					<url>https://download.eclipse.org/tools/orbit/downloads/drops/S20200427151422/repository</url>
 				</repository>
 <!--				<repository>
 					<id>e-i-commons</id>

From 6e47d266b3f1438ef4dd27abc686092d90e2c370 Mon Sep 17 00:00:00 2001
From: dmohan200 <Deepak_Mohanakrishnan@cable.comcast.com>
Date: Fri, 15 May 2020 01:07:42 -0400
Subject: [PATCH 2/3] [concourse] Add support for set-pipeline step

---
 .../vscode/concourse/PipelineYmlSchema.java   |  7 +++
 .../resources/desc/SetPipelineStep/file.md    | 15 +++++++
 .../desc/SetPipelineStep/set_pipeline.md      | 19 ++++++++
 .../desc/SetPipelineStep/var_files.md         |  1 +
 .../resources/desc/SetPipelineStep/vars.md    | 43 +++++++++++++++++++
 .../vscode/concourse/ConcourseEditorTest.java | 25 ++++++++++-
 6 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/file.md
 create mode 100644 headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/set_pipeline.md
 create mode 100644 headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/var_files.md
 create mode 100644 headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/vars.md

diff --git a/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java
index b918111b3..41f0ff9c0 100644
--- a/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java
+++ b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java
@@ -365,6 +365,12 @@ public class PipelineYmlSchema implements YamlSchema {
 		taskStep.requireOneOf("config", "file");
 		taskStep.require(Constraints.implies("vars", "file"));
 
+		YBeanType setPipelineStep = f.ybean("SetPipelineStep");
+		addProp(setPipelineStep, "set_pipeline", t_ne_string);
+		addProp(setPipelineStep, "file", t_string).isRequired(true);
+		addProp(setPipelineStep, "vars", t_params);
+		addProp(setPipelineStep, "var_files", t_strings);
+
 		YBeanType aggregateStep = f.ybean("AggregateStep");
 		YBeanType doStep = f.ybean("DoStep");
 		YBeanType tryStep = f.ybean("TryStep");
@@ -374,6 +380,7 @@ public class PipelineYmlSchema implements YamlSchema {
 				getStep,
 				putStep,
 				taskStep,
+				setPipelineStep,
 				aggregateStep,
 				inParallelStep,
 				doStep,
diff --git a/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/file.md b/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/file.md
new file mode 100644
index 000000000..0c90ba3a1
--- /dev/null
+++ b/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/file.md
@@ -0,0 +1,15 @@
+*Required* The path to the pipeline's configuration file.
+
+file points at a .yml file containing the pipeline configuration, which allows this to be tracked with your resources or generated by a task step.
+
+The first segment in the path should refer to another artifact from the plan, and the rest of the path is relative to that artifact.
+
+**For example** Fetching and confifuring a pipeline
+
+The `get` step can be used to fetch your configuration from a git repo and auto-configure it using a `set_pipeline` step:
+
+```
+- get: ci
+- set_pipeline: my-pipeline
+  file: ci/pipelines/my-pipeline.yml
+```
\ No newline at end of file
diff --git a/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/set_pipeline.md b/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/set_pipeline.md
new file mode 100644
index 000000000..a003fc183
--- /dev/null
+++ b/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/set_pipeline.md
@@ -0,0 +1,19 @@
+Note: The `set_pipeline` step was introduced in Concourse v5.8.0. It is considered an experimental feature until its associated [RFC](https://github.com/concourse/rfcs/pull/31) is resolved.
+
+*Required* The identifier specifies the name of the pipeline to configure. It will be configured within the current team and be created unpaused.
+
+This is a way to ensure a pipeline stays up to date with its definition in a source code repository, eliminating the need to manually run fly set-pipeline
+
+```
+resources:
+- name: booklit
+  type: git
+  source: {uri: https://github.com/vito/booklit}
+jobs:
+- name: reconfigure
+  plan:
+  - get: booklit
+    trigger: true
+  - set_pipeline: booklit
+    file: booklit/ci/pipeline.yml
+```
diff --git a/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/var_files.md b/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/var_files.md
new file mode 100644
index 000000000..8eeeff053
--- /dev/null
+++ b/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/var_files.md
@@ -0,0 +1 @@
+*Optional* A list of paths to .yml files that will be passed to the pipeline config in the same manner as the --load-vars-from flag to [fly set-pipeline](https://concourse-ci.org/setting-pipelines.html#fly-set-pipeline). This means that if a variable appears in multiple files, the value from a file that is passed later in the list will override the values from files earlier in the list.
\ No newline at end of file
diff --git a/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/vars.md b/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/vars.md
new file mode 100644
index 000000000..df6c4151c
--- /dev/null
+++ b/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/vars.md
@@ -0,0 +1,43 @@
+*Optional* A map of template variables to pass to the pipeline config.
+
+Note that variables set with this field will not propagate to tasks configured via task step file. If you want those variables to be determined at the time the pipeline is set, use task step vars as well.
+
+*Example* Configuring static variables
+
+A var may be statically passed like so:
+
+```
+plan:
+- get: my-repo
+- set_pipeline: configure-the-pipeline
+  file: my-repo/ci/pipeline.yml
+  vars:
+    text: "Hello World!"
+```
+
+Any [Vars](https://concourse-ci.org/vars.html) in the pipeline config will be filled in statically using this field.
+
+For example, if my-repo/ci/pipeline.yml looks like...:
+
+```
+resources:
+- name: task-image
+    type: docker-image
+    source:
+      repository: my.local.registry:8080/my/image
+      username: ((myuser))
+      password: ((mypass))
+jobs:
+- name: job
+  plan:
+  - get: task-image
+  - task: do-stuff
+    image: task-image
+    config:
+      platform: linux
+      run:
+        path: echo
+        args: ["((text))"]
+```
+
+...this will resolve "((text))" to "Hello World!", while ((myuser)) and ((mypass)) will be left in the pipeline to be [fetched at runtime](https://concourse-ci.org/vars.html#dynamic-vars).
\ No newline at end of file
diff --git 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
index 2471c23e8..39400605d 100644
--- 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
@@ -355,7 +355,9 @@ public class ConcourseEditorTest {
 				"  - in_parallel:\n" +
 				"    - task: perform-something\n" +
 				"  - try:\n" +
-				"      put: test-logs\n"
+				"      put: test-logs\n" +
+				"  - set_pipeline: configure-the-pipeline\n" +
+			  "	   file: my-repo/ci/pipeline.yml\n"
 		);
 
 		editor.assertHoverContains("get", "Fetches a resource");
@@ -365,6 +367,7 @@ public class ConcourseEditorTest {
 		editor.assertHoverContains("task", "Executes a [Task]");
 		editor.assertHoverContains("do", "performs the given steps serially");
 		editor.assertHoverContains("try", "Performs the given step, swallowing any failure");
+		editor.assertHoverContains("set_pipeline", "The identifier specifies the name of the pipeline to configure");
 	}
 
 	@Test
@@ -388,6 +391,26 @@ public class ConcourseEditorTest {
 		editor.assertHoverContains("get_params", "A map of arbitrary configuration to forward to the resource that will be utilized during the implicit `get` step");
 	}
 
+	@Test
+	public void setPipelineStepHovers() throws Exception {
+		Editor editor = harness.newEditor(
+			"jobs:\n" +
+			"- name: some-job\n" +
+			"  plan:\n" +
+			"  - get: my-repo\n" +
+			"  - set_pipeline: configure-the-pipeline\n" +
+			"	   file: my-repo/ci/pipeline.yml\n" +
+			"    var_files:\n" +
+			"      -  my-repo/ci/dev.yml\n" +
+			"	   vars:\n" +
+			"		   text: \"Hello World!\"\n"
+		);
+
+		editor.assertHoverContains("file", "The path to the pipeline's configuration file.");
+		editor.assertHoverContains("var_files", "files that will be passed to the pipeline config in the same manner as the --load-vars-from flag");
+		editor.assertHoverContains("vars", "A map of template variables to pass to the pipeline config.");
+	}
+
 	@Test
 	public void getStepHovers() throws Exception {
 		Editor editor = harness.newEditor(

From 351b4110b032874bc9793ace1606f61c6fa0dc74 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Tue, 19 May 2020 11:55:46 -0700
Subject: [PATCH 3/3] Revert "[concourse] Add support for set-pipeline step"

---
 .../vscode/concourse/PipelineYmlSchema.java   |  7 ---
 .../resources/desc/SetPipelineStep/file.md    | 15 -------
 .../desc/SetPipelineStep/set_pipeline.md      | 19 --------
 .../desc/SetPipelineStep/var_files.md         |  1 -
 .../resources/desc/SetPipelineStep/vars.md    | 43 -------------------
 .../vscode/concourse/ConcourseEditorTest.java | 25 +----------
 6 files changed, 1 insertion(+), 109 deletions(-)
 delete mode 100644 headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/file.md
 delete mode 100644 headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/set_pipeline.md
 delete mode 100644 headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/var_files.md
 delete mode 100644 headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/vars.md

diff --git a/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java
index 41f0ff9c0..b918111b3 100644
--- a/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java
+++ b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java
@@ -365,12 +365,6 @@ public class PipelineYmlSchema implements YamlSchema {
 		taskStep.requireOneOf("config", "file");
 		taskStep.require(Constraints.implies("vars", "file"));
 
-		YBeanType setPipelineStep = f.ybean("SetPipelineStep");
-		addProp(setPipelineStep, "set_pipeline", t_ne_string);
-		addProp(setPipelineStep, "file", t_string).isRequired(true);
-		addProp(setPipelineStep, "vars", t_params);
-		addProp(setPipelineStep, "var_files", t_strings);
-
 		YBeanType aggregateStep = f.ybean("AggregateStep");
 		YBeanType doStep = f.ybean("DoStep");
 		YBeanType tryStep = f.ybean("TryStep");
@@ -380,7 +374,6 @@ public class PipelineYmlSchema implements YamlSchema {
 				getStep,
 				putStep,
 				taskStep,
-				setPipelineStep,
 				aggregateStep,
 				inParallelStep,
 				doStep,
diff --git a/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/file.md b/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/file.md
deleted file mode 100644
index 0c90ba3a1..000000000
--- a/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/file.md
+++ /dev/null
@@ -1,15 +0,0 @@
-*Required* The path to the pipeline's configuration file.
-
-file points at a .yml file containing the pipeline configuration, which allows this to be tracked with your resources or generated by a task step.
-
-The first segment in the path should refer to another artifact from the plan, and the rest of the path is relative to that artifact.
-
-**For example** Fetching and confifuring a pipeline
-
-The `get` step can be used to fetch your configuration from a git repo and auto-configure it using a `set_pipeline` step:
-
-```
-- get: ci
-- set_pipeline: my-pipeline
-  file: ci/pipelines/my-pipeline.yml
-```
\ No newline at end of file
diff --git a/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/set_pipeline.md b/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/set_pipeline.md
deleted file mode 100644
index a003fc183..000000000
--- a/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/set_pipeline.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Note: The `set_pipeline` step was introduced in Concourse v5.8.0. It is considered an experimental feature until its associated [RFC](https://github.com/concourse/rfcs/pull/31) is resolved.
-
-*Required* The identifier specifies the name of the pipeline to configure. It will be configured within the current team and be created unpaused.
-
-This is a way to ensure a pipeline stays up to date with its definition in a source code repository, eliminating the need to manually run fly set-pipeline
-
-```
-resources:
-- name: booklit
-  type: git
-  source: {uri: https://github.com/vito/booklit}
-jobs:
-- name: reconfigure
-  plan:
-  - get: booklit
-    trigger: true
-  - set_pipeline: booklit
-    file: booklit/ci/pipeline.yml
-```
diff --git a/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/var_files.md b/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/var_files.md
deleted file mode 100644
index 8eeeff053..000000000
--- a/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/var_files.md
+++ /dev/null
@@ -1 +0,0 @@
-*Optional* A list of paths to .yml files that will be passed to the pipeline config in the same manner as the --load-vars-from flag to [fly set-pipeline](https://concourse-ci.org/setting-pipelines.html#fly-set-pipeline). This means that if a variable appears in multiple files, the value from a file that is passed later in the list will override the values from files earlier in the list.
\ No newline at end of file
diff --git a/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/vars.md b/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/vars.md
deleted file mode 100644
index df6c4151c..000000000
--- a/headless-services/concourse-language-server/src/main/resources/desc/SetPipelineStep/vars.md
+++ /dev/null
@@ -1,43 +0,0 @@
-*Optional* A map of template variables to pass to the pipeline config.
-
-Note that variables set with this field will not propagate to tasks configured via task step file. If you want those variables to be determined at the time the pipeline is set, use task step vars as well.
-
-*Example* Configuring static variables
-
-A var may be statically passed like so:
-
-```
-plan:
-- get: my-repo
-- set_pipeline: configure-the-pipeline
-  file: my-repo/ci/pipeline.yml
-  vars:
-    text: "Hello World!"
-```
-
-Any [Vars](https://concourse-ci.org/vars.html) in the pipeline config will be filled in statically using this field.
-
-For example, if my-repo/ci/pipeline.yml looks like...:
-
-```
-resources:
-- name: task-image
-    type: docker-image
-    source:
-      repository: my.local.registry:8080/my/image
-      username: ((myuser))
-      password: ((mypass))
-jobs:
-- name: job
-  plan:
-  - get: task-image
-  - task: do-stuff
-    image: task-image
-    config:
-      platform: linux
-      run:
-        path: echo
-        args: ["((text))"]
-```
-
-...this will resolve "((text))" to "Hello World!", while ((myuser)) and ((mypass)) will be left in the pipeline to be [fetched at runtime](https://concourse-ci.org/vars.html#dynamic-vars).
\ No newline at end of file
diff --git 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
index 39400605d..2471c23e8 100644
--- 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
@@ -355,9 +355,7 @@ public class ConcourseEditorTest {
 				"  - in_parallel:\n" +
 				"    - task: perform-something\n" +
 				"  - try:\n" +
-				"      put: test-logs\n" +
-				"  - set_pipeline: configure-the-pipeline\n" +
-			  "	   file: my-repo/ci/pipeline.yml\n"
+				"      put: test-logs\n"
 		);
 
 		editor.assertHoverContains("get", "Fetches a resource");
@@ -367,7 +365,6 @@ public class ConcourseEditorTest {
 		editor.assertHoverContains("task", "Executes a [Task]");
 		editor.assertHoverContains("do", "performs the given steps serially");
 		editor.assertHoverContains("try", "Performs the given step, swallowing any failure");
-		editor.assertHoverContains("set_pipeline", "The identifier specifies the name of the pipeline to configure");
 	}
 
 	@Test
@@ -391,26 +388,6 @@ public class ConcourseEditorTest {
 		editor.assertHoverContains("get_params", "A map of arbitrary configuration to forward to the resource that will be utilized during the implicit `get` step");
 	}
 
-	@Test
-	public void setPipelineStepHovers() throws Exception {
-		Editor editor = harness.newEditor(
-			"jobs:\n" +
-			"- name: some-job\n" +
-			"  plan:\n" +
-			"  - get: my-repo\n" +
-			"  - set_pipeline: configure-the-pipeline\n" +
-			"	   file: my-repo/ci/pipeline.yml\n" +
-			"    var_files:\n" +
-			"      -  my-repo/ci/dev.yml\n" +
-			"	   vars:\n" +
-			"		   text: \"Hello World!\"\n"
-		);
-
-		editor.assertHoverContains("file", "The path to the pipeline's configuration file.");
-		editor.assertHoverContains("var_files", "files that will be passed to the pipeline config in the same manner as the --load-vars-from flag");
-		editor.assertHoverContains("vars", "A map of template variables to pass to the pipeline config.");
-	}
-
 	@Test
 	public void getStepHovers() throws Exception {
 		Editor editor = harness.newEditor(