You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by ch...@apache.org on 2013/01/09 14:09:47 UTC
svn commit: r1430838 - in /incubator/ctakes/trunk: DISCLAIMER NOTICE
ctakes-distribution/DISCLAIMER ctakes-distribution/NOTICE
ctakes-distribution/src/main/assembly/bin.xml
Author: chenpei
Date: Wed Jan 9 13:09:47 2013
New Revision: 1430838
URL: http://svn.apache.org/viewvc?rev=1430838&view=rev
Log:
CTAKES-125 - Move DISCLAIMER to root in SVN. Updated 2013 copyright ASF in Notice.
Added:
incubator/ctakes/trunk/DISCLAIMER
- copied unchanged from r1425967, incubator/ctakes/trunk/ctakes-distribution/DISCLAIMER
Removed:
incubator/ctakes/trunk/ctakes-distribution/DISCLAIMER
Modified:
incubator/ctakes/trunk/NOTICE
incubator/ctakes/trunk/ctakes-distribution/NOTICE
incubator/ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml
Modified: incubator/ctakes/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/NOTICE?rev=1430838&r1=1430837&r2=1430838&view=diff
==============================================================================
--- incubator/ctakes/trunk/NOTICE (original)
+++ incubator/ctakes/trunk/NOTICE Wed Jan 9 13:09:47 2013
@@ -1,5 +1,5 @@
Apache cTAKES
-Copyright 2012 The Apache Software Foundation
+Copyright 2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -21,7 +21,8 @@ Foundation under the "Software Grant Lic
Copyright (c) 2012 University of Colorado.
Portions of cTAKES were originally developed by
-The MITRE corporation.
+The MITRE corporation and are licensed to the Apache Software
+Foundation under the "Software Grant License Agreement".
Copyright (c) 2012 The MITRE Corporation.
-Please see the NOTICE file within each PEAR file for the other notices.
+Please see the NOTICE file within each module for the other notices.
Modified: incubator/ctakes/trunk/ctakes-distribution/NOTICE
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-distribution/NOTICE?rev=1430838&r1=1430837&r2=1430838&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-distribution/NOTICE (original)
+++ incubator/ctakes/trunk/ctakes-distribution/NOTICE Wed Jan 9 13:09:47 2013
@@ -1,5 +1,5 @@
Apache cTAKES
-Copyright 2012 The Apache Software Foundation
+Copyright 2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -20,6 +20,11 @@ University of Colorado and are licensed
Foundation under the "Software Grant License Agreement".
Copyright (c) 2012 University of Colorado.
+Portions of cTAKES were originally developed by
+The MITRE corporation and are licensed to the Apache Software
+Foundation under the "Software Grant License Agreement".
+Copyright (c) 2012 The MITRE Corporation.
+
This product contains hsqldb developed by the HSQL Development Group
(http://hsqldb.org), licensed based on the
BSD license (see LICENSE file).
Modified: incubator/ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml?rev=1430838&r1=1430837&r2=1430838&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml (original)
+++ incubator/ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml Wed Jan 9 13:09:47 2013
@@ -112,6 +112,7 @@
<directoryMode>755</directoryMode>
<includes>
<include>README</include>
+ <include>DISCLAIMER</include>
</includes>
</fileSet>
<fileSet>
@@ -122,7 +123,6 @@
<directoryMode>755</directoryMode>
<includes>
<include>RELEASE_NOTES.html</include>
- <include>DISCLAIMER</include>
<include>LICENSE</include>
<include>NOTICE</include>
</includes>