Repository: tez Updated Branches: refs/heads/branch-0.8 0a02dbe18 -> 6e02c5c70
TEZ-3259. Tez UI: Build issue - File saver package is not working well with bower (sree) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/6e02c5c7 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/6e02c5c7 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/6e02c5c7 Branch: refs/heads/branch-0.8 Commit: 6e02c5c70c6de4d99bd61e88f65b20e6b9aaf68b Parents: 0a02dbe Author: Sreenath Somarajapuram <[email protected]> Authored: Tue May 17 17:57:34 2016 +0530 Committer: Sreenath Somarajapuram <[email protected]> Committed: Tue May 17 17:57:34 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 | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/6e02c5c7/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5833f06..ae490dc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -23,6 +23,7 @@ ALL CHANGES: TEZ-3210. Tez UI 2: license should account for numeral, more-js, loader.js , etc 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 Release 0.8.3: 2016-04-14 http://git-wip-us.apache.org/repos/asf/tez/blob/6e02c5c7/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 708d33f..f30c15e 100644 --- a/tez-ui2/src/main/resources/META-INF/LICENSE.txt +++ b/tez-ui2/src/main/resources/META-INF/LICENSE.txt @@ -224,7 +224,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 <[email protected]> and others - - FileSaver.js master branch #24b303f49213b905ec9062b708f7cd43d56a5dde (https://github.com/eligrey/FileSaver.js) - Authored by Eli Grey + - file-saver.js v1.20150507.2 (https://github.com/Teleborder/FileSaver.js) - Authored by Eli Grey - moment v2.12.0 (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 http://git-wip-us.apache.org/repos/asf/tez/blob/6e02c5c7/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 4b0d01b..d5c5b4a 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": "https://github.com/eligrey/FileSaver.js.git#24b303f49213b905ec9062b708f7cd43d56a5dde";, "zip": "https://github.com/gildas-lormeau/zip.js.git#bfd76c66293305faaf9fcbb65b5ff7fe2dbe621a";, - "codemirror": "5.11.0" + "codemirror": "5.11.0", + "file-saver.js": "1.20150507.2" } } http://git-wip-us.apache.org/repos/asf/tez/blob/6e02c5c7/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 d380982..3aac2df 100644 --- a/tez-ui2/src/main/webapp/ember-cli-build.js +++ b/tez-ui2/src/main/webapp/ember-cli-build.js @@ -64,7 +64,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/file-saver.js/FileSaver.js'); app.import('bower_components/zip/WebContent/zip.js'); app.import('bower_components/codemirror/lib/codemirror.js');
