Repository: incubator-zeppelin Updated Branches: refs/heads/master 0b132133a -> f140c0955
ZEPPELIN-361 Move licese of subcomponents from NOTICE to LICENSE Move license of subcomponents from NOTICE to LICENSE https://issues.apache.org/jira/browse/ZEPPELIN-361 Author: Lee moon soo <[email protected]> This patch had conflicts when merged, resolved by Committer: Lee moon soo <[email protected]> Closes #365 from Leemoonsoo/ZEPPELIN-361 and squashes the following commits: f8ebe84 [Lee moon soo] ZEPPELIN-361 Move licese of subcompoenents from NOTICE to LICENSE Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/f140c095 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/f140c095 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/f140c095 Branch: refs/heads/master Commit: f140c0955be4f0d2978ebb0a93b322ccb99adb4d Parents: 0b13213 Author: Lee moon soo <[email protected]> Authored: Sun Oct 25 15:04:52 2015 +0900 Committer: Lee moon soo <[email protected]> Committed: Wed Oct 28 06:22:06 2015 +0100 ---------------------------------------------------------------------- LICENSE | 40 +++++++++++++++++++++++++++++++++++++++- NOTICE | 45 --------------------------------------------- 2 files changed, 39 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/f140c095/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 9b2413c..31af032 100644 --- a/LICENSE +++ b/LICENSE @@ -202,6 +202,7 @@ limitations under the License. +============================================================================ APACHE ZEPPELIN SUBCOMPONENTS: The Apache Zeppelin project contains subcomponents with separate copyright @@ -209,7 +210,7 @@ subcomponents is subject to the terms and conditions of the following licenses. - For the PostgreSQL JDBC driver jar file: +For the PostgreSQL JDBC driver jar file: Copyright (c) 1997-2011, PostgreSQL Global Development Group All rights reserved. @@ -237,3 +238,40 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +This product contains webfonts from 'Font Awesome', which can be obtains at: + + * LICENSE: + * SIL OFL 1.1 (http://scripts.sil.org/OFL) + * HOMEPAGE: + * http://fortawesome.github.io/Font-Awesome/ + + + +This product contains a stylesheet from 'Font Awesome', which can be obtains at: + + * LICENSE: + * MIT License (http://opensource.org/licenses/mit-license.html) + * HOMEPAGE: + * http://fortawesome.github.io/Font-Awesome/ + + + +This product contains embeddable code editor 'Ace', which can be obtains at: + + * LICENSE: + * BSD (https://github.com/ajaxorg/ace/blob/master/LICENSE) + Copyright (c) 2010, Ajax.org B.V. + All rights reserved. + * HOMEPAGE: + * http://ace.c9.io/ + + + +This product contains 'Simple line icons', which can be obtains at: + + * LICENSE: + * MIT License (http://opensource.org/licenses/mit-license.html) + * HOMEPAGE: + * http://thesabbir.github.io/simple-line-icons/ http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/f140c095/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 2428e14..5b6d272 100644 --- a/NOTICE +++ b/NOTICE @@ -6,48 +6,3 @@ The Apache Software Foundation (http://www.apache.org/). Portions of this software were developed at NFLabs, Inc. (http://www.nflabs.com) - - - -This product contains webfonts from 'Font Awesome', which can be obtains at: - - * LICENSE: - * SIL OFL 1.1 (http://scripts.sil.org/OFL) - * HOMEPAGE: - * http://fortawesome.github.io/Font-Awesome/ - - - -This product contains a stylesheet from 'Font Awesome', which can be obtains at: - - * LICENSE: - * MIT License (http://opensource.org/licenses/mit-license.html) - * HOMEPAGE: - * http://fortawesome.github.io/Font-Awesome/ - - - -This product contains embeddable code editor 'Ace', which can be obtains at: - - * LICENSE: - * BSD (https://github.com/ajaxorg/ace/blob/master/LICENSE) - Copyright (c) 2010, Ajax.org B.V. - All rights reserved. - * HOMEPAGE: - * http://ace.c9.io/ - - - -This product contains 'Simple line icons', which can be obtains at: - - * LICENSE: - * MIT License (http://opensource.org/licenses/mit-license.html) - * HOMEPAGE: - * http://thesabbir.github.io/simple-line-icons/ - - -from https://code.google.com/p/selenium/issues/detail?id=1361 - - -The com.webautomation package contains software developed by Ivan Vasiliev -(https://groups.google.com/forum/#!msg/selenium-developers/PTR_j4xLVRM/k2yVq01Fa7oJ) \ No newline at end of file
