Repository: ambari Updated Branches: refs/heads/branch-2.5 ad7395912 -> 373ed97e1
Revert "AMBARI-20473. Ambari build fails for views project that uses ember-cli. (jaimin)" This reverts commit ad7395912c2893ff58c2860c944ad11dfd2ed9a9. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/910eb39c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/910eb39c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/910eb39c Branch: refs/heads/branch-2.5 Commit: 910eb39c7346533c880eb8660fc6a5bfca96cd7c Parents: ad73959 Author: Jaimin Jetly <[email protected]> Authored: Wed Mar 15 23:46:20 2017 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Wed Mar 15 23:46:20 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 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/910eb39c/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 1aeff17..e13cb0d 100644 --- a/contrib/views/hawq/src/main/resources/ui/package.json +++ b/contrib/views/hawq/src/main/resources/ui/package.json @@ -19,13 +19,9 @@ }, "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/910eb39c/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 cf6dd77..6fe68e2 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,17 +19,11 @@ }, "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/910eb39c/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 ec7b415..5c0da36 100644 --- a/contrib/views/hive20/src/main/resources/ui/package.json +++ b/contrib/views/hive20/src/main/resources/ui/package.json @@ -20,15 +20,11 @@ }, "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/910eb39c/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 aa9c14c..64b3270 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,14 +21,10 @@ }, "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/910eb39c/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 e80c4a9..b5973c1 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/package.json +++ b/contrib/views/wfmanager/src/main/resources/ui/package.json @@ -18,14 +18,10 @@ }, "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",
