[2/2] spark git commit: [SPARK-10833] [BUILD] Inline, organize BSD/MIT licenses in LICENSE

2015-09-28 Thread srowen 
[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 

Closes #8919 from srowen/SPARK-10833.

(cherry picked from commit bf4199e261c3c8dd2970e2a154c97b46fb339f02)
Signed-off-by: Sean Owen 


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9b3014bc
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9b3014bc
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9b3014bc

Branch: refs/heads/branch-1.5
Commit: 9b3014bc4e0dd2bcfbd7e42af83753393b74a760
Parents: a367840
Author: Sean Owen 
Authored: Mon Sep 28 22:56:43 2015 -0400
Committer: Sean Owen 
Committed: Mon Sep 28 22:56:59 2015 -0400

--
 LICENSE | 699 +--
 NOTICE  |  35 +
 .../apache/spark/util/collection/TimSort.java   |  18 +
 licenses/LICENSE-AnchorJS.txt   |  21 +
 licenses/LICENSE-DPark.txt  |  30 +
 licenses/LICENSE-Mockito.txt|  21 +
 licenses/LICENSE-SnapTree.txt   |  35 +
 licenses/LICENSE-antlr.txt  |   8 +
 licenses/LICENSE-boto.txt   |  20 +
 licenses/LICENSE-cloudpickle.txt|  28 +
 licenses/LICENSE-d3.min.js.txt  |  26 +
 licenses/LICENSE-dagre-d3.txt   |  19 +
 licenses/LICENSE-f2j.txt|   8 +
 licenses/LICENSE-graphlib-dot.txt   |  19 +
 licenses/LICENSE-heapq.txt  | 280 
 licenses/LICENSE-javolution.txt |  27 +
 licenses/LICENSE-jbcrypt.txt|  17 +
 licenses/LICENSE-jblas.txt  |  31 +
 licenses/LICENSE-jline.txt  |  32 +
 licenses/LICENSE-jpmml-model.txt|  10 +
 licenses/LICENSE-jquery.txt |   9 +
 licenses/LICENSE-junit-interface.txt|  24 +
 licenses/LICENSE-kryo.txt   |  10 +
 licenses/LICENSE-minlog.txt |  10 +
 licenses/LICENSE-netlib.txt |  49 ++
 licenses/LICENSE-paranamer.txt  |  28 +
 licenses/LICENSE-protobuf.txt   |  42 ++
 licenses/LICENSE-py4j.txt   |  27 +
 licenses/LICENSE-pyrolite.txt   |  28 +
 licenses/LICENSE-reflectasm.txt |  10 +
 licenses/LICENSE-sbt-launch-lib.txt |  26 +
 licenses/LICENSE-scala.txt  |  30 +
 licenses/LICENSE-scalacheck.txt |  32 +
 licenses/LICENSE-scopt.txt  |  21 +
 licenses/LICENSE-slf4j.txt  |  21 +
 licenses/LICENSE-sorttable.js.txt   |  16 +
 licenses/LICENSE-spire.txt  |  19 +
 licenses/LICENSE-xmlenc.txt |  27 +
 make-distribution.sh|   1 +
 .../spark/network/util/LimitedInputStream.java  |  18 +
 40 files changed, 1153 insertions(+), 679 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/9b3014bc/LICENSE
--
diff --git a/LICENSE b/LICENSE
index f9e412c..dca03ab 100644
--- a/LICENSE
+++ b/LICENSE
@@ -211,712 +211,45 @@ subcomponents is subject to the terms and conditions of 
the following
 licenses.
 
 
-===
-For the Boto EC2 library (ec2/third_party/boto*.zip):
-===
-
-Copyright (c) 2006-2008 Mitch Garnaat http://garnaat.org/
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this

[2/2] spark git commit: [SPARK-10833] [BUILD] Inline, organize BSD/MIT licenses in LICENSE

2015-09-28 Thread srowen 
[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 

Closes #8919 from srowen/SPARK-10833.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bf4199e2
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bf4199e2
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bf4199e2

Branch: refs/heads/master
Commit: bf4199e261c3c8dd2970e2a154c97b46fb339f02
Parents: ea02e55
Author: Sean Owen 
Authored: Mon Sep 28 22:56:43 2015 -0400
Committer: Sean Owen 
Committed: Mon Sep 28 22:56:43 2015 -0400

--
 LICENSE | 699 +--
 NOTICE  |  35 +
 .../apache/spark/util/collection/TimSort.java   |  18 +
 licenses/LICENSE-AnchorJS.txt   |  21 +
 licenses/LICENSE-DPark.txt  |  30 +
 licenses/LICENSE-Mockito.txt|  21 +
 licenses/LICENSE-SnapTree.txt   |  35 +
 licenses/LICENSE-antlr.txt  |   8 +
 licenses/LICENSE-boto.txt   |  20 +
 licenses/LICENSE-cloudpickle.txt|  28 +
 licenses/LICENSE-d3.min.js.txt  |  26 +
 licenses/LICENSE-dagre-d3.txt   |  19 +
 licenses/LICENSE-f2j.txt|   8 +
 licenses/LICENSE-graphlib-dot.txt   |  19 +
 licenses/LICENSE-heapq.txt  | 280 
 licenses/LICENSE-javolution.txt |  27 +
 licenses/LICENSE-jbcrypt.txt|  17 +
 licenses/LICENSE-jblas.txt  |  31 +
 licenses/LICENSE-jline.txt  |  32 +
 licenses/LICENSE-jpmml-model.txt|  10 +
 licenses/LICENSE-jquery.txt |   9 +
 licenses/LICENSE-junit-interface.txt|  24 +
 licenses/LICENSE-kryo.txt   |  10 +
 licenses/LICENSE-minlog.txt |  10 +
 licenses/LICENSE-netlib.txt |  49 ++
 licenses/LICENSE-paranamer.txt  |  28 +
 licenses/LICENSE-protobuf.txt   |  42 ++
 licenses/LICENSE-py4j.txt   |  27 +
 licenses/LICENSE-pyrolite.txt   |  28 +
 licenses/LICENSE-reflectasm.txt |  10 +
 licenses/LICENSE-sbt-launch-lib.txt |  26 +
 licenses/LICENSE-scala.txt  |  30 +
 licenses/LICENSE-scalacheck.txt |  32 +
 licenses/LICENSE-scopt.txt  |  21 +
 licenses/LICENSE-slf4j.txt  |  21 +
 licenses/LICENSE-sorttable.js.txt   |  16 +
 licenses/LICENSE-spire.txt  |  19 +
 licenses/LICENSE-xmlenc.txt |  27 +
 make-distribution.sh|   1 +
 .../spark/network/util/LimitedInputStream.java  |  18 +
 40 files changed, 1153 insertions(+), 679 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/bf4199e2/LICENSE
--
diff --git a/LICENSE b/LICENSE
index f9e412c..dca03ab 100644
--- a/LICENSE
+++ b/LICENSE
@@ -211,712 +211,45 @@ subcomponents is subject to the terms and conditions of 
the following
 licenses.
 
 
-===
-For the Boto EC2 library (ec2/third_party/boto*.zip):
-===
-
-Copyright (c) 2006-2008 Mitch Garnaat http://garnaat.org/
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including