diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml index 22031fa43b7..ae7ab0d3c71 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml @@ -32,8 +32,8 @@ pom ${basedir}/target/src/main/webapp node - v0.12.2 - 2.10.0 + v4.4.5 + 2.15.5 false @@ -120,41 +120,47 @@ + + com.github.eirslett + frontend-maven-plugin + + ${webappTgtDir} + + + + generate-sources + install node and npm + + install-node-and-npm + + + ${nodeVersion} + ${npmVersion} + + + + generate-sources + npm install + + npm + + + + generate-sources + bower install + + bower + + + + + exec-maven-plugin org.codehaus.mojo - - generate-sources - npm install - - exec - - - ${webappTgtDir} - npm - - install - - - - - generate-sources - bower install - - exec - - - ${webappTgtDir} - bower - - --allow-root - install - - - ember build generate-sources diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json index fe5f289ad8f..e1ab943fc18 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json @@ -12,6 +12,8 @@ "loader.js": "3.3.0", "qunit": "1.19.0", "jquery-ui": "1.11.4", + "moment": "2.12.0", + "moment-timezone": "0.5.0", "more-js": "0.8.2", "bootstrap": "3.3.6", "d3": "~3.5.6", diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json index 4cd0fdc18ad..573e5051283 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json @@ -18,12 +18,13 @@ "author": "", "license": "Apache", "devDependencies": { + "bower": "1.7.7", "broccoli-asset-rev": "2.4.2", "broccoli-funnel": "1.0.1", - "em-table": "0.7.0", + "broccoli-merge-trees": "1.1.1", "ember-array-contains-helper": "1.0.2", "ember-bootstrap": "0.5.1", - "ember-cli": "1.13.13", + "ember-cli": "^1.13.13", "ember-cli-app-version": "1.0.0", "ember-cli-babel": "5.1.6", "ember-cli-content-security-policy": "0.4.0", @@ -33,6 +34,8 @@ "ember-cli-ic-ajax": "0.2.1", "ember-cli-inject-live-reload": "1.4.0", "ember-cli-jquery-ui": "0.0.20", + "ember-cli-moment-shim": "0.7.3", + "ember-cli-numeral": "^0.2.0", "ember-cli-qunit": "1.2.1", "ember-cli-release": "0.2.8", "ember-cli-sri": "1.2.1", @@ -48,8 +51,6 @@ }, "dependencies": { "em-helpers": "^0.8.0", - "em-table": "^0.7.0", - "ember-cli-moment-shim": "^3.0.1", - "ember-cli-numeral": "^0.2.0" + "em-table": "^0.7.0" } }