You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by ar...@apache.org on 2020/05/04 16:29:47 UTC

[incubator-nlpcraft] branch master updated: Various fixes for LICENSE and NOTICE files.

This is an automated email from the ASF dual-hosted git repository.

aradzinski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git


The following commit(s) were added to refs/heads/master by this push:
     new c49de97  Various fixes for LICENSE and NOTICE files.
c49de97 is described below

commit c49de97ffd671c9ecf1f69c964c7e4074161e327
Author: Aaron Radzinzski <ar...@datalingvo.com>
AuthorDate: Mon May 4 09:29:41 2020 -0700

    Various fixes for LICENSE and NOTICE files.
---
 LICENSE         | 28 +++++++++++++++++-
 NOTICE          | 90 ++-------------------------------------------------------
 bindist/LICENSE | 27 ++++++++++++++++-
 3 files changed, 55 insertions(+), 90 deletions(-)

diff --git a/LICENSE b/LICENSE
index 7a4a3ea..85eb7da 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,4 +199,30 @@
    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.
\ No newline at end of file
+   limitations under the License.
+
+   ========================================================================
+
+   File org.apache.nlpcraft.common.util.NCIdGenerator.java is licensed
+   under 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.
\ No newline at end of file
diff --git a/NOTICE b/NOTICE
index 499e63f..6c3d783 100644
--- a/NOTICE
+++ b/NOTICE
@@ -4,91 +4,5 @@ Copyright (C) 2020 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-Protocol Buffers
-Copyright 2008 Google Inc.
-MIT License
-
-OpenCensus
-Copyright 2017, OpenCensus Authors
-ALv2 License
-
-OpenZipkin
-Copyright 2015-2020 The OpenZipkin Authors
-ALv2 License
-
-Jaeger Tracing
-Copyright (c) 2018, The Jaeger Authors
-Copyright (c) 2016, Uber Technologies Inc.
-ALv2 License
-
-Apache Thrift
-Copyright (C) 2006 - 2019, The Apache Software Foundation
-ALv2 License
-
-Prometheus
-Copyright 2012-2015 The Prometheus Authors
-Includes software developed at SoundCloud Ltd. (https://soundcloud.com/).
-ALv2 License
-
-ANTLR
-Copyright (c) 2012 Terence Parr and Sam Harwell
-BSD License
-
-Apache Commons (and sub-projects)
-Copyright 2001-2020 The Apache Software Foundation
-ALv2 License
-
-Apache HttpComponents Client
-Copyright 1999-2020 The Apache Software Foundation
-ALv2 License
-
-Apache Ignite
-Copyright 2014-2020 The Apache Software Foundation
-ALv2 License
-
-Apache Commons Logging
-Copyright 2003-2016 The Apache Software Foundation
-ALv2 License
-
-Apache OpenNLP
-Copyright 2017 The Apache Software Foundation
-ALv2 License
-
-Scala Logging
-Copyright 2014 Typesafe Inc.
-ALv2 License
-
-Akka
-Copyright (C) 2009-2020 Lightbend Inc.
-ALv2 License
-
-JSOUP
-Copyright (c) 2009-2020 Jonathan Hedley <https://jsoup.org/>
-MIT License
-
-Apache Tika
-Copyright 2015 The Apache Software Foundation
-Copyright 1993-2010 University Corporation for Atmospheric Research/Unidata
-Copyright 2005 Bytecode Pty Ltd.
-ALv2 License
-
-Scala Test
-Copyright Artima, Inc. (http://www.artima.com/).
-ALv2 License
-
-Lift
-Copyright 2006-2011 WorldWide Conferencing, LLC
-ALv2 License
-
-c3p0
-Copyright (C) 2018 Machinery For Change, Inc.
-EPL License
-
-extJWNL
-Copyright (C) 2010-2018 Aliaksandr Autayeu
-Copyright (C) 2000-2007 the JWNL development team
-BSD License
-
-SQL Formatter
-Copyright (c) 2019 Yohei Yamana
-MIT License
+File org.apache.nlpcraft.common.util.NCIdGenerator.java is licensed under MIT license
+Copyright (C) 2012 Ivan Akimov
\ No newline at end of file
diff --git a/bindist/LICENSE b/bindist/LICENSE
index 949c5a8..a1b12f7 100644
--- a/bindist/LICENSE
+++ b/bindist/LICENSE
@@ -176,7 +176,32 @@
 
    END OF TERMS AND CONDITIONS
 
-   Binary Distribution 
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+   Binary Distribution
    ===================
    This NLPCraft distribution bundles 3rd party binary dependencies that are        
    licensed as outlined below. See the following link on ASF 3rd party license