aboutsummaryrefslogtreecommitdiff
path: root/NOTICE
diff options
context:
space:
mode:
authorSean Owen <sowen@cloudera.com>2015-09-28 22:56:43 -0400
committerSean Owen <sowen@cloudera.com>2015-09-28 22:56:43 -0400
commitbf4199e261c3c8dd2970e2a154c97b46fb339f02 (patch)
tree7712b630727f6e349578587cb7dd0b4b3783552f /NOTICE
parentea02e5513a8f9853094d5612c962fc8c1a340f50 (diff)
downloadspark-bf4199e261c3c8dd2970e2a154c97b46fb339f02.tar.gz
spark-bf4199e261c3c8dd2970e2a154c97b46fb339f02.tar.bz2
spark-bf4199e261c3c8dd2970e2a154c97b46fb339f02.zip
[SPARK-10833] [BUILD] Inline, organize BSD/MIT licenses in LICENSE
In the course of https://issues.apache.org/jira/browse/LEGAL-226 it came to light that the guidance at http://www.apache.org/dev/licensing-howto.html#permissive-deps means that permissively-licensed dependencies has a different interpretation than we (er, I) had been operating under. "pointer ... to the license within the source tree" specifically means a copy of the license within Spark's distribution, whereas at the moment, Spark's LICENSE has a pointer to the project's license in the other project's source tree. The remedy is simply to inline all such license references (i.e. BSD/MIT licenses) or include their text in "licenses" subdirectory and point to that. Along the way, we can also treat other BSD/MIT licenses, whose text has been inlined into LICENSE, in the same way. The LICENSE file can continue to provide a helpful list of BSD/MIT licensed projects and a pointer to their sites. This would be over and above including license text in the distro, which is the essential thing. Author: Sean Owen <sowen@cloudera.com> Closes #8919 from srowen/SPARK-10833.
Diffstat (limited to 'NOTICE')
-rw-r--r--NOTICE35
1 files changed, 35 insertions, 0 deletions
diff --git a/NOTICE b/NOTICE
index 452aef2871..7f7769f730 100644
--- a/NOTICE
+++ b/NOTICE
@@ -572,3 +572,38 @@ Copyright 2009-2013 The Apache Software Foundation
Apache Avro IPC
Copyright 2009-2013 The Apache Software Foundation
+
+
+Vis.js
+Copyright 2010-2015 Almende B.V.
+
+Vis.js is dual licensed under both
+
+ * The Apache 2.0 License
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ and
+
+ * The MIT License
+ http://opensource.org/licenses/MIT
+
+Vis.js may be distributed under either license.
+
+
+Vis.js uses and redistributes the following third-party libraries:
+
+- component-emitter
+ https://github.com/component/emitter
+ The MIT License
+
+- hammer.js
+ http://hammerjs.github.io/
+ The MIT License
+
+- moment.js
+ http://momentjs.com/
+ The MIT License
+
+- keycharm
+ https://github.com/AlexDM0/keycharm
+ The MIT License \ No newline at end of file