Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update LICENSE and NOTICE files #3722

Merged
merged 2 commits into from
Jan 31, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions DISCLAIMER
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Apache Pinot (incubating) is an effort undergoing incubation at
the Apache Software Foundation (ASF), sponsored by the Apache
Incubator PMC.

Incubation is required of all newly accepted projects until a
further review indicates that the infrastructure, communications,
and decision making process have stabilized in a manner consistent
with other successful ASF projects.

While incubation status is not necessarily a reflection of the
completeness or stability of the code, it does indicate that the
project has yet to be fully endorsed by the ASF.
30 changes: 27 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -187,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2015 LinkedIn Corp. All rights reserved.
Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -199,4 +198,29 @@
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.
limitations under the License.

------------------------------------------------------------------------------------
This product bundles various third-party components under other open source licenses.
This section summarizes those components and their licenses. See "licenses/" for text
of these licenses.


MIT License
-----------
pinot-controller/src/main/resources/*/js/lib/codemirror/*
pinot-controller/src/main/resources/*/js/lib/foundation/*
pinot-controller/src/main/resources/*/js/lib/angular*
pinot-controller/src/main/resources/*/js/lib/underscore*
pinot-controller/src/main/resources/*/js/lib/jquery-2.1.3.min.js
pinot-controller/src/main/resources/*/js/lib/beautify.js
pinot-controller/src/main/resources/*/js/lib/handlebars.js
pinot-controller/src/main/resources/*/css/lib/codemirror*
pinot-controller/src/main/resources/*/css/lib/foundation*
pinot-controller/src/main/resources/*/css/lib/normalize.css
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since I'm not too familiar with this - are we saying these js css files are checked into the git repo?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those files are the part of the git repo (they are used for some UI components. e.g. pinot query console). After checking in this, I will file a separate PR for handling the build to include LICENSE-binary for the binary release.



BSD 3-Clause
------------
pinot-controller/src/main/resources/*/js/lib/jquery.dataTables.min.js

367 changes: 367 additions & 0 deletions LICENSE-binary

Large diffs are not rendered by default.

42 changes: 5 additions & 37 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,37 +1,5 @@
Pinot
Copyright 2014 The Apache Software Foundation


I. Included Software

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.

This product includes software developed at
Codehaus (http://www.codehaus.org/).
Licensed under the BSD License.

This product includes software developed at
jline (http://jline.sourceforge.net/).
Licensed under the BSD License.

This product includes software developed at
Google (http://www.google.com/).
Licensed under the Apache License 2.0.

This product includes software developed at
snakeyaml (http://www.snakeyaml.org/).
Licensed under the Apache License 2.0.

This product includes software developed at
zkclient (https://github.com/sgroschupf/zkclient).
Licensed under the Apache License 2.0.

This product includes software developed at
eclipse (https://eclipse.org/jetty)
Licensed under the Apache License 2.0.

II. License Summary
- Apache License 2.0
- BSD License
Apache Pinot (incubating)
Copyright 2018 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Loading