You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2014/06/08 15:37:46 UTC

svn commit: r1601219 - /uima/uimafit/branches/2.1.x/src/main/dist-bin/NOTICE

Author: rec
Date: Sun Jun  8 13:37:45 2014
New Revision: 1601219

URL: http://svn.apache.org/r1601219
Log:
[UIMA-3845] Prepare for release version 2.1.0
- Add standard boilerplate
- Remove unnecessary/redundant boilerplate from dependencies
- Removed passage about Spring Framework is licensed under Apache License, because this is already in the LICENSE
- Removed passage inherited from Spring Framework NOTICE about inclusion of subcomponents with separate copyright terms. According to Apache guidelines, all bundled copyright/license/notice information must be aggregated in this file and the accompanying LICENSE file
- Removed mention of copyright.txt in section about AnnotationLiteral.java because we only copied this one file and not the whole cdi-api/JBoss distribution. Copyright/author information is present in the AnnotationLiteral.java file and in the present NOTICE file

Modified:
    uima/uimafit/branches/2.1.x/src/main/dist-bin/NOTICE

Modified: uima/uimafit/branches/2.1.x/src/main/dist-bin/NOTICE
URL: http://svn.apache.org/viewvc/uima/uimafit/branches/2.1.x/src/main/dist-bin/NOTICE?rev=1601219&r1=1601218&r2=1601219&view=diff
==============================================================================
--- uima/uimafit/branches/2.1.x/src/main/dist-bin/NOTICE (original)
+++ uima/uimafit/branches/2.1.x/src/main/dist-bin/NOTICE Sun Jun  8 13:37:45 2014
@@ -1,3 +1,10 @@
+Apache UIMA uimaFIT
+Copyright 2012-2014 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
 Apache UIMA uimaFIT - Core
 Copyright 2013-2014 The Apache Software Foundation
 
@@ -13,9 +20,6 @@ Apache UIMA uimaFIT - Collection Process
 Apache UIMA uimaFIT - Legacy uimaFIT support
 Copyright 2012-2014 The Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
 
 Apache UIMA Base: uimaj-core
 Apache UIMA Base: jVinci: Vinci Transport Library
@@ -23,9 +27,6 @@ Apache UIMA Base: uimaj-adapter-vinci: V
 Apache UIMA Base: uimaj-cpe: Collection Processing Engine
 Copyright 2006-2014 The Apache Software Foundation
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
 Portions of Apache UIMA were originally developed by
 International Business Machines Corporation and are
 licensed to the Apache Software Foundation under the
@@ -37,36 +38,18 @@ Copyright (c) 2003, 2006 IBM Corporation
 Apache Commons IO
 Copyright 2002-2012 The Apache Software Foundation
 
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
 
 Apache Commons Lang
 Copyright 2001-2011 The Apache Software Foundation
 
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
 
 Commons Logging
 Copyright 2001-2007 The Apache Software Foundation
-
-This product includes/uses software(s) developed by 'an unknown organization'
-  - Unnamed - avalon-framework:avalon-framework:jar:4.1.3
-  - Unnamed - log4j:log4j:jar:1.2.12
-  - Unnamed - logkit:logkit:jar:1.0.1
   
   
 Spring Framework 3.1
 Copyright (c) 2002-2011 SpringSource, a division of VMware, Inc.
 
-This product is licensed to you under the Apache License, Version 2.0 (the "License").
-You may not use this product except in compliance with the License.
-
-This product may include a number of 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 subcomponent's license, as noted in the LICENSE file.
-
 
 AnnotationLiteral.java
 
@@ -75,5 +58,4 @@ File was copied from the javax.enterpris
 
 JBoss, Home of Professional Open Source
 Copyright 2008, Red Hat Middleware LLC, and individual contributors
-by the @authors tag. See the copyright.txt in the distribution for a
-full listing of individual contributors.
\ No newline at end of file
+by the @authors tag.
\ No newline at end of file