From 8616d9d90b116832ac626d549458572d5004d21a Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 13 Mar 2020 07:50:51 +0100 Subject: [PATCH 1/4] update depenencies and remove mkdirp --- package.json | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 47e6481..34d55d4 100644 --- a/package.json +++ b/package.json @@ -2,18 +2,17 @@ "scripts": { "build": "node build.js --skipTests", "predist": "npm run build", - "dist": "mkdirp dist && cd build && tar cvzf ../dist/vega_clue_product.tar.gz *" + "dist": "mkdir dist && cd build && tar cvzf ../dist/vega_clue_product.tar.gz *" }, "dependencies": { - "bluebird": "3.4.6", - "chalk": "1.1.3", - "fs-extra": "^1.0.0", - "generator-phovea": "^2.0.0", - "lodash": "4.17.14", - "mkdirp": "0.5.1", - "yamljs": "0.2.8", - "yargs-parser": "4.2.0", - "yeoman-environment": "1.6.6" + "bluebird": "3.7.2", + "chalk": "3.0.0", + "fs-extra": "^8.1.0", + "generator-phovea": "^4.0.0", + "lodash": "4.17.15", + "yamljs": "0.3.0", + "yargs-parser": "18.0.0", + "yeoman-environment": "2.8.0" }, "name": "vega_clue_product", "description": "", From 6108bd08d2aefb68abc64c62ed2117b7f58fd64b Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 13 Mar 2020 07:51:02 +0100 Subject: [PATCH 2/4] switch branches --- phovea_product.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/phovea_product.json b/phovea_product.json index dc5cc50..5f5075e 100644 --- a/phovea_product.json +++ b/phovea_product.json @@ -3,22 +3,22 @@ "type": "web", "label": "vega_clue", "repo": "Caleydo/vega_clue", - "branch": "master", + "branch": "update_dep_req", "additional": [ { "name": "phovea_core", "repo": "phovea/phovea_core", - "branch": "thinkh/provenance_retrieval" + "branch": "stoiber/provenance_retrieval+typescript_3.8+update_dependencies_38" }, { "name": "phovea_clue", "repo": "phovea/phovea_clue", - "branch": "thinkh/provenance_retrieval" + "branch": "stoiber/provenance_retrieval+typescript_3.8+update_dependencies_38" }, { "name": "phovea_ui", "repo": "phovea/phovea_ui", - "branch": "v2.1.3" + "branch": "develop" } ] }, @@ -31,29 +31,29 @@ { "name": "phovea_security_flask", "repo": "phovea/phovea_security_flask", - "branch": "v2.3.0" + "branch": "develop" }, { "name": "phovea_data_redis", "repo": "phovea/phovea_data_redis", - "branch": "v2.3.0" + "branch": "develop" }, { "name": "phovea_data_mongo", "repo": "phovea/phovea_data_mongo", - "branch": "v2.2.0" + "branch": "develop" }, { "name": "phovea_clue", "repo": "phovea/phovea_clue", - "branch": "thinkh/provenance_retrieval" + "branch": "stoiber/provenance_retrieval+typescript_3.8+update_dependencies_38" } ], "data": [ { "type": "repo", "repo": "Caleydo/vega_clue", - "branch": "master" + "branch": "update_dep_req" } ] } From 7ebe0f7afd414366ca7a282f97c731a26192fdfc Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Mon, 16 Mar 2020 14:37:50 +0100 Subject: [PATCH 3/4] Switch branches in phovea_product.json --- phovea_product.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phovea_product.json b/phovea_product.json index f0e6bfd..29caa02 100644 --- a/phovea_product.json +++ b/phovea_product.json @@ -8,12 +8,12 @@ { "name": "phovea_core", "repo": "phovea/phovea_core", - "branch": "stoiber/provenance_retrieval+typescript_3.8+update_dependencies_38" + "branch": "stoiber/provenance_retrieval" }, { "name": "phovea_clue", "repo": "phovea/phovea_clue", - "branch": "stoiber/provenance_retrieval+typescript_3.8+update_dependencies_38" + "branch": "stoiber/provenance_retrieval" }, { "name": "phovea_ui", @@ -51,7 +51,7 @@ { "name": "phovea_clue", "repo": "phovea/phovea_clue", - "branch": "stoiber/provenance_retrieval+typescript_3.8+update_dependencies_38" + "branch": "stoiber/provenance_retrieval" } ], "data": [ From d5d3ae6cee1b0e3d5d6ba55618af89658c2497e4 Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Mon, 16 Mar 2020 14:39:43 +0100 Subject: [PATCH 4/4] Fix branch name --- phovea_product.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phovea_product.json b/phovea_product.json index 29caa02..13e55bd 100644 --- a/phovea_product.json +++ b/phovea_product.json @@ -8,12 +8,12 @@ { "name": "phovea_core", "repo": "phovea/phovea_core", - "branch": "stoiber/provenance_retrieval" + "branch": "thinkh/provenance_retrieval" }, { "name": "phovea_clue", "repo": "phovea/phovea_clue", - "branch": "stoiber/provenance_retrieval" + "branch": "thinkh/provenance_retrieval" }, { "name": "phovea_ui", @@ -51,7 +51,7 @@ { "name": "phovea_clue", "repo": "phovea/phovea_clue", - "branch": "stoiber/provenance_retrieval" + "branch": "thinkh/provenance_retrieval" } ], "data": [