Repository: tez Updated Branches: refs/heads/TEZ-2980 1f5f1b6f0 -> af3ca10ac
TEZ-3088. Tez UI 2: Licenses of all the packages used by Tez Ui must be documented (sree) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/af3ca10a Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/af3ca10a Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/af3ca10a Branch: refs/heads/TEZ-2980 Commit: af3ca10ac3287ced92b5fa625a414c7343fdda07 Parents: 1f5f1b6 Author: Sreenath Somarajapuram <[email protected]> Authored: Wed Feb 10 23:12:27 2016 +0530 Committer: Sreenath Somarajapuram <[email protected]> Committed: Wed Feb 10 23:12:27 2016 +0530 ---------------------------------------------------------------------- TEZ-2980-CHANGES.txt | 1 + tez-ui2/src/main/resources/META-INF/LICENSE.txt | 45 ++++++++++++-------- tez-ui2/src/main/webapp/bower.json | 19 +++++---- tez-ui2/src/main/webapp/package.json | 43 ++++++++++--------- 4 files changed, 60 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/af3ca10a/TEZ-2980-CHANGES.txt ---------------------------------------------------------------------- diff --git a/TEZ-2980-CHANGES.txt b/TEZ-2980-CHANGES.txt index ec8bc05..9d949ca 100644 --- a/TEZ-2980-CHANGES.txt +++ b/TEZ-2980-CHANGES.txt @@ -35,3 +35,4 @@ ALL CHANGES: TEZ-3080. Tez UI 2: Ensure UI 2 is in-line with UI 1 TEZ-3092. Tez UI 2: Tuneups & Improvements TEZ-3095. Tez UI 2: Tuneups & Improvements + TEZ-3088. Tez UI 2: Licenses of all the packages used by Tez Ui must be documented http://git-wip-us.apache.org/repos/asf/tez/blob/af3ca10a/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 4f0c9d4..25a1ca1 100644 --- a/tez-ui2/src/main/resources/META-INF/LICENSE.txt +++ b/tez-ui2/src/main/resources/META-INF/LICENSE.txt @@ -215,20 +215,30 @@ licenses. The Apache TEZ tez-ui bundles the following files under the MIT License: - - antiscroll v1.0.0 (https://github.com/LearnBoost/antiscroll) - Copyright (c) 2011 Guillermo Rauch <[email protected]> - - bootstrap v3.3.1 (http://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc - - ember v1.7.0 (http://emberjs.com/) - Copyright (c) 2014 Yehuda Katz, Tom Dale and Ember.js contributors - - ember-data v1.0.0-beta.11 (https://github.com/emberjs/data) - Copyright (C) 2011-2014 Tilde, Inc. and contributors, Portions Copyright (C) 2011 LivingSocial Inc. - - ember-json-mapper v1.0.0 (https://github.com/onechiporenko/ember-json-mapper) - Copyright (c) 2014 onechiporenko - - font-awesome css/less files v4.2.0 (http://fontawesome.io/) - Created by Dave Gandy - - handlebars v1.3.0 (http://handlebarsjs.com/) - Copyright (C) 2011-2014 by Yehuda Katz - - jquery v1.10.2 (http://jquery.org) - Copyright 2005, 2014 jQuery Foundation and other contributors - - jquery-mousewheel v3.1.12 (https://github.com/jquery/jquery-mousewheel) - Copyright 2006, 2014 jQuery Foundation and other contributors, https://jquery.org/ - - jquery-ui v1.11 (http://jqueryui.com/) - Copyright 2014 jQuery Foundation and other contributors - - moment v2.10.6 (http://momentjs.com/) - Copyright (c) 2011-2015 Tim Wood, Iskren Chernev, Moment.js contributors - - moment-timezone v0.4.0 (http://momentjs.com/timezone/) - Copyright (c) 2014 Tim Wood - - FileSaver.js master branch #24b303f49213b905ec9062b708f7cd43d56a5dde (https://github.com/eligrey/FileSaver.js) authors : Eli Grey. - - CodeMirror 5.2.0 (https://codemirror.net/) authors: Copyright (C) 2015 by Marijn Haverbeke <[email protected]> and others + - ember v2.2.0 (http://emberjs.com/) - Copyright (c) 2014 Yehuda Katz, Tom Dale and Ember.js contributors + - ember-data v2.1.0 (https://github.com/emberjs/data) - Copyright (C) 2011-2014 Tilde, Inc. and contributors, Portions Copyright (C) 2011 LivingSocial Inc. + - ember-resolver v2.0.3 (https://github.com/ember-cli/ember-resolver) - Copyright (c) 2013 Stefan Penner and Ember App Kit Contributors + - bootstrap v3.3.6 (http://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc + - jquery v2.1.4 (http://jquery.org) - Copyright 2005, 2014 jQuery Foundation and other contributors + - 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 #230de7d (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 + - ember-bootstrap v0.5.1 (https://github.com/kaliber5/ember-bootstrap) - Copyright 2015 kaliber5 GmbH. + - snippet-ss v1.11.0 (https://github.com/sreenaths/snippet-ss) + - em-tgraph v0.0.3 (https://github.com/sreenaths/em-tgraph) + - em-table v0.3.10 (https://github.com/sreenaths/em-table) + - em-helpers v0.5.8 (https://github.com/sreenaths/em-helpers) + - ember-cli-app-version v1.0.0 (https://github.com/EmberSherpa/ember-cli-app-version) - Authored by Taras Mankovski <[email protected]> + - ember-cli-auto-register v1.1.0 (https://github.com/williamsbdev/ember-cli-auto-register) - Copyright © 2015 Brandon Williams http://williamsbdev.com + - ember-cli-content-security-policy v0.4.0 (https://github.com/rwjblue/ember-cli-content-security-policy) + - ember-cli-d3 v1.1.2 (https://github.com/ming-codes/ember-cli-d3) - Authored by Ming Liu + - ember-cli-font-awesome v1.4.0 (https://github.com/martndemus/ember-cli-font-awesome) - Authored by Marten Schilstra <[email protected]> + - ember-cli-jquery-ui 0.0.20 (https://github.com/gaurav0/ember-cli-jquery-ui) - Authored by Gaurav Munjal + - normalize.css v3.0.3 (github.com/necolas/normalize.css) - By Nicolas Gallagher & Jonathan Neal All rights reserved. @@ -257,9 +267,8 @@ THE SOFTWARE. The Apache Tez tez-ui bundles the following files under BSD licenses: (3-clause BSD license) - - D3 v3.4.11 (http://d3js.org/) - Copyright (c) 2010-2014, Michael Bostock - - ember-table v0.2.2 (https://github.com/Addepar/ember-table) - Copyright © 2012 Addepar, Inc. All Rights Reserved. - - zip.js master branch #bfd76c66293305faaf9fcbb65b5ff7fe2dbe621a (https://github.com/gildas-lormeau/zip.js) + - 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) All rights reserved. @@ -295,7 +304,7 @@ POSSIBILITY OF SUCH DAMAGE. The Apache Tez tez-ui bundles the following fonts under the SIL Open Font License v1.1 (OFT) - http://scripts.sil.org/OFL - - font-awesome fonts v4.2.0 (http://fontawesome.io/) - Created by Dave Gandy + - font-awesome fonts v4.5.0 (http://fontawesome.io/) - Created by Dave Gandy SIL OPEN FONT LICENSE http://git-wip-us.apache.org/repos/asf/tez/blob/af3ca10a/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 f0fec1a..87e53ba 100644 --- a/tez-ui2/src/main/webapp/bower.json +++ b/tez-ui2/src/main/webapp/bower.json @@ -9,18 +9,19 @@ "ember-qunit": "0.4.16", "ember-qunit-notifications": "0.1.0", "loader.js": "3.3.0", - "qunit": "~1.19.0", - "more-js": "*", - "bootstrap": "~3.3.5", - "font-awesome": "~4.5.0", + "qunit": "1.19.0", + "more-js": "0.8.2", + "bootstrap": "3.3.6", + "font-awesome": "4.5.0", + "jquery": "2.1.4", "jquery-ui": "1.11.4", - "moment": "^2.8.0", - "moment-timezone": "^0.5.0", + "moment": "2.11.1", + "moment-timezone": "0.5.0", "numeral": "1.5.3", - "snippet-ss": "~1.11.0", - "jquery-mousewheel": "~3.1.13", + "snippet-ss": "1.11.0", + "jquery-mousewheel": "3.1.13", "FileSaver": "#230de7d", "zip.js": "#1bead0a", - "codemirror": "~5.11.0" + "codemirror": "5.11.0" } } http://git-wip-us.apache.org/repos/asf/tez/blob/af3ca10a/tez-ui2/src/main/webapp/package.json ---------------------------------------------------------------------- diff --git a/tez-ui2/src/main/webapp/package.json b/tez-ui2/src/main/webapp/package.json index db2cc77..1393e90 100644 --- a/tez-ui2/src/main/webapp/package.json +++ b/tez-ui2/src/main/webapp/package.json @@ -1,6 +1,7 @@ { "name": "tez-ui", "version": "0.2.0", + "license": "Apache-2.0", "description": "Apache Tez UI", "private": true, "directories": { @@ -21,41 +22,41 @@ "node": ">= 0.10.0" }, "devDependencies": { - "bower": "^1.7.1", - "broccoli-asset-rev": "^2.2.0", - "broccoli-merge-trees": "^1.1.1", - "em-tgraph": "0.0.3", + "bower": "1.7.7", + "broccoli-asset-rev": "2.4.2", + "broccoli-funnel": "1.0.1", + "broccoli-merge-trees": "1.1.1", "ember-bootstrap": "0.5.1", "ember-cli": "1.13.13", - "ember-cli-app-version": "^1.0.0", - "ember-cli-auto-register": "^1.1.0", - "ember-cli-babel": "^5.1.5", + "ember-cli-app-version": "1.0.0", + "ember-cli-auto-register": "1.1.0", + "ember-cli-babel": "5.1.6", "ember-cli-content-security-policy": "0.4.0", "ember-cli-d3": "1.1.2", - "ember-cli-dependency-checker": "^1.1.0", + "ember-cli-dependency-checker": "1.2.0", "ember-cli-font-awesome": "1.4.0", - "ember-cli-htmlbars-inline-precompile": "^0.3.1", - "ember-cli-inject-live-reload": "^1.3.1", + "ember-cli-htmlbars": "1.0.2", + "ember-cli-htmlbars-inline-precompile": "0.3.1", + "ember-cli-inject-live-reload": "1.4.0", "ember-cli-jquery-ui": "0.0.20", + "ember-cli-less": "1.5.3", "ember-cli-moment-shim": "0.7.3", "ember-cli-mousewheel": "0.1.5", "ember-cli-numeral": "0.1.2", - "ember-cli-qunit": "^1.0.4", + "ember-cli-qunit": "1.2.1", "ember-cli-release": "0.2.8", - "ember-cli-sri": "^1.2.0", - "ember-cli-test-info": "^1.0.0", - "ember-cli-uglify": "^1.2.0", + "ember-cli-sri": "1.2.1", + "ember-cli-test-info": "1.0.0", + "ember-cli-uglify": "1.2.0", "ember-data": "2.1.0", - "ember-disable-proxy-controllers": "^1.0.1", - "ember-export-application-global": "^1.0.4", - "ember-resolver": "^2.0.3" + "ember-disable-proxy-controllers": "1.0.1", + "ember-export-application-global": "1.0.5", + "ember-resolver": "2.0.3", + "phantomjs": "1.9.19" }, "dependencies": { - "broccoli-funnel": "^1.0.1", "em-helpers": "0.5.8", "em-table": "0.3.10", - "ember-cli-htmlbars": "^1.0.1", - "ember-cli-less": "^1.4.0", - "phantomjs": "^1.9.19" + "em-tgraph": "0.0.3" } }
