You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by gs...@apache.org on 2011/03/17 17:43:03 UTC
svn commit: r1082587 - in /lucene/dev/branches/branch_3x: ./ lucene/ solr/ solr/contrib/analysis-extras/lib/ solr/contrib/clustering/lib/ solr/contrib/extraction/lib/ solr/example/example-DIH/solr/db/lib/ solr/lib/

Author: gsingers
Date: Thu Mar 17 16:43:02 2011
New Revision: 1082587

URL: http://svn.apache.org/viewvc?rev=1082587&view=rev
Log:
LUCENE-2952: backport

Added:
    lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/lib/icu4j-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/contrib/analysis-extras/lib/icu4j-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/contrib/clustering/lib/carrot2-core-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/contrib/clustering/lib/carrot2-core-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/asm-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/contrib/extraction/lib/asm-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/bcmail-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/contrib/extraction/lib/bcmail-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/bcprov-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/contrib/extraction/lib/bcprov-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/dom4j-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/contrib/extraction/lib/dom4j-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/icu4j-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/contrib/extraction/lib/icu4j-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/rome-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/contrib/extraction/lib/rome-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/tagsoup-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/contrib/extraction/lib/tagsoup-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/lib/hsqldb-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/example/example-DIH/solr/db/lib/hsqldb-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/lib/apache-solr-noggit-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/lib/apache-solr-noggit-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/lib/guava-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/lib/guava-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/lib/jcl-over-slf4j-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/lib/junit-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/lib/junit-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/lib/log4j-over-slf4j-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/lib/log4j-over-slf4j-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/lib/slf4j-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/lib/slf4j-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/lib/slf4j-api-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/lib/slf4j-api-NOTICE.txt
    lucene/dev/branches/branch_3x/solr/lib/zookeeper-NOTICE.txt
      - copied unchanged from r1082514, lucene/dev/trunk/solr/lib/zookeeper-NOTICE.txt
Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/NOTICE.txt
    lucene/dev/branches/branch_3x/solr/lib/easymock-LICENSE-MIT.txt

Modified: lucene/dev/branches/branch_3x/solr/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/NOTICE.txt?rev=1082587&r1=1082586&r2=1082587&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/NOTICE.txt (original)
+++ lucene/dev/branches/branch_3x/solr/NOTICE.txt Thu Mar 17 16:43:02 2011
@@ -222,6 +222,12 @@ Copyright (c) 2003-2005, www.fontbox.org
 Copyright (c) 1995-2005 International Business Machines Corporation and others
 
 Copyright (c) 2000-2005 INRIA, France Telecom
+
+Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+
+Copyright 2004 Sun Microsystems, Inc. (Rome JAR)
+
+Copyright 2002-2008 by John Cowan (TagSoup -- http://ccil.org/~cowan/XML/tagsoup/)
  
 
 =========================================================================

Modified: lucene/dev/branches/branch_3x/solr/lib/easymock-LICENSE-MIT.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/easymock-LICENSE-MIT.txt?rev=1082587&r1=1082586&r2=1082587&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/easymock-LICENSE-MIT.txt (original)
+++ lucene/dev/branches/branch_3x/solr/lib/easymock-LICENSE-MIT.txt Thu Mar 17 16:43:02 2011
@@ -1,8 +1,17 @@
 EasyMock 2 License (MIT License)
 
 Copyright (c) 2001-2006 OFFIS, Tammo Freese.
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject
+  to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial
+portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.