Updating dependencies to work on branch-2

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml

@@ -129,9 +129,6 @@
             </executions>
           </plugin>
 
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
           <!-- Install Node, Yarn, Bower & dependencies -->
           <plugin>
             <groupId>com.github.eirslett</groupId>
@@ -171,16 +168,8 @@
                   <arguments>install</arguments>
                 </configuration>
                 <goals>
-                  <goal>exec</goal>
+                  <goal>bower</goal>
                 </goals>
-                <configuration>
-                  <workingDirectory>${webappTgtDir}</workingDirectory>
-                  <executable>bower</executable>
-                  <arguments>
-                    <argument>--allow-root</argument>
-                    <argument>install</argument>
-                  </arguments>
-                </configuration>
               </execution>
             </executions>
           </plugin>

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",

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json

@@ -23,7 +23,7 @@
     "bower-shrinkwrap-resolver-ext": "0.1.0",
     "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.14",
@@ -55,7 +55,7 @@
   "dependencies": {
     "em-helpers": "^0.8.0",
     "em-table": "^0.7.0",
-    "ember-cli-moment-shim": "^3.0.1",
+    "ember-cli-moment-shim": "0.7.3",
     "ember-cli-numeral": "^0.2.0"
   }
 }