accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject accumulo git commit: ACCUMULO-3991 correct LICENSE/NOTICE files for source tarball / repo.
Date Fri, 11 Sep 2015 05:14:11 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.5 0af29996d -> 9d9118d4e


ACCUMULO-3991 correct LICENSE/NOTICE files for source tarball / repo.

* remove unbundled works
* include MIT license text once
* include copyright notices (including from across the jquery/flot stuff)
* enumerate bloom filter files by basename instead of package
* include notice for thrift inclusion
* update binary tarball LICENSE for changes in source LICENSE


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

Branch: refs/heads/1.5
Commit: 9d9118d4e0eb22079a58d332d5b50e12348e0328
Parents: 0af2999
Author: Sean Busbey <busbey@cloudera.com>
Authored: Thu Sep 10 18:41:04 2015 -0500
Committer: Sean Busbey <busbey@cloudera.com>
Committed: Fri Sep 11 00:11:12 2015 -0500

----------------------------------------------------------------------
 LICENSE              | 149 +++++++++++++++++++++++++++++++---------------
 NOTICE               |   9 ++-
 assemble/bin-LICENSE | 113 +++++++++++++++++++++++++++++++----
 3 files changed, 212 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d9118d4/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 8759447..91d5e34 100644
--- a/LICENSE
+++ b/LICENSE
@@ -207,52 +207,107 @@ APACHE ACCUMULO SUBCOMPONENTS:
 The Apache Accumulo project contains subcomponents with separate copyright
 notices and license terms. Your use of the source code for the these
 subcomponents is subject to the terms and conditions of the following
-licenses. 
-
-This product bundles softare from the European Commission project OneLab
-under contract 034819 (http://www.one-lab.org), which is available under
-a "3-clause BSD" license. For details, see
-  core/src/main/java/org/apache/accumulo/core/bloomfilter/
-
-This product bundles JQuery and Flot, which are each available under
-The MIT License (MIT). For details, see
+licenses.
+
+This product bundles software from the European Commission project OneLab
+(http://www.one-lab.org),
+
+* BloomFilter.java
+* DynamicBloomFilter.java
+* Filter.java
+
+Copyright (c) 2005, European Commission project OneLab under contract 034819
+
+available under the following BSD 3-Clause style license:
+
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *  - Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  - 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.
+ *  - Neither the name of the University Catholique de Louvain - UCL
+ *    nor the names of its contributors may be used to endorse or
+ *    promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * 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.
+
+----
+
+This product bundles JQuery
+
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+
+Distributed under the MIT License:
+
+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 without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+
+----
+This product bundles Flot,
+
+Copyright (c) 2007-2009 IOLA and Ole Laursen
+
+Available under the MIT License (see above)
+
+Flot bundles additional works:
+
+jquery.pie.js
+* Created by Brian Medendorp, June 2009
+* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+
+jquery.flot.resize.js
+* Inline dependency:
+ * jQuery resize event - v1.1 - 3/14/2010
+ * http://benalman.com/projects/jquery-resize-plugin/
+ *
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+
+distributed under the MIT license (see above)
+
+For details, see
   server/src/main/resources/web/flot/
 
-The binary distribution of this product bundles jline, which is available
-under the following "3-clause BSD" license:
-
-    The BSD License
-
-    Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or
-    without modification, are permitted provided that the following
-    conditions are met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    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.
-
-    Neither the name of JLine nor the names of its contributors
-    may be used to endorse or promote products derived from this
-    software without specific prior written permission.
-
-    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.
-
+----

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d9118d4/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 0aabb38..97875d7 100644
--- a/NOTICE
+++ b/NOTICE
@@ -4,5 +4,10 @@ Copyright 2011-2015 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-This product includes JCommander (https://github.com/cbeust/jcommander),
-Copyright 2010 Cedric Beust cedric@beust.com.
+This product includes the following work from the Apache Thrift project:
+
+TNonblockingServerSocket.java
+
+Apache Thrift
+Copyright 2006-2010 The Apache Software Foundation.
+

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d9118d4/assemble/bin-LICENSE
----------------------------------------------------------------------
diff --git a/assemble/bin-LICENSE b/assemble/bin-LICENSE
index 9989723..a7b9cc0 100644
--- a/assemble/bin-LICENSE
+++ b/assemble/bin-LICENSE
@@ -207,18 +207,111 @@ APACHE ACCUMULO SUBCOMPONENTS:
 The Apache Accumulo project contains subcomponents with separate copyright
 notices and license terms. Your use of the source code for the these
 subcomponents is subject to the terms and conditions of the following
-licenses. 
-
-This product bundles softare from the European Commission project OneLab
-under contract 034819 (http://www.one-lab.org), which is available under
-a "3-clause BSD" license. For details, see
-
-  core/src/main/java/org/apache/accumulo/core/bloomfilter/
-
-This product bundles JQuery and Flot, which are each available under
-The MIT License (MIT). For details, see
+licenses.
+
+This product bundles software from the European Commission project OneLab
+(http://www.one-lab.org),
+
+* BloomFilter.java
+* DynamicBloomFilter.java
+* Filter.java
+
+Copyright (c) 2005, European Commission project OneLab under contract 034819
+
+available under the following BSD 3-Clause style license:
+
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *  - Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  - 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.
+ *  - Neither the name of the University Catholique de Louvain - UCL
+ *    nor the names of its contributors may be used to endorse or
+ *    promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * 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.
+
+----
+
+This product bundles JQuery
+
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+
+Distributed under the MIT License:
+
+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 without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+
+----
+This product bundles Flot,
+
+Copyright (c) 2007-2009 IOLA and Ole Laursen
+
+Available under the MIT License (see above)
+
+Flot bundles additional works:
+
+jquery.pie.js
+* Created by Brian Medendorp, June 2009
+* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+
+jquery.flot.resize.js
+* Inline dependency:
+ * jQuery resize event - v1.1 - 3/14/2010
+ * http://benalman.com/projects/jquery-resize-plugin/
+ *
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+
+distributed under the MIT license (see above)
+
+For details, see
   server/src/main/resources/web/flot/
 
+----
+
 The binary distribution of this product bundles jline, which is available
 under the following "3-clause BSD" license:
 


Mime
View raw message