Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 db4aef04e -> 1b32cd042


AMBARI-18245 Upgrade node to version 4.x (zhewang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1b32cd04
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1b32cd04
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1b32cd04

Branch: refs/heads/branch-2.5
Commit: 1b32cd0427e4a7de0cc5af65746d620cb2db448c
Parents: db4aef0
Author: Zhe (Joe) Wang <zhew...@apache.org>
Authored: Tue Oct 18 17:19:42 2016 -0700
Committer: Zhe (Joe) Wang <zhew...@apache.org>
Committed: Tue Oct 18 17:24:32 2016 -0700

----------------------------------------------------------------------
 .gitignore                                      |  1 +
 ambari-admin/pom.xml                            |  2 +-
 .../main/resources/ui/admin-web/package.json    |  2 +-
 ambari-web/app/styles/common.less               | 10 ++--
 ambari-web/karma.conf.js                        |  4 +-
 ambari-web/package.json                         |  9 ++--
 ambari-web/pom.xml                              | 49 ++++++++++++++++----
 contrib/views/capacity-scheduler/pom.xml        |  4 +-
 .../src/main/resources/ui/package.json          |  2 +-
 contrib/views/files/pom.xml                     |  4 +-
 contrib/views/hawq/pom.xml                      |  2 +-
 contrib/views/hive-next/pom.xml                 |  4 +-
 .../src/main/resources/ui/hive-web/package.json |  2 +-
 contrib/views/hive/pom.xml                      |  4 +-
 .../src/main/resources/ui/hive-web/package.json |  2 +-
 contrib/views/hueambarimigration/pom.xml        |  4 +-
 contrib/views/jobs/pom.xml                      |  4 +-
 contrib/views/pig/pom.xml                       |  4 +-
 .../src/main/resources/ui/pig-web/package.json  |  2 +-
 contrib/views/wfmanager/pom.xml                 |  4 +-
 20 files changed, 75 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index d9f23de..43edfd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ target
 /ambari-web/npm-debug.log
 /ambari-web/public/
 /ambari-web/node_modules/
+/ambari-web/node/
 *.pyc
 *.py~
 *.iml

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/ambari-admin/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index e42e5a5..97d5fd4 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -63,7 +63,7 @@
         <artifactId>frontend-maven-plugin</artifactId>
         <version>0.0.16</version>
         <configuration>
-          <nodeVersion>v0.10.44</nodeVersion>
+          <nodeVersion>v4.5.0</nodeVersion>
           <npmVersion>2.15.0</npmVersion>
           <workingDirectory>src/main/resources/ui/admin-web/</workingDirectory>
         </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/ambari-admin/src/main/resources/ui/admin-web/package.json
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/package.json 
b/ambari-admin/src/main/resources/ui/admin-web/package.json
index 42f584e..efcd9d4 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/package.json
+++ b/ambari-admin/src/main/resources/ui/admin-web/package.json
@@ -24,7 +24,7 @@
     "karma-jasmine": "0.1.5",
     "karma-ng-html2js-preprocessor": "^0.1.0",
     "karma-phantomjs-launcher": "0.1",
-    "phantomjs": "1.9.10",
+    "phantomjs": "1.9.20",
     "protractor": "1.0.0"
   },
   "scripts": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/ambari-web/app/styles/common.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/common.less 
b/ambari-web/app/styles/common.less
index bc11d4d..7941fc7 100644
--- a/ambari-web/app/styles/common.less
+++ b/ambari-web/app/styles/common.less
@@ -47,19 +47,19 @@
 @spinner-small-width: 30px;
 @spinner-small-height: 30px;
 
-(~".@{health-status-red-icon}") {
+.@{health-status-red-icon} {
   color: @health-status-red;
 }
-(~".@{health-status-green-icon}") {
+.@{health-status-green-icon} {
   color: @health-status-green;
 }
-(~".@{health-status-yellow-icon}") {
+.@{health-status-yellow-icon} {
   color: @health-status-yellow;
 }
-(~".@{health-status-orange-icon}") {
+.@{health-status-orange-icon} {
   color: @health-status-orange;
 }
-(~".@{maintenance-icon}") {
+.@{maintenance-icon} {
   color: @maintenance-black;
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/ambari-web/karma.conf.js
----------------------------------------------------------------------
diff --git a/ambari-web/karma.conf.js b/ambari-web/karma.conf.js
index 3c79675..e144a84 100644
--- a/ambari-web/karma.conf.js
+++ b/ambari-web/karma.conf.js
@@ -28,7 +28,7 @@ module.exports = function(config) {
       'karma-sinon',
       'karma-phantomjs-launcher',
       'karma-coverage',
-      'karma-ember-precompiler-brunch',
+      'karma-ember-precompile-brunch',
       'karma-commonjs-require'
     ],
 
@@ -96,7 +96,7 @@ module.exports = function(config) {
       'app/assets/test/tests.js'
     ],
 
-    emberPrecompilerBrunchPreprocessor: {
+    emberPrecompileBrunchPreprocessor: {
       jqueryPath: 'vendor/scripts/jquery-1.7.2.min.js',
       emberPath: 'vendor/scripts/ember-latest.js',
       handlebarsPath: 'vendor/scripts/handlebars-1.0.0.beta.6.js'

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/ambari-web/package.json
----------------------------------------------------------------------
diff --git a/ambari-web/package.json b/ambari-web/package.json
index 550d293..ad0bce4 100644
--- a/ambari-web/package.json
+++ b/ambari-web/package.json
@@ -8,11 +8,12 @@
     "url": 
"https://git-wip-us.apache.org/repos/asf/ambari/repo?p=ambari.git;a=summary";
   },
   "dependencies": {
+    "brunch": "1.7.20",
     "javascript-brunch": ">= 1.0 < 1.5",
     "css-brunch": ">= 1.0 < 1.5",
     "uglify-js-brunch": ">= 1.0 < 1.5",
     "clean-css-brunch": ">= 1.0 < 1.5",
-    "ember-precompiler-brunch": ">= 1.0 < 1.5",
+    "ember-precompile-brunch": "^0.1.1",
     "ember-radio-button": "0.1.2",
     "less-brunch": ">= 1.0 < 1.5",
     "cssstyle": "0.2.3"
@@ -25,20 +26,20 @@
     "sinon":"=1.7.3",
     "sinon-chai":"~2.5.0",
     "express":"2.5.8",
-    "karma": "=0.11.14",
+    "karma": ">=0.11.14",
     "karma-mocha": "0.1.1",
     "karma-chai": "~0.1.0",
     "karma-sinon": "~1.0.2",
     "karma-phantomjs-launcher": "0.1.3",
     "karma-coverage": "~0.2.0",
     "karma-commonjs-require": "~0.0.1",
-    "karma-ember-precompiler-brunch": "~0.0.1"
+    "karma-ember-precompile-brunch": "^0.0.1"
   },
   "scripts": {
     "start": "brunch watch --server",
     "test": "mocha-phantomjs -R min public/test/test.html"
   },
   "engines": {
-    "node": "~0.6.10 || 0.8 || 0.9 || 0.10"
+    "node": "^4.0.0"
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/ambari-web/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml
index 1c832c8..fa47d20 100644
--- a/ambari-web/pom.xml
+++ b/ambari-web/pom.xml
@@ -121,28 +121,55 @@
               <commandlineArgs>${args.mkdir} public</commandlineArgs>
             </configuration>
           </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.github.eirslett</groupId>
+        <artifactId>frontend-maven-plugin</artifactId>
+        <version>0.0.16</version>
+        <configuration>
+          <nodeVersion>v4.5.0</nodeVersion>
+          <npmVersion>2.15.0</npmVersion>
+          <workingDirectory>${basedir}</workingDirectory>
+        </configuration>
+        <executions>
           <execution>
-            <id>compile-npm</id>
-            <phase>compile</phase>
+            <id>install node and npm</id>
+            <phase>generate-sources</phase>
             <goals>
-              <goal>exec</goal>
+              <goal>install-node-and-npm</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>npm install</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>npm</goal>
             </goals>
             <configuration>
-              <executable>${executable.npm}</executable>
-              <workingDirectory>${basedir}</workingDirectory>
-              <commandlineArgs>${args.npm} install</commandlineArgs>
+              <arguments>install</arguments>
             </configuration>
           </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
           <execution>
-            <id>compile-brunch</id>
-            <phase>compile</phase>
+            <id>Brunch build</id>
+            <phase>generate-resources</phase>
             <goals>
               <goal>exec</goal>
             </goals>
             <configuration>
-              <executable>${executable.brunch}</executable>
               <workingDirectory>${basedir}</workingDirectory>
-              <commandlineArgs>${args.brunch} build</commandlineArgs>
+              <executable>${basedir}/node/${node.executable}</executable>
+              <arguments>
+                <argument>node_modules/brunch/bin/brunch</argument>
+                <argument>build</argument>
+              </arguments>
             </configuration>
           </execution>
           <execution>
@@ -291,6 +318,7 @@
         <executable.brunch>cmd</executable.brunch>
         <executable.gzip>${basedir}\gzip-content.cmd</executable.gzip>
         <args.brunch>/C brunch</args.brunch>
+        <node.executable>node.exe</node.executable>
         <executable.mkdir>cmd</executable.mkdir>
         <args.mkdir>/C mkdir</args.mkdir>
         <executable.npm>cmd</executable.npm>
@@ -315,6 +343,7 @@
         <executable.brunch>brunch</executable.brunch>
         <executable.gzip>gzip</executable.gzip>
         <args.brunch></args.brunch>
+        <node.executable>node</node.executable>
         <executable.mkdir>mkdir</executable.mkdir>
         <args.mkdir></args.mkdir>
         <executable.npm>npm</executable.npm>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/contrib/views/capacity-scheduler/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/capacity-scheduler/pom.xml 
b/contrib/views/capacity-scheduler/pom.xml
index da0317d..2205c83 100644
--- a/contrib/views/capacity-scheduler/pom.xml
+++ b/contrib/views/capacity-scheduler/pom.xml
@@ -133,8 +133,8 @@
             <!-- optional: default phase is "generate-resources" -->
             <phase>initialize</phase>
             <configuration>
-                <nodeVersion>v0.10.26</nodeVersion>
-                <npmVersion>1.4.3</npmVersion>
+                <nodeVersion>v4.5.0</nodeVersion>
+                <npmVersion>2.15.0</npmVersion>
             </configuration>
           </execution>
           <execution>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/contrib/views/capacity-scheduler/src/main/resources/ui/package.json
----------------------------------------------------------------------
diff --git 
a/contrib/views/capacity-scheduler/src/main/resources/ui/package.json 
b/contrib/views/capacity-scheduler/src/main/resources/ui/package.json
index 2cdc672..0b00664 100644
--- a/contrib/views/capacity-scheduler/src/main/resources/ui/package.json
+++ b/contrib/views/capacity-scheduler/src/main/resources/ui/package.json
@@ -21,7 +21,7 @@
     "bower": "^1.2.8",
     "brunch": "^1.7.13",
     "scaffolt": "^0.4.3",
-    "ember-precompiler-brunch": "^1.5.1",
+    "ember-precompile-brunch": "^0.1.0",
     "less-brunch": "^1.7.2"
   },
   "devDependencies": {},

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/contrib/views/files/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml
index f895e17..b08d14d 100644
--- a/contrib/views/files/pom.xml
+++ b/contrib/views/files/pom.xml
@@ -155,8 +155,8 @@
         <artifactId>frontend-maven-plugin</artifactId>
         <version>0.0.16</version>
         <configuration>
-          <nodeVersion>v0.12.2</nodeVersion>
-          <npmVersion>1.4.8</npmVersion>
+          <nodeVersion>v4.5.0</nodeVersion>
+          <npmVersion>2.15.0</npmVersion>
           <workingDirectory>src/main/resources/ui/</workingDirectory>
         </configuration>
         <executions>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/contrib/views/hawq/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/hawq/pom.xml b/contrib/views/hawq/pom.xml
index 391d0c1..a7c9acf 100644
--- a/contrib/views/hawq/pom.xml
+++ b/contrib/views/hawq/pom.xml
@@ -85,7 +85,7 @@
         <groupId>com.github.eirslett</groupId>
         <artifactId>frontend-maven-plugin</artifactId>
         <configuration>
-          <nodeVersion>v0.10.44</nodeVersion>
+          <nodeVersion>v4.5.0</nodeVersion>
           <npmVersion>2.15.0</npmVersion>
           <workingDirectory>${ui.dir}</workingDirectory>
         </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/contrib/views/hive-next/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/hive-next/pom.xml b/contrib/views/hive-next/pom.xml
index a4ec01b..0efa235 100644
--- a/contrib/views/hive-next/pom.xml
+++ b/contrib/views/hive-next/pom.xml
@@ -254,8 +254,8 @@
         <artifactId>frontend-maven-plugin</artifactId>
         <version>0.0.16</version>
         <configuration>
-          <nodeVersion>v0.12.2</nodeVersion>
-          <npmVersion>1.4.8</npmVersion>
+          <nodeVersion>v4.5.0</nodeVersion>
+          <npmVersion>2.15.0</npmVersion>
           <workingDirectory>src/main/resources/ui/hive-web/</workingDirectory>
         </configuration>
         <executions>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/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 595b1f2..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
@@ -23,7 +23,7 @@
     "body-parser": "^1.2.0",
     "bower": ">= 1.3.12",
     "broccoli-asset-rev": "^2.0.0",
-    "broccoli-sass": "0.6.3",
+    "broccoli-sass": "^0.6.3",
     "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/1b32cd04/contrib/views/hive/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/hive/pom.xml b/contrib/views/hive/pom.xml
index da6fee5..3f58781 100644
--- a/contrib/views/hive/pom.xml
+++ b/contrib/views/hive/pom.xml
@@ -247,8 +247,8 @@
         <artifactId>frontend-maven-plugin</artifactId>
         <version>0.0.16</version>
         <configuration>
-          <nodeVersion>v0.12.2</nodeVersion>
-          <npmVersion>1.4.8</npmVersion>
+          <nodeVersion>v4.5.0</nodeVersion>
+          <npmVersion>2.15.0</npmVersion>
           <workingDirectory>src/main/resources/ui/hive-web/</workingDirectory>
         </configuration>
         <executions>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/contrib/views/hive/src/main/resources/ui/hive-web/package.json
----------------------------------------------------------------------
diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/package.json 
b/contrib/views/hive/src/main/resources/ui/hive-web/package.json
index 595b1f2..6fe68e2 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/package.json
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/package.json
@@ -23,7 +23,7 @@
     "body-parser": "^1.2.0",
     "bower": ">= 1.3.12",
     "broccoli-asset-rev": "^2.0.0",
-    "broccoli-sass": "0.6.3",
+    "broccoli-sass": "^0.6.3",
     "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/1b32cd04/contrib/views/hueambarimigration/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/hueambarimigration/pom.xml 
b/contrib/views/hueambarimigration/pom.xml
index 43eaeed..f25e6b2 100644
--- a/contrib/views/hueambarimigration/pom.xml
+++ b/contrib/views/hueambarimigration/pom.xml
@@ -170,8 +170,8 @@
         <artifactId>frontend-maven-plugin</artifactId>
         <version>0.0.16</version>
         <configuration>
-          <nodeVersion>v0.12.2</nodeVersion>
-          <npmVersion>1.4.8</npmVersion>
+          <nodeVersion>v4.5.0</nodeVersion>
+          <npmVersion>2.15.0</npmVersion>
           
<workingDirectory>${project.basedir}/src/main/resources/ui/hueambarimigration-view/</workingDirectory>
         </configuration>
         <executions>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/contrib/views/jobs/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/jobs/pom.xml b/contrib/views/jobs/pom.xml
index 7f2bbfc..cc589e8 100644
--- a/contrib/views/jobs/pom.xml
+++ b/contrib/views/jobs/pom.xml
@@ -65,8 +65,8 @@
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>0.0.16</version>
                 <configuration>
-                    <nodeVersion>v0.10.26</nodeVersion>
-                    <npmVersion>1.4.3</npmVersion>
+                    <nodeVersion>v4.5.0</nodeVersion>
+                    <npmVersion>2.15.0</npmVersion>
                     <workingDirectory>src/main/resources/ui</workingDirectory>
                 </configuration>
                 <executions>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/contrib/views/pig/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml
index fb2da07..ff2ee4a 100644
--- a/contrib/views/pig/pom.xml
+++ b/contrib/views/pig/pom.xml
@@ -180,8 +180,8 @@
         <artifactId>frontend-maven-plugin</artifactId>
         <version>0.0.16</version>
         <configuration>
-          <nodeVersion>v0.10.26</nodeVersion>
-          <npmVersion>1.4.3</npmVersion>
+          <nodeVersion>v4.5.0</nodeVersion>
+          <npmVersion>2.15.0</npmVersion>
           <workingDirectory>${ui.directory}</workingDirectory>
         </configuration>
         <executions>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/contrib/views/pig/src/main/resources/ui/pig-web/package.json
----------------------------------------------------------------------
diff --git a/contrib/views/pig/src/main/resources/ui/pig-web/package.json 
b/contrib/views/pig/src/main/resources/ui/pig-web/package.json
index 3221483..5468a3f 100644
--- a/contrib/views/pig/src/main/resources/ui/pig-web/package.json
+++ b/contrib/views/pig/src/main/resources/ui/pig-web/package.json
@@ -14,7 +14,7 @@
     "css-brunch": ">= 1.0 < 1.8",
     "uglify-js-brunch": ">= 1.0 < 1.8",
     "bower": ">= 1.2.0",
-    "ember-precompiler-brunch": ">= 1.5.0",
+    "ember-precompile-brunch": "^0.1.0",
     "less-brunch": "~1.7.1",
     "scaffolt": "^0.4.3"
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b32cd04/contrib/views/wfmanager/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/pom.xml b/contrib/views/wfmanager/pom.xml
index a40b7f2..1e910e2 100644
--- a/contrib/views/wfmanager/pom.xml
+++ b/contrib/views/wfmanager/pom.xml
@@ -159,8 +159,8 @@
                                <artifactId>frontend-maven-plugin</artifactId>
                                <version>1.0</version>
                                <configuration>
-                                       <nodeVersion>v0.12.2</nodeVersion>
-                                       <npmVersion>1.4.8</npmVersion>
+                                       <nodeVersion>v4.5.0</nodeVersion>
+                                       <npmVersion>2.15.0</npmVersion>
                                        
<workingDirectory>src/main/resources/ui/</workingDirectory>
                                </configuration>
                                <executions>

Reply via email to