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

2019-04-01 12:00:28 -07:00
parent 5789909036 21d3bb1ad3
commit db5d5b7b2f
21 changed files with 45 additions and 18 deletions
--- a/concourse/tasks/bump-versions.sh
+++ b/concourse/tasks/bump-versions.sh
@@ -42,8 +42,24 @@ cd $theia_sources
 for extension_id in $(ls -d theia-*)
 do
    if [ $extension_id != "theia-commons" ]; then
+        echo "Should update version of $extension_id"
+        # skip over 'theia-'
+        ext_type=${extension_id:6}
+        # step into folder containg actual extension source
+        cd $theia_sources/$extension_id/$ext_type
+        # Lerna version command needs package to be modofoed since last release
+        # Change version in the README.md file to make necessaey change to make Lerna version command work
+        if grep -q '^\*\*Version: .*\*\*$' README.md;
+        then
+          # Change version in the README.md file
+          perl -p -i -e 's/^\*\*Version: .*\*\*$/**Version: '"$theia_version"'**/g' README.md
+        else
+          # add version string if isn't there
+          echo -e "\n\n**Version: ${theia_version}**" >> README.md
+        fi
+
+        # step into theia extension folder and run Lerna command to update appropriate versions in all projects
        cd $theia_sources/$extension_id
-        echo "Should update version of $extension_id to $theia_version"
        lerna version $theia_version --exact --no-git-tag-version --no-push --yes
        git add ./
        echo ""
--- a/theia-extensions/theia-bosh/bosh/README.md
+++ b/theia-extensions/theia-bosh/bosh/README.md
@@ -152,3 +152,6 @@ Please report bugs, issues and feature requests on the [Github STS4 issue tracke
 [hovers]:      https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-bosh/bosh/readme-imgs/hover.png
 [peek]:        https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-bosh/bosh/readme-imgs/peek-definition.png
 [goto_symbol]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-bosh/bosh/readme-imgs/doc-symbol.png
+
+
+**Version: 1.6.0**
--- a/theia-extensions/theia-bosh/bosh/package.json
+++ b/theia-extensions/theia-bosh/bosh/package.json
@@ -6,7 +6,7 @@
  "keywords": [
    "theia-extension"
  ],
-  "version": "1.5.0",
+  "version": "1.6.0",
  "files": [
    "lib",
    "src",
--- a/theia-extensions/theia-bosh/browser-app/package.json
+++ b/theia-extensions/theia-bosh/browser-app/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "browser-app",
-  "version": "1.5.0",
+  "version": "1.6.0",
  "dependencies": {
    "@pivotal-tools/theia-bosh": "file:../bosh",
    "@theia/core": "latest",
--- a/theia-extensions/theia-bosh/electron-app/package.json
+++ b/theia-extensions/theia-bosh/electron-app/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "electron-app",
-  "version": "1.5.0",
+  "version": "1.6.0",
  "dependencies": {
    "@pivotal-tools/theia-bosh": "file:../bosh",
    "@theia/core": "latest",
--- a/theia-extensions/theia-bosh/lerna.json
+++ b/theia-extensions/theia-bosh/lerna.json
@@ -1,6 +1,6 @@
 {
  "lerna": "3.13.1",
-  "version": "1.5.0",
+  "version": "1.6.0",
  "useWorkspaces": true,
  "npmClient": "yarn",
  "command": {
--- a/theia-extensions/theia-cf-manifest-yaml/browser-app/package.json
+++ b/theia-extensions/theia-cf-manifest-yaml/browser-app/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "browser-app",
-  "version": "1.5.0",
+  "version": "1.6.0",
  "dependencies": {
    "@pivotal-tools/theia-cf-manifest-yaml": "file:../cf-manifest-yaml",
    "@theia/core": "latest",
--- a/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/README.md
+++ b/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/README.md
@@ -45,4 +45,6 @@ read its detailed documentation.
 [linting]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/readme-imgs/validation.png
 [ca]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/readme-imgs/ca.png
 [dcfca]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/readme-imgs/dynamic-ca.png
-[hovers]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/readme-imgs/hovers.png
+[hovers]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/readme-imgs/hovers.png
+
+**Version: 1.6.0**
--- a/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/package.json
+++ b/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/package.json
@@ -6,7 +6,7 @@
  "keywords": [
    "theia-extension"
  ],
-  "version": "1.5.0",
+  "version": "1.6.0",
  "files": [
    "lib",
    "src",
--- a/theia-extensions/theia-cf-manifest-yaml/electron-app/package.json
+++ b/theia-extensions/theia-cf-manifest-yaml/electron-app/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "electron-app",
-  "version": "1.5.0",
+  "version": "1.6.0",
  "dependencies": {
    "@pivotal-tools/theia-cf-manifest-yaml": "file:../cf-manifest-yaml",
    "@theia/core": "latest",
--- a/theia-extensions/theia-cf-manifest-yaml/lerna.json
+++ b/theia-extensions/theia-cf-manifest-yaml/lerna.json
@@ -1,6 +1,6 @@
 {
  "lerna": "3.13.1",
-  "version": "1.5.0",
+  "version": "1.6.0",
  "useWorkspaces": true,
  "npmClient": "yarn",
  "command": {
--- a/theia-extensions/theia-concourse/browser-app/package.json
+++ b/theia-extensions/theia-concourse/browser-app/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "browser-app",
-  "version": "1.5.0",
+  "version": "1.6.0",
  "dependencies": {
    "@pivotal-tools/theia-concourse": "file:../concourse",
    "@theia/core": "latest",
--- a/theia-extensions/theia-concourse/concourse/README.md
+++ b/theia-extensions/theia-concourse/concourse/README.md
@@ -85,3 +85,6 @@ Please report bugs, issues and feature requests on the [Github STS4 issue tracke
 [hovers]:  https://raw.githubusercontent.com/spring-projects/sts4/54cf0994b69ef1770ca597a8da325022b19cee69/theia-extensions/theia-concourse/concourse/readme-imgs/hover.png
 [peek]:    https://raw.githubusercontent.com/spring-projects/sts4/0b6278ad4aca86b4d0d4ee219f9a0aad04904f5f/theia-extensions/theia-concourse/concourse/readme-imgs/peek-definition.png
 [goto_symbol]: https://raw.githubusercontent.com/spring-projects/sts4/54cf0994b69ef1770ca597a8da325022b19cee69/theia-extensions/theia-concourse/concourse/readme-imgs/doc-symbols.png
+
+
+**Version: 1.6.0**
--- a/theia-extensions/theia-concourse/concourse/package.json
+++ b/theia-extensions/theia-concourse/concourse/package.json
@@ -6,7 +6,7 @@
  "keywords": [
    "theia-extension"
  ],
-  "version": "1.5.0",
+  "version": "1.6.0",
  "files": [
    "lib",
    "src",
--- a/theia-extensions/theia-concourse/electron-app/package.json
+++ b/theia-extensions/theia-concourse/electron-app/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "electron-app",
-  "version": "1.5.0",
+  "version": "1.6.0",
  "dependencies": {
    "@pivotal-tools/theia-concourse": "file:../concourse",
    "@theia/core": "latest",
--- a/theia-extensions/theia-concourse/lerna.json
+++ b/theia-extensions/theia-concourse/lerna.json
@@ -1,6 +1,6 @@
 {
  "lerna": "3.13.1",
-  "version": "1.5.0",
+  "version": "1.6.0",
  "useWorkspaces": true,
  "npmClient": "yarn",
  "command": {
--- a/theia-extensions/theia-spring-boot/browser-app/package.json
+++ b/theia-extensions/theia-spring-boot/browser-app/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "browser-app",
-  "version": "1.5.0",
+  "version": "1.6.0",
  "dependencies": {
    "@pivotal-tools/theia-spring-boot": "file:../spring-boot",
    "@theia/core": "latest",
--- a/theia-extensions/theia-spring-boot/electron-app/package.json
+++ b/theia-extensions/theia-spring-boot/electron-app/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "electron-app",
-  "version": "1.5.0",
+  "version": "1.6.0",
  "dependencies": {
    "@pivotal-tools/theia-spring-boot": "file:../spring-boot",
    "@theia/core": "latest",
--- a/theia-extensions/theia-spring-boot/lerna.json
+++ b/theia-extensions/theia-spring-boot/lerna.json
@@ -1,6 +1,6 @@
 {
  "lerna": "3.13.1",
-  "version": "1.5.0",
+  "version": "1.6.0",
  "useWorkspaces": true,
  "npmClient": "yarn",
  "command": {
--- a/theia-extensions/theia-spring-boot/spring-boot/README.md
+++ b/theia-extensions/theia-spring-boot/spring-boot/README.md
@@ -117,3 +117,6 @@ Released versions of this extension can be installed directly from npm registry.
 [java-live-apps-quick-access]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-spring-boot/spring-boot/readme-imgs/live-request-mappings.png
 [java-live-hovers]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-spring-boot/spring-boot/readme-imgs/live-hovers.png
 [java-navigation]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-spring-boot/spring-boot/readme-imgs/workspace-symbol.png
+
+
+**Version: 1.6.0**
--- a/theia-extensions/theia-spring-boot/spring-boot/package.json
+++ b/theia-extensions/theia-spring-boot/spring-boot/package.json
@@ -6,7 +6,7 @@
  "keywords": [
    "theia-extension"
  ],
-  "version": "1.5.0",
+  "version": "1.6.0",
  "files": [
    "lib",
    "src",