Apply #407 into master branch #407 addressed https://issues.apache.org/jira/browse/ZEPPELIN-406 and merged into branch-0.5.5 This PR applies it to the master branch
Author: Lee moon soo <[email protected]> Closes #424 from Leemoonsoo/ZEPPELIN-406-master and squashes the following commits: 64b6550 [Lee moon soo] Add apache header and inline json message example into doc ba72645 [Lee moon soo] ZEPPELIN-406 Handle license issue found in 0.5.5-incubating rc2 Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/f435f3e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/f435f3e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/f435f3e4 Branch: refs/heads/master Commit: f435f3e46b7d62cd12c6dc97d84705032e0924ad Parents: 96b7202 Author: Lee moon soo <[email protected]> Authored: Thu Nov 12 19:54:38 2015 +0900 Committer: Lee moon soo <[email protected]> Committed: Fri Nov 13 21:12:36 2015 +0900 ---------------------------------------------------------------------- LICENSE | 72 +- dev/create_release.sh | 5 +- docs/Gemfile | 15 + docs/Gemfile.lock | 3 + docs/assets/bootstrap-3.0.2-dist.zip | Bin 143318 -> 0 bytes .../bootstrap/css/bootstrap.2.2.2.min.css | 782 ------------------- .../img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../bootstrap/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes docs/assets/themes/twitter/css/style.css | 65 -- docs/community.md | 13 + .../development/writingzeppelininterpreter.md | 13 + docs/docs/displaysystem/angular.md | 13 + docs/docs/displaysystem/display.md | 13 + docs/docs/displaysystem/table.md | 13 + docs/docs/index.md | 13 + docs/docs/install/install.md | 13 + docs/docs/install/yarn_install.md | 13 + docs/docs/manual/dynamicform.md | 13 + docs/docs/manual/interpreters.md | 13 + docs/docs/manual/notebookashomepage.md | 13 + docs/docs/pleasecontribute.md | 13 + .../zeppelin-release-0.5.0-incubating.md | 13 + docs/docs/rest-api/rest-interpreter.md | 182 ++++- .../rest-json-interpreter-create-response.json | 1 - .../rest-json/rest-json-interpreter-create.json | 1 - .../rest-json-interpreter-delete-response.json | 1 - .../rest-json/rest-json-interpreter-list.json | 1 - .../rest-json-interpreter-setting.json | 1 - .../rest-json-interpreter-update-response.json | 1 - .../rest-json/rest-json-interpreter-update.json | 1 - .../rest-json-notebook-create-response.json | 1 - .../rest-json/rest-json-notebook-create.json | 1 - .../rest-json-notebook-delete-response.json | 1 - .../rest-json-notebook-list-response.json | 1 - docs/docs/rest-api/rest-notebook.md | 25 +- docs/docs/storage/storage.md | 12 + docs/docs/tutorial/tutorial.md | 14 +- docs/download.md | 13 + docs/index.md | 13 + docs/old_CNAME | 1 - docs/robot.txt | 14 + docs/screenshots.md | 13 + licenses/LICENSE-bootstrap-3.0.2 | 176 +++++ licenses/LICENSE-fontawesome-4.2.0 | 82 ++ licenses/LICENSE-fontawesome-style-4.2.0 | 21 + licenses/LICENSE-jekyll-1.3.0 | 21 + licenses/LICENSE-jekyll-bootstrap-0.3 | 21 + licenses/LICENSE-simple_line_icons-1.0.0 | 21 + pom.xml | 31 +- .../src/assemble/distribution.xml | 3 + zeppelin-distribution/src/bin_license/LICENSE | 176 +++++ zeppelin-distribution/src/bin_license/NOTICE | 153 ++++ .../licenses/LICENSE-AngularJS-1.3.8 | 21 + .../bin_license/licenses/LICENSE-Json3-3.3.1 | 20 + .../licenses/LICENSE-UI-Bootstrap-0.13.0 | 21 + .../bin_license/licenses/LICENSE-UI.ace-0.1.1 | 21 + .../src/bin_license/licenses/LICENSE-ace-1.1.9 | 24 + .../licenses/LICENSE-ace-builds-1.1.9 | 24 + .../licenses/LICENSE-angular-dragdrop-1.0.8 | 21 + .../licenses/LICENSE-angular-elastic-2.4.2 | 21 + .../LICENSE-angular-elastic-input-2.0.1 | 21 + .../licenses/LICENSE-angular-filter-0.5.4 | 9 + .../licenses/LICENSE-angular-websocket-1.0.13 | 21 + .../licenses/LICENSE-angular-xeditable-0.1.8 | 21 + .../licenses/LICENSE-aws-java-sdk-1.10.1 | 63 ++ .../licenses/LICENSE-bcprov-jdk15on-1.51 | 10 + .../licenses/LICENSE-bootstrap-3.2.0 | 21 + .../src/bin_license/licenses/LICENSE-d3-2.10.2 | 26 + .../bin_license/licenses/LICENSE-dom4j-1.6.1 | 40 + .../bin_license/licenses/LICENSE-es5-shim-3.1.0 | 21 + .../src/bin_license/licenses/LICENSE-gson-2.2 | 203 +++++ .../licenses/LICENSE-highlightjs-8.4.0 | 24 + .../licenses/LICENSE-jquery.scrollTo-1.4.13 | 22 + .../bin_license/licenses/LICENSE-lodash-3.9.3 | 22 + .../licenses/LICENSE-ng-sortable-1.1.9 | 21 + .../bin_license/licenses/LICENSE-ngToast-1.5.5 | 8 + .../licenses/LICENSE-nvd3.js-1.1.15-beta | 7 + .../licenses/LICENSE-perfect-scrollbar-0.5.4 | 7 + .../src/bin_license/licenses/LICENSE-postgresql | 29 + .../bin_license/licenses/LICENSE-slf4j-1.7.10 | 21 + .../licenses/LICENSE-slf4j-log4j12-1.7.10 | 21 + 81 files changed, 1999 insertions(+), 926 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/f435f3e4/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 31af032..f609422 100644 --- a/LICENSE +++ b/LICENSE @@ -210,68 +210,38 @@ subcomponents is subject to the terms and conditions of the following licenses. -For the PostgreSQL JDBC driver jar file: - Copyright (c) 1997-2011, PostgreSQL Global Development Group - All rights reserved. - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - 3. Neither the name of the PostgreSQL Global Development Group nor the names - of its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. +======================================================================== + The Open Font License +======================================================================== - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - 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. +The following components are provided under the Open Font License. See project link for details. +The text of each license is also included at licenses/LICENSE-[project]-[version].txt. + (OFT 1.1) Font Awesome v4.2.0 (http://fortawesome.github.io/Font-Awesome/) - http://scripts.sil.org/OFL -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/ +======================================================================== +MIT licenses +======================================================================== +The following components are provided under the MIT License. See project link for details. +The text of each license is also included at licenses/LICENSE-[project]-[version].txt. + (The MIT License) Font Awesome (stylesheet) 4.2.0 (http://fortawesome.github.io/Font-Awesome/) - https://fortawesome.github.io/Font-Awesome/license/ + (The MIT License) Simple line icons v1.0.0 (http://thesabbir.github.io/simple-line-icons/) - https://github.com/thesabbir/simple-line-icons/tree/1.0.0 + (The MIT License) jekyll-bootstrap 0.3.0 (https://github.com/plusjade/jekyll-bootstrap) - https://github.com/plusjade/jekyll-bootstrap + (The MIT License) jekyll 1.3.0 (http://jekyllrb.com/) - https://github.com/jekyll/jekyll/blob/v1.3.0/LICENSE -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/ +======================================================================== +Apache licenses +======================================================================== +The following components are provided under the Apache License. See project link for details. +The text of each license is also included at licenses/LICENSE-[project]-[version].txt. -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/ + (Apache 2.0) Bootstrap v3.0.2 (http://getbootstrap.com/) - https://github.com/twbs/bootstrap/blob/v3.0.2/LICENSE \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/f435f3e4/dev/create_release.sh ---------------------------------------------------------------------- diff --git a/dev/create_release.sh b/dev/create_release.sh index 63fcbad..ac1a33a 100755 --- a/dev/create_release.sh +++ b/dev/create_release.sh @@ -103,9 +103,12 @@ function make_binary_release() { exit 1 fi - # re-create package with proper dir name + # re-create package with proper dir name with binary license cd zeppelin-distribution/target/zeppelin-* mv zeppelin-* zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME} + cat ../../src/bin_license/LICENSE >> zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}/LICENSE + cat ../../src/bin_license/NOTICE >> zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}/NOTICE + cp ../../src/bin_license/licenses/* zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}/licenses/ ${TAR} cvzf zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME}.tgz zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME} # sign bin package http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/f435f3e4/docs/Gemfile ---------------------------------------------------------------------- diff --git a/docs/Gemfile b/docs/Gemfile index 053c27d..655775a 100644 --- a/docs/Gemfile +++ b/docs/Gemfile @@ -1,2 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# source 'https://rubygems.org' gem 'github-pages' http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/f435f3e4/docs/Gemfile.lock ---------------------------------------------------------------------- diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 317f587..170579e 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -56,3 +56,6 @@ PLATFORMS DEPENDENCIES github-pages + +BUNDLED WITH + 1.10.4 http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/f435f3e4/docs/assets/bootstrap-3.0.2-dist.zip ---------------------------------------------------------------------- diff --git a/docs/assets/bootstrap-3.0.2-dist.zip b/docs/assets/bootstrap-3.0.2-dist.zip deleted file mode 100644 index a935f7f..0000000 Binary files a/docs/assets/bootstrap-3.0.2-dist.zip and /dev/null differ
