Repository: tez Updated Branches: refs/heads/master 5dd47c685 -> cc68f7b3f
TEZ-3262. Tez UI : zip.js is not having a bower friendly versioning system (sree) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/cc68f7b3 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/cc68f7b3 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/cc68f7b3 Branch: refs/heads/master Commit: cc68f7b3f270ca140eb6d9e11c980861de5a8d24 Parents: 5dd47c6 Author: Sreenath Somarajapuram <[email protected]> Authored: Mon May 23 12:59:59 2016 +0530 Committer: Sreenath Somarajapuram <[email protected]> Committed: Mon May 23 12:59:59 2016 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + tez-ui/src/main/resources/META-INF/LICENSE.txt | 2 +- tez-ui/src/main/webapp/bower.json | 4 ++-- tez-ui/src/main/webapp/ember-cli-build.js | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/cc68f7b3/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 7274b6f..ba7a04e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -36,6 +36,7 @@ ALL CHANGES: TEZ-3254. Tez UI: Consider downloading Hive/Pig explain plans TEZ-3255. Tez UI: Hide swimlane while displaying running DAGs from old versions of Tez TEZ-3259. Tez UI: Build issue - File saver package is not working well with bower + TEZ-3262. Tez UI : zip.js is not having a bower friendly versioning system Release 0.8.4: Unreleased http://git-wip-us.apache.org/repos/asf/tez/blob/cc68f7b3/tez-ui/src/main/resources/META-INF/LICENSE.txt ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/resources/META-INF/LICENSE.txt b/tez-ui/src/main/resources/META-INF/LICENSE.txt index f30c15e..ba6f29b 100644 --- a/tez-ui/src/main/resources/META-INF/LICENSE.txt +++ b/tez-ui/src/main/resources/META-INF/LICENSE.txt @@ -275,7 +275,7 @@ The Apache Tez tez-ui bundles the following files under BSD licenses: (3-clause BSD license) - D3 v3.5.16 (http://d3js.org/) - Copyright (c) 2010-2014, Michael Bostock - - zip.js master branch #bfd76c66293305faaf9fcbb65b5ff7fe2dbe621a (https://github.com/gildas-lormeau/zip.js) - Copyright (c) 2013 Gildas Lormeau + - zip-js v1.0.0 (https://github.com/sreenaths/zip.js) - Copyright (c) 2013 Gildas Lormeau All rights reserved. http://git-wip-us.apache.org/repos/asf/tez/blob/cc68f7b3/tez-ui/src/main/webapp/bower.json ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/bower.json b/tez-ui/src/main/webapp/bower.json index 15c85ee..a803d73 100644 --- a/tez-ui/src/main/webapp/bower.json +++ b/tez-ui/src/main/webapp/bower.json @@ -20,8 +20,8 @@ "numeral": "1.5.3", "snippet-ss": "1.11.0", "jquery-mousewheel": "3.1.13", - "zip": "https://github.com/gildas-lormeau/zip.js.git#bfd76c66293305faaf9fcbb65b5ff7fe2dbe621a";, "codemirror": "5.11.0", - "file-saver.js": "1.20150507.2" + "file-saver.js": "1.20150507.2", + "zip-js": "1.0.0" } } http://git-wip-us.apache.org/repos/asf/tez/blob/cc68f7b3/tez-ui/src/main/webapp/ember-cli-build.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/ember-cli-build.js b/tez-ui/src/main/webapp/ember-cli-build.js index 3aac2df..9b52210 100644 --- a/tez-ui/src/main/webapp/ember-cli-build.js +++ b/tez-ui/src/main/webapp/ember-cli-build.js @@ -47,7 +47,7 @@ module.exports = function(defaults) { include: ['*.env'], destDir: '/config' }); - var zipWorker = new Funnel('bower_components/zip', { + var zipWorker = new Funnel('bower_components/zip-js', { srcDir: '/WebContent', include: ['z-worker.js', 'deflate.js', 'inflate.js'], destDir: '/assets/zip' @@ -65,7 +65,7 @@ module.exports = function(defaults) { app.import('bower_components/more-js/dist/more.js'); app.import('bower_components/file-saver.js/FileSaver.js'); - app.import('bower_components/zip/WebContent/zip.js'); + app.import('bower_components/zip-js/WebContent/zip.js'); app.import('bower_components/codemirror/lib/codemirror.js'); app.import('bower_components/codemirror/mode/sql/sql.js');
