You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2013/05/16 20:27:14 UTC

svn commit: r1483491 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/NOTICE.txt solr/ solr/NOTICE.txt

Author: sarowe
Date: Thu May 16 18:27:14 2013
New Revision: 1483491

URL: http://svn.apache.org/r1483491
Log:
Make the Solr NOTICE.txt be a superset of Lucene's NOTICE.txt (merged trunk r1483489)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/NOTICE.txt   (contents, 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/lucene/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/NOTICE.txt?rev=1483491&r1=1483490&r2=1483491&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/NOTICE.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/NOTICE.txt Thu May 16 18:27:14 2013
@@ -104,7 +104,7 @@ LGPL and Creative Commons ShareAlike.
 Morfologic includes data from BSD-licensed dictionary of Polish (SGJP)
 (http://sgjp.pl/morfeusz/)
 
-Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original 
+Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original
 source code for this can be found at http://www.eclipse.org/jetty/downloads.php
 
 ===========================================================================

Modified: lucene/dev/branches/branch_4x/solr/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/NOTICE.txt?rev=1483491&r1=1483490&r2=1483491&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/NOTICE.txt (original)
+++ lucene/dev/branches/branch_4x/solr/NOTICE.txt Thu May 16 18:27:14 2013
@@ -146,8 +146,8 @@ LGPL and Creative Commons ShareAlike.
 Morfologic includes data from BSD-licensed dictionary of Polish (SGJP)
 (http://sgjp.pl/morfeusz/)
 
-Servlet-api.jar is under the CDDL license, the original source
-code for this can be found at http://www.eclipse.org/jetty/downloads.php
+Servlet-api.jar and javax.servlet-*.jar are under the CDDL license, the original
+source code for this can be found at http://www.eclipse.org/jetty/downloads.php
 
 ===========================================================================
 Kuromoji Japanese Morphological Analyzer - Apache Lucene Integration