lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r1620159 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/NOTICE.txt
Date Sun, 24 Aug 2014 17:05:53 GMT
Author: uschindler
Date: Sun Aug 24 17:05:53 2014
New Revision: 1620159

URL: http://svn.apache.org/r1620159
Log:
Merged revision(s) 1620158 from lucene/dev/trunk:
Remove outdated NOTICE.txt entries

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/NOTICE.txt   (contents, props changed)

Modified: lucene/dev/branches/branch_4x/solr/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/NOTICE.txt?rev=1620159&r1=1620158&r2=1620159&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/NOTICE.txt (original)
+++ lucene/dev/branches/branch_4x/solr/NOTICE.txt Sun Aug 24 17:05:53 2014
@@ -10,7 +10,6 @@ Includes software from other Apache Soft
 including, but not limited to:
   - Apache Lucene Java
   - Apache Commons
-  - Apache Geronimo (stax API)
   - Apache Blur
   - Apache Hadoop
 
@@ -59,12 +58,6 @@ Copyright (C) 2010-2014 James Burke, htt
 This product includes fugue icons created by Yusuke Kamiyamane
 Copyright (C) 2013-2014 Yusuke Kamiyamane, https://github.com/yusukekamiyamane/fugue-icons
 
-stax-utils library: https://stax-utils.dev.java.net/
-Copyright (c) 2004, Christian Niles, unit12.net
-Copyright (c) 2004, Sun Microsystems, Inc.
-Copyright (c) 2006, John Kristian 
-License: The BSD License (http://www.opensource.org/licenses/bsd-license.php)
-
 JavaMail API 1.5.1: https://glassfish.dev.java.net/javaee5/mail/
 License: Common Development and Distribution License (CDDL) v1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
 
@@ -506,43 +499,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTR
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
 SOFTWARE. 
 
-==========================================================================
-The following license applies to stax-utils.jar
---------------------------------------------------------------------------
-Copyright (c) 2004, Christian Niles, unit12.net
-Copyright (c) 2004, Sun Microsystems, Inc.
-Copyright (c) 2006, John Kristian 
-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 the listed copyright holders 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.
-
 =========================================================================
 ==     Restlet Notice                                                  ==
 =========================================================================



Mime
View raw message