tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject tez git commit: TEZ-3201. Tez-UI build broken (sree)
Date Thu, 07 Apr 2016 08:24:41 GMT
Repository: tez
Updated Branches:
  refs/heads/master 27a13fc97 -> 3bb93de65


TEZ-3201. Tez-UI build broken (sree)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/3bb93de6
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/3bb93de6
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/3bb93de6

Branch: refs/heads/master
Commit: 3bb93de65d1439840a369264c9565feab8d273c1
Parents: 27a13fc
Author: Sreenath Somarajapuram <sree@apache.org>
Authored: Thu Apr 7 13:54:05 2016 +0530
Committer: Sreenath Somarajapuram <sree@apache.org>
Committed: Thu Apr 7 13:54:05 2016 +0530

----------------------------------------------------------------------
 CHANGES.txt                                           | 11 ++++++-----
 tez-ui/pom.xml                                        |  4 ++--
 tez-ui2/pom.xml                                       |  2 +-
 tez-ui2/src/main/resources/META-INF/LICENSE.txt       |  4 ++--
 tez-ui2/src/main/webapp/app/utils/download-dag-zip.js |  2 +-
 tez-ui2/src/main/webapp/bower.json                    |  4 ++--
 tez-ui2/src/main/webapp/ember-cli-build.js            |  7 +++++--
 7 files changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/3bb93de6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 415a246..1178d0e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -66,6 +66,12 @@ ALL CHANGES:
   TEZ-3032. DAG start time getting logged using system time instead of recorded time in startTime
field.
   TEZ-3101. Tez UI: Task attempt log link doesn't have the correct protocol.
   TEZ-3143. Tez UI 2: Make the build faster
+  TEZ-3160. Tez UI 2: Swimlane - Create swimlane page & component (sree)
+  TEZ-3170. Tez UI 2: Swimlane - Display computed events, event bars & dependencies (sree)
+  TEZ-3152. Tez UI 2: Build fails when run by multiple users or when node_modules is old
(sree)
+  TEZ-3171. Tez UI 2: Swimlane - Tooltip, zoom & redirection (sree)
+  TEZ-3172. Tez UI: Swimlane - In progress & Shadow (sree)
+  TEZ-3201. Tez-UI build broken (sree)
 
 TEZ-2980: Tez UI 2 - Umbrella:
   TEZ-2982. Tez UI: Create tez-ui2 directory and get a basic dummy page working in ember
2.2
@@ -1897,11 +1903,6 @@ ALL CHANGES
   TEZ-648. Fix Notice file. (hitesh)
   TEZ-642. Fix poms for release. (hitesh)
   TEZ-643. Change getProgress APIs to return some form of progress and 1.0f once the map
or reduce phase complete. (sseth)
-  TEZ-3160. Tez UI 2: Swimlane - Create swimlane page & component (sree)
-  TEZ-3170. Tez UI 2: Swimlane - Display computed events, event bars & dependencies (sree)
-  TEZ-3152. Tez UI 2: Build fails when run by multiple users or when node_modules is old
(sree)
-  TEZ-3171. Tez UI 2: Swimlane - Tooltip, zoom & redirection (sree)
-  TEZ-3172. Tez UI: Swimlane - In progress & Shadow (sree)
 
 Release 0.2.0-incubating: 2013-11-30
 

http://git-wip-us.apache.org/repos/asf/tez/blob/3bb93de6/tez-ui/pom.xml
----------------------------------------------------------------------
diff --git a/tez-ui/pom.xml b/tez-ui/pom.xml
index ef6f86a..0237e69 100644
--- a/tez-ui/pom.xml
+++ b/tez-ui/pom.xml
@@ -29,8 +29,8 @@
   <properties>
     <webappDir>src/main/webapp</webappDir>
     <node.executable>${basedir}/src/main/webapp/node/node</node.executable>
-    <nodeVersion>v0.10.18</nodeVersion>
-    <npmVersion>1.3.8</npmVersion>
+    <nodeVersion>v0.12.2</nodeVersion>
+    <npmVersion>2.15.3</npmVersion>
   </properties>
 
   <build>

http://git-wip-us.apache.org/repos/asf/tez/blob/3bb93de6/tez-ui2/pom.xml
----------------------------------------------------------------------
diff --git a/tez-ui2/pom.xml b/tez-ui2/pom.xml
index 5f75c95..ba1213a 100644
--- a/tez-ui2/pom.xml
+++ b/tez-ui2/pom.xml
@@ -30,7 +30,7 @@
     <webappDir>src/main/webapp</webappDir>
     <node.executable>${basedir}/src/main/webapp/node/node</node.executable>
     <nodeVersion>v0.12.2</nodeVersion>
-    <npmVersion>2.10.0</npmVersion>
+    <npmVersion>2.15.3</npmVersion>
     <skipTests>false</skipTests>
   </properties>
 

http://git-wip-us.apache.org/repos/asf/tez/blob/3bb93de6/tez-ui2/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/tez-ui2/src/main/resources/META-INF/LICENSE.txt b/tez-ui2/src/main/resources/META-INF/LICENSE.txt
index 25a1ca1..54e2532 100644
--- a/tez-ui2/src/main/resources/META-INF/LICENSE.txt
+++ b/tez-ui2/src/main/resources/META-INF/LICENSE.txt
@@ -223,7 +223,7 @@ The Apache TEZ tez-ui bundles the following files under the MIT License:
  - jquery-ui v1.11.4 (http://jqueryui.com/) - Copyright 2014 jQuery Foundation and other
contributors
  - jquery-mousewheel v3.1.13 (https://github.com/jquery/jquery-mousewheel) - Copyright 2006,
2014 jQuery Foundation and other contributors, https://jquery.org/
  - CodeMirror 5.11.0 (https://codemirror.net/) - Copyright (C) 2015 by Marijn Haverbeke <marijnh@gmail.com>
and others
- - FileSaver.js master branch #230de7d (https://github.com/eligrey/FileSaver.js) - Authored
by Eli Grey
+ - FileSaver.js master branch #24b303f49213b905ec9062b708f7cd43d56a5dde (https://github.com/eligrey/FileSaver.js)
- Authored by Eli Grey
  - moment v2.11.1 (http://momentjs.com/) - Copyright (c) 2011-2015 Tim Wood, Iskren Chernev,
Moment.js contributors
  - moment-timezone v0.5.0 (http://momentjs.com/timezone/) - Copyright (c) 2014 Tim Wood
  - font-awesome css/less files v4.5.0 (http://fontawesome.io/) - Created by Dave Gandy
@@ -268,7 +268,7 @@ The Apache Tez tez-ui bundles the following files under BSD licenses:
 
 (3-clause BSD license)
  - D3 v3.5.14 (http://d3js.org/) - Copyright (c) 2010-2014, Michael Bostock
- - zip.js master branch #1bead0a (https://github.com/gildas-lormeau/zip.js)
+ - zip.js master branch #bfd76c66293305faaf9fcbb65b5ff7fe2dbe621a (https://github.com/gildas-lormeau/zip.js)
 
 All rights reserved.
 

http://git-wip-us.apache.org/repos/asf/tez/blob/3bb93de6/tez-ui2/src/main/webapp/app/utils/download-dag-zip.js
----------------------------------------------------------------------
diff --git a/tez-ui2/src/main/webapp/app/utils/download-dag-zip.js b/tez-ui2/src/main/webapp/app/utils/download-dag-zip.js
index 88ea9a4..eeb20ac 100644
--- a/tez-ui2/src/main/webapp/app/utils/download-dag-zip.js
+++ b/tez-ui2/src/main/webapp/app/utils/download-dag-zip.js
@@ -19,7 +19,7 @@
 import Ember from 'ember';
 import DS from 'ember-data';
 
-zip.workerScriptsPath = "/assets/zip/";
+zip.workerScriptsPath = "assets/zip/";
 
 var IO = {
   /* Allow queuing of downloads and then get a callback once all the downloads are done.

http://git-wip-us.apache.org/repos/asf/tez/blob/3bb93de6/tez-ui2/src/main/webapp/bower.json
----------------------------------------------------------------------
diff --git a/tez-ui2/src/main/webapp/bower.json b/tez-ui2/src/main/webapp/bower.json
index 87e53ba..f6cf60c 100644
--- a/tez-ui2/src/main/webapp/bower.json
+++ b/tez-ui2/src/main/webapp/bower.json
@@ -20,8 +20,8 @@
     "numeral": "1.5.3",
     "snippet-ss": "1.11.0",
     "jquery-mousewheel": "3.1.13",
-    "FileSaver": "#230de7d",
-    "zip.js": "#1bead0a",
+    "FileSaver": "https://github.com/eligrey/FileSaver.js.git#24b303f49213b905ec9062b708f7cd43d56a5dde",
+    "zip": "https://github.com/gildas-lormeau/zip.js.git#bfd76c66293305faaf9fcbb65b5ff7fe2dbe621a",
     "codemirror": "5.11.0"
   }
 }

http://git-wip-us.apache.org/repos/asf/tez/blob/3bb93de6/tez-ui2/src/main/webapp/ember-cli-build.js
----------------------------------------------------------------------
diff --git a/tez-ui2/src/main/webapp/ember-cli-build.js b/tez-ui2/src/main/webapp/ember-cli-build.js
index 9e74c80..7386782 100644
--- a/tez-ui2/src/main/webapp/ember-cli-build.js
+++ b/tez-ui2/src/main/webapp/ember-cli-build.js
@@ -29,6 +29,9 @@ module.exports = function(defaults) {
     minifyCSS: {
       enabled: false
     },
+    fingerprint: {
+      enabled: false
+    },
     minifyJS: {
       enabled: false
     }
@@ -39,7 +42,7 @@ module.exports = function(defaults) {
      include: ['*.env'],
      destDir: '/config'
   });
-  var zipWorker = new Funnel('bower_components/zip.js', {
+  var zipWorker = new Funnel('bower_components/zip', {
      srcDir: '/WebContent',
      include: ['z-worker.js', 'deflate.js', 'inflate.js'],
      destDir: '/assets/zip'
@@ -57,7 +60,7 @@ module.exports = function(defaults) {
   app.import('bower_components/more-js/dist/more.js');
 
   app.import('bower_components/FileSaver/FileSaver.js');
-  app.import('bower_components/zip.js/WebContent/zip.js');
+  app.import('bower_components/zip/WebContent/zip.js');
 
   app.import('bower_components/codemirror/lib/codemirror.js');
   app.import('bower_components/codemirror/mode/sql/sql.js');


Mime
View raw message