You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2017/02/14 20:22:57 UTC
svn commit: r1783021 - in /uima/uimaj/branches/experiment-v3-jcas/src/main:
bin_distr_license_notices/LICENSE bin_distr_license_notices/NOTICE
bin_distr_license_notices/NOTICE-without-jackson license_notice_research.txt
Author: schor
Date: Tue Feb 14 20:22:57 2017
New Revision: 1783021
URL: http://svn.apache.org/viewvc?rev=1783021&view=rev
Log:
[UIMA-5321] update lic/ notice
Modified:
uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/LICENSE
uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/NOTICE
uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/NOTICE-without-jackson
uima/uimaj/branches/experiment-v3-jcas/src/main/license_notice_research.txt
Modified: uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/LICENSE
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/LICENSE?rev=1783021&r1=1783020&r2=1783021&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/LICENSE (original)
+++ uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/LICENSE Tue Feb 14 20:22:57 2017
@@ -234,4 +234,30 @@ PROCUREMENT OF SUBSTITUTE GOODS OR SERVI
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.
\ No newline at end of file
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+====================================================================================================
+
+This product contains SLF4J, licensed and distirbuted under the MIT license:
+
+Copyright (c) 2004-2017 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.
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/NOTICE
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/NOTICE?rev=1783021&r1=1783020&r2=1783021&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/NOTICE (original)
+++ uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/NOTICE Tue Feb 14 20:22:57 2017
@@ -11,6 +11,8 @@ licensed to the Apache Software Foundati
"IBM UIMA License Agreement".
Copyright (c) 2003, 2006 IBM Corporation.
+ResolverUtil.java Copyright 2005-2006 Tim Fennell
+
# Jackson JSON processor NOTICE from the Jackson Jar 2.4.2
Jackson is a high-performance, Free/Open Source JSON processing library.
Modified: uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/NOTICE-without-jackson
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/NOTICE-without-jackson?rev=1783021&r1=1783020&r2=1783021&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/NOTICE-without-jackson (original)
+++ uima/uimaj/branches/experiment-v3-jcas/src/main/bin_distr_license_notices/NOTICE-without-jackson Tue Feb 14 20:22:57 2017
@@ -9,4 +9,6 @@ International Business Machines Corporat
licensed to the Apache Software Foundation under the
"Software Grant License Agreement", informally known as the
"IBM UIMA License Agreement".
-Copyright (c) 2003, 2006 IBM Corporation.
\ No newline at end of file
+Copyright (c) 2003, 2006 IBM Corporation.
+
+ResolverUtil.java Copyright 2005-2006 Tim Fennell
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/src/main/license_notice_research.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/src/main/license_notice_research.txt?rev=1783021&r1=1783020&r2=1783021&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/src/main/license_notice_research.txt (original)
+++ uima/uimaj/branches/experiment-v3-jcas/src/main/license_notice_research.txt Tue Feb 14 20:22:57 2017
@@ -25,6 +25,13 @@ November 3 2016
javaparser-core 2.5.1 is dual licensed, one is Apache v2 license. No notice file found.
Note: ASM not depended on (Nov 2016). ASM is licensed under a BSD 3-clause style license.
-
+
+ Feb 14 2017
+ log4j jars included in binary distribution:
+ log4j-api-2.8 - ok
+ log4j-core-2.8 has Notice ResolverUtil.java Copyright 2005-2006 Tim Fennell
+ log4j-slf4j-impl-2.8 OK
+ slf4j-api-1.7.22 - no info in the JAR
+ slf4j distributed under the MIT license. added to bin_distr_license_notices
\ No newline at end of file