svn commit: r1530287 - /uima/uima-as/trunk/LICENSE

[cw...@apache.org]

Author: cwiklik
Date: Tue Oct  8 14:27:00 2013
New Revision: 1530287

URL: http://svn.apache.org/r1530287
Log:
UIMA-3257 removed xstream

Modified:
    uima/uima-as/trunk/LICENSE

Modified: uima/uima-as/trunk/LICENSE
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/LICENSE?rev=1530287&r1=1530286&r2=1530287&view=diff
==============================================================================
--- uima/uima-as/trunk/LICENSE (original)
+++ uima/uima-as/trunk/LICENSE Tue Oct  8 14:27:00 2013
@@ -433,38 +433,3 @@ LIABILITY, WHETHER IN CONTRACT, STRICT L
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
          
-=========================================================================
-== XStream library                                                     ==
-   License from ActiveMQ 5.6.0 binary distribution
-=========================================================================
-This product contains XStream from Codehaus.  It is licensed under the BSD
-license:
-
-(BSD Style License)
-
-Copyright (c) 2003-2004, Joe Walnes
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions and the following disclaimer. Redistributions in binary form must reproduce
-the above copyright notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the distribution.
-
-Neither the name of XStream nor the names of its contributors may be used to endorse
-or promote products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 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