diff options
author | Sean Owen <sowen@cloudera.com> | 2015-09-28 22:56:43 -0400 |
---|---|---|
committer | Sean Owen <sowen@cloudera.com> | 2015-09-28 22:56:43 -0400 |
commit | bf4199e261c3c8dd2970e2a154c97b46fb339f02 (patch) | |
tree | 7712b630727f6e349578587cb7dd0b4b3783552f /network/common | |
parent | ea02e5513a8f9853094d5612c962fc8c1a340f50 (diff) | |
download | spark-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 'network/common')
-rw-r--r-- | network/common/src/main/java/org/apache/spark/network/util/LimitedInputStream.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/network/common/src/main/java/org/apache/spark/network/util/LimitedInputStream.java b/network/common/src/main/java/org/apache/spark/network/util/LimitedInputStream.java index 57113ed12d..922c37a10e 100644 --- a/network/common/src/main/java/org/apache/spark/network/util/LimitedInputStream.java +++ b/network/common/src/main/java/org/apache/spark/network/util/LimitedInputStream.java @@ -15,6 +15,24 @@ * limitations under the License. */ +/* + * Based on LimitedInputStream.java from Google Guava + * + * Copyright (C) 2007 The Guava Authors + * + * Licensed 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. + */ + package org.apache.spark.network.util; import java.io.FilterInputStream; |