Repository: tez Updated Branches: refs/heads/branch-0.8 6d8eb3a59 -> a1960d39d
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/a1960d39 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/a1960d39 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/a1960d39 Branch: refs/heads/branch-0.8 Commit: a1960d39d181e613a453208a2b5fe05a5061bf49 Parents: 6d8eb3a Author: Sreenath Somarajapuram <[email protected]> Authored: Mon May 23 13:02:38 2016 +0530 Committer: Sreenath Somarajapuram <[email protected]> Committed: Mon May 23 13:02:38 2016 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + tez-ui2/src/main/resources/META-INF/LICENSE.txt | 2 +- tez-ui2/src/main/webapp/bower.json | 4 ++-- tez-ui2/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/a1960d39/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5b952c2..c0efb21 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -28,6 +28,7 @@ ALL CHANGES: TEZ-3087. Tez UI 2: Add log links in task & attempt details page TEZ-3146. Tez UI 2: CSS & JS assets in the UI must be minified 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.3: 2016-04-14 http://git-wip-us.apache.org/repos/asf/tez/blob/a1960d39/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 f30c15e..ba6f29b 100644 --- a/tez-ui2/src/main/resources/META-INF/LICENSE.txt +++ b/tez-ui2/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/a1960d39/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 d5c5b4a..63c8030 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", - "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/a1960d39/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 3aac2df..9b52210 100644 --- a/tez-ui2/src/main/webapp/ember-cli-build.js +++ b/tez-ui2/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');
