Repository: ambari Updated Branches: refs/heads/branch-2.5 9e30137c6 -> ad7395912
AMBARI-20473. Ambari build fails for views project that uses ember-cli. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ad739591 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ad739591 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ad739591 Branch: refs/heads/branch-2.5 Commit: ad7395912c2893ff58c2860c944ad11dfd2ed9a9 Parents: 9e30137 Author: Jaimin Jetly <[email protected]> Authored: Wed Mar 15 23:17:11 2017 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Wed Mar 15 23:17:11 2017 -0700 ---------------------------------------------------------------------- contrib/views/hawq/src/main/resources/ui/package.json | 4 ++++ .../hive-next/src/main/resources/ui/hive-web/package.json | 6 ++++++ contrib/views/hive20/src/main/resources/ui/package.json | 4 ++++ .../src/main/resources/ui/hueambarimigration-view/package.json | 4 ++++ contrib/views/wfmanager/src/main/resources/ui/package.json | 4 ++++ 5 files changed, 22 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ad739591/contrib/views/hawq/src/main/resources/ui/package.json ---------------------------------------------------------------------- diff --git a/contrib/views/hawq/src/main/resources/ui/package.json b/contrib/views/hawq/src/main/resources/ui/package.json index e13cb0d..1aeff17 100644 --- a/contrib/views/hawq/src/main/resources/ui/package.json +++ b/contrib/views/hawq/src/main/resources/ui/package.json @@ -19,9 +19,13 @@ }, "author": "", "license": "MIT", + "peerDependencies": { + "async-disk-cache": "~1.0.0" + }, "devDependencies": { "bower": "1.7.2", "broccoli-asset-rev": "^2.2.0", + "async-disk-cache": "~1.0.0", "ember-cli": "2.4.2", "ember-cli-app-version": "^1.0.0", "ember-cli-babel": "^5.1.5", http://git-wip-us.apache.org/repos/asf/ambari/blob/ad739591/contrib/views/hive-next/src/main/resources/ui/hive-web/package.json ---------------------------------------------------------------------- diff --git a/contrib/views/hive-next/src/main/resources/ui/hive-web/package.json b/contrib/views/hive-next/src/main/resources/ui/hive-web/package.json index 6fe68e2..cf6dd77 100644 --- a/contrib/views/hive-next/src/main/resources/ui/hive-web/package.json +++ b/contrib/views/hive-next/src/main/resources/ui/hive-web/package.json @@ -19,11 +19,17 @@ }, "author": "", "license": "MIT", + "peerDependencies": { + "async-disk-cache": "~1.0.0", + "merge-trees": "~1.0.1" + }, "devDependencies": { "body-parser": "^1.2.0", "bower": ">= 1.3.12", "broccoli-asset-rev": "^2.0.0", "broccoli-sass": "^0.6.3", + "async-disk-cache": "~1.0.0", + "merge-trees": "~1.0.1", "ember-cli": "0.2.2", "ember-cli-autoprefixer": "0.4.1", "ember-cli-blanket": "^0.5.0", http://git-wip-us.apache.org/repos/asf/ambari/blob/ad739591/contrib/views/hive20/src/main/resources/ui/package.json ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/package.json b/contrib/views/hive20/src/main/resources/ui/package.json index 5c0da36..ec7b415 100644 --- a/contrib/views/hive20/src/main/resources/ui/package.json +++ b/contrib/views/hive20/src/main/resources/ui/package.json @@ -20,11 +20,15 @@ }, "author": "", "license": "MIT", + "peerDependencies": { + "async-disk-cache": "~1.0.0" + }, "devDependencies": { "bootstrap-daterangepicker": "2.1.24", "bower": "^1.7.9", "broccoli-asset-rev": "^2.4.2", "ember-ajax": "^2.0.1", + "async-disk-cache": "~1.0.0", "ember-cli": "2.7.0", "ember-cli-app-version": "^1.0.0", "ember-cli-babel": "^5.1.6", http://git-wip-us.apache.org/repos/asf/ambari/blob/ad739591/contrib/views/hueambarimigration/src/main/resources/ui/hueambarimigration-view/package.json ---------------------------------------------------------------------- diff --git a/contrib/views/hueambarimigration/src/main/resources/ui/hueambarimigration-view/package.json b/contrib/views/hueambarimigration/src/main/resources/ui/hueambarimigration-view/package.json index 64b3270..aa9c14c 100644 --- a/contrib/views/hueambarimigration/src/main/resources/ui/hueambarimigration-view/package.json +++ b/contrib/views/hueambarimigration/src/main/resources/ui/hueambarimigration-view/package.json @@ -21,10 +21,14 @@ }, "author": "", "license": "MIT", + "peerDependencies": { + "async-disk-cache": "~1.0.0" + }, "devDependencies": { "bower": "1.7.2", "broccoli-asset-rev": "^2.4.2", "ember-ajax": "0.7.1", + "async-disk-cache": "~1.0.0", "ember-cli": "2.4.3", "ember-cli-app-version": "^1.0.0", "ember-cli-auto-complete": "^0.2.1", http://git-wip-us.apache.org/repos/asf/ambari/blob/ad739591/contrib/views/wfmanager/src/main/resources/ui/package.json ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/package.json b/contrib/views/wfmanager/src/main/resources/ui/package.json index b5973c1..e80c4a9 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/package.json +++ b/contrib/views/wfmanager/src/main/resources/ui/package.json @@ -18,10 +18,14 @@ }, "author": "", "license": "MIT", + "peerDependencies": { + "async-disk-cache": "~1.0.0" + }, "devDependencies": { "bower": "^1.7.7", "broccoli-asset-rev": "^2.2.0", "ember-ajax": "0.7.1", + "async-disk-cache": "~1.0.0", "ember-cli": "2.3.0", "ember-cli-app-version": "^1.0.0", "ember-cli-babel": "^5.1.5",
