diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index aa0317834..426ab5d26 100644
--- a/concourse/pipeline.yml
+++ b/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
\ No newline at end of file
diff --git a/concourse/tasks/atom-language-servers-test.sh b/concourse/tasks/atom-language-servers-test.sh
index 76f96f6a1..775254b6d 100755
--- a/concourse/tasks/atom-language-servers-test.sh
+++ b/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
\ No newline at end of file
+ls -la $output
diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh
index d42f6cda2..c651c1c2c 100755
--- a/concourse/tasks/build-atom-package.sh
+++ b/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}
\ No newline at end of file
+cp ${basename} $output/${newName}
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 03b87a91e..39817d029 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -113,15 +113,15 @@
p2
http://download.eclipse.org/releases/oxygen/
-
+
orbit
p2
- http://download.eclipse.org/tools/orbit/downloads/drops/S20170306214312/repository/
+ http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/
maven-extras-mirror
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index d3f8251a1..538ac7bfc 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -75,15 +75,15 @@
p2
http://download.eclipse.org/releases/oxygen/
-
+
orbit
p2
- http://download.eclipse.org/tools/orbit/downloads/drops/S20170306214312/repository/
+ http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/
lsp4j-snapshots
diff --git a/vscode-extensions/vscode-boot-properties/.vscode/launch.json b/vscode-extensions/vscode-boot-properties/.vscode/launch.json
index 52ebf9f9e..07e1c6011 100644
--- a/vscode-extensions/vscode-boot-properties/.vscode/launch.json
+++ b/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"
},
{
diff --git a/vscode-extensions/vscode-manifest-yaml/.vscode/launch.json b/vscode-extensions/vscode-manifest-yaml/.vscode/launch.json
index 9d73948ec..1c135881c 100644
--- a/vscode-extensions/vscode-manifest-yaml/.vscode/launch.json
+++ b/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"
},
{
diff --git a/vscode-extensions/vscode-manifest-yaml/readme-imgs/cf-dynamic-content-assist.png b/vscode-extensions/vscode-manifest-yaml/readme-imgs/cf-dynamic-content-assist.png
index abdd05e92..4e9b0220f 100644
Binary files a/vscode-extensions/vscode-manifest-yaml/readme-imgs/cf-dynamic-content-assist.png and b/vscode-extensions/vscode-manifest-yaml/readme-imgs/cf-dynamic-content-assist.png differ