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

concourse/pipeline.yml

@@ -31,6 +31,12 @@ resources:
     branch: {{branch}}
     private_key: {{rsa_id}}
     uri: git@github.com:spring-projects/atom-cf-manifest-yaml.git
+- name: atom-concourse
+  type: git
+  source:
+    branch: {{branch}}
+    private_key: {{rsa_id}}
+    uri: git@github.com:spring-projects/atom-concourse.git
 - name: tasks
   type: git
   source:
@@ -109,6 +115,14 @@ resources:
     secret_access_key: {{s3_secretkey}}
     region_name: {{s3_region}}
     regexp: sts4/atom/snapshots/(.*)cf-manifest-yaml-(.*).tgz
+- name: s3-atom-concourse-snapshot
+  type: s3
+  source:
+    bucket: {{s3_bucket}}
+    access_key_id: {{s3_accesskey}}
+    secret_access_key: {{s3_secretkey}}
+    region_name: {{s3_region}}
+    regexp: sts4/atom/snapshots/(.*)concourse-pipeline-yaml-(.*).tgz
 - name: snapshot-website
   type: s3-multi
   source:
@@ -510,3 +524,31 @@ jobs:
       params:
         file: out/*cf-manifest-yaml-*.tgz
         acl: public-read
+- name: build-concourse-pipeline-yaml-atom-package
+  plan:
+  - aggregate:
+    - get: sts4
+      passed:
+      - atom-language-servers-test
+    - get: atom-concourse
+      trigger: true
+    - get: s3-concourse-fatjar-snapshot
+      trigger: true
+      passed:
+      - atom-language-servers-test
+  - task: build-concourse-pipeline-yaml-atom-package
+    input_mapping:
+      package_sources: atom-concourse
+      fatjar: s3-concourse-fatjar-snapshot
+    file: sts4/concourse/tasks/build-atom-package.yml
+  on_failure:
+    put: slack-notification
+    params:
+      text: |
+         Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed!
+  on_success:
+    aggregate:
+    - put: s3-atom-concourse-snapshot
+      params:
+        file: out/*concourse-pipeline-yaml-*.tgz
+        acl: public-read

concourse/tasks/atom-language-servers-test.sh

@@ -22,4 +22,4 @@ for i in `ls *-language-server/target/*.jar`; do
     cp $i $output/${basename/SNAPSHOT/$timestamp}
 done
 
-ls -la $output
+ls -la $output

concourse/tasks/build-atom-package.sh

@@ -35,4 +35,4 @@ length=${#basename}
 
 newName=${basename:0:${length}-4}-$timestamp${basename:${length}-4:${length}}
 
-cp ${basename} $output/${newName}
+cp ${basename} $output/${newName}

eclipse-distribution/pom.xml

@@ -113,15 +113,15 @@
 					<layout>p2</layout>
 					<url>http://download.eclipse.org/releases/oxygen/</url>
 				</repository>
-				<repository>
+<!--				<repository>
 					<id>staging</id>
 					<layout>p2</layout>
 					<url>http://download.eclipse.org/staging/oxygen/</url>
-				</repository>
+				</repository> -->
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
-					<url>http://download.eclipse.org/tools/orbit/downloads/drops/S20170306214312/repository/</url>
+					<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/</url>
 				</repository>
 				<repository>
 					<id>maven-extras-mirror</id>

eclipse-language-servers/pom.xml

@@ -75,15 +75,15 @@
 					<layout>p2</layout>
 					<url>http://download.eclipse.org/releases/oxygen/</url>
 				</repository>
-				<repository>
+<!--				<repository>
 					<id>staging</id>
 					<layout>p2</layout>
 					<url>http://download.eclipse.org/staging/oxygen/</url>
-				</repository>
+				</repository> -->
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
-					<url>http://download.eclipse.org/tools/orbit/downloads/drops/S20170306214312/repository/</url>
+					<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/</url>
 				</repository>
 				<repository>
 					<id>lsp4j-snapshots</id>

vscode-extensions/vscode-boot-properties/.vscode/launch.json

@@ -3,14 +3,17 @@
 	"version": "0.1.0",
 	"configurations": [
 		{
-			"name": "Launch Extension",
 			"type": "extensionHost",
 			"request": "launch",
+			"name": "Launch Extension",
 			"runtimeExecutable": "${execPath}",
-			"args": ["--extensionDevelopmentPath=${workspaceRoot}" ],
-			"stopOnEntry": false,
+			"args": [
+				"--extensionDevelopmentPath=${workspaceRoot}"
+			],
 			"sourceMaps": true,
-			"outDir": "${workspaceRoot}/out/lib",
+			"outFiles": [
+				"${workspaceRoot}/out/**/*.js"
+			],
 			"preLaunchTask": "npm"
 		},
 		{

vscode-extensions/vscode-manifest-yaml/.vscode/launch.json

@@ -3,14 +3,17 @@
 	"version": "0.1.0",
 	"configurations": [
 		{
-			"name": "Launch Extension",
 			"type": "extensionHost",
 			"request": "launch",
+			"name": "Launch Extension",
 			"runtimeExecutable": "${execPath}",
-			"args": ["--extensionDevelopmentPath=${workspaceRoot}" ],
-			"stopOnEntry": false,
+			"args": [
+				"--extensionDevelopmentPath=${workspaceRoot}"
+			],
 			"sourceMaps": true,
-			"outFiles": ["${workspaceRoot}/out/lib"],
+			"outFiles": [
+				"${workspaceRoot}/out/**/*.js"
+			],
 			"preLaunchTask": "npm"
 		},
 		{