You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2015/02/11 03:49:57 UTC
accumulo git commit: ACCUMULO-3578 ACCUMULO-3542 update license and
notice for slf4j, javax.servlet-api, jetty, and native tarball
Repository: accumulo
Updated Branches:
refs/heads/1.6 a15033a2b -> 591a49ecb
ACCUMULO-3578 ACCUMULO-3542 update license and notice for slf4j, javax.servlet-api, jetty, and native tarball
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/591a49ec
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/591a49ec
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/591a49ec
Branch: refs/heads/1.6
Commit: 591a49ecbdafc3d7e81fa9cc98e348bfea849c63
Parents: a15033a
Author: Billie Rinaldi <bi...@apache.org>
Authored: Tue Feb 10 18:42:30 2015 -0800
Committer: Billie Rinaldi <bi...@apache.org>
Committed: Tue Feb 10 18:42:30 2015 -0800
----------------------------------------------------------------------
LICENSE | 27 +++++++++++++++++++++++++++
NOTICE | 5 ++++-
server/native/src/main/resources/NOTICE | 5 +++++
3 files changed, 36 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/591a49ec/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7af5fb8..e6497dd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -256,3 +256,30 @@ under the following "3-clause BSD" license:
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
+The binary distribution of this product bundles slf4j, which is available
+under the following MIT license:
+
+ Copyright (c) 2004-2013 QOS.ch
+ All rights reserved.
+
+ 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.
+
+The binary distribution of the product bundles javax.servlet-api, which is
+available under the CDDL 1.0 license (http://servlet-spec.java.net).
http://git-wip-us.apache.org/repos/asf/accumulo/blob/591a49ec/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index af212c2..a3e5d7e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,8 +1,11 @@
Apache Accumulo
-Copyright 2001-2014 The Apache Software Foundation
+Copyright 2001-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 Jetty (http://eclipse.org/jetty),
+Copyright 1995-2015 Mort Bay Consulting Pty Ltd.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/591a49ec/server/native/src/main/resources/NOTICE
----------------------------------------------------------------------
diff --git a/server/native/src/main/resources/NOTICE b/server/native/src/main/resources/NOTICE
new file mode 100644
index 0000000..a50abde
--- /dev/null
+++ b/server/native/src/main/resources/NOTICE
@@ -0,0 +1,5 @@
+Apache Accumulo
+Copyright 2011-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).