You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ho...@apache.org on 2010/06/02 00:02:03 UTC

svn commit: r950282 - in /lucene/solr/branches/branch-1.4: ./ lib/ src/maven/

Author: hossman
Date: Tue Jun  1 22:02:02 2010
New Revision: 950282

URL: http://svn.apache.org/viewvc?rev=950282&view=rev
Log:
SOLR-1934: upgraded to Lucene 2.9.2 for testing (although the 1.4.1 release will hold off until 2.9.3) ... this involved updating the solr-core-pom.xml.template but i made it a template so future changes on this branch only need to update common-build.xml and CHANGES.txt

Added:
    lucene/solr/branches/branch-1.4/lib/lucene-analyzers-2.9.2.jar   (with props)
    lucene/solr/branches/branch-1.4/lib/lucene-core-2.9.2.jar   (with props)
    lucene/solr/branches/branch-1.4/lib/lucene-highlighter-2.9.2.jar   (with props)
    lucene/solr/branches/branch-1.4/lib/lucene-memory-2.9.2.jar   (with props)
    lucene/solr/branches/branch-1.4/lib/lucene-misc-2.9.2.jar   (with props)
    lucene/solr/branches/branch-1.4/lib/lucene-queries-2.9.2.jar   (with props)
    lucene/solr/branches/branch-1.4/lib/lucene-snowball-2.9.2.jar   (with props)
    lucene/solr/branches/branch-1.4/lib/lucene-spellchecker-2.9.2.jar   (with props)
Removed:
    lucene/solr/branches/branch-1.4/lib/lucene-analyzers-2.9.1.jar
    lucene/solr/branches/branch-1.4/lib/lucene-core-2.9.1.jar
    lucene/solr/branches/branch-1.4/lib/lucene-highlighter-2.9.1.jar
    lucene/solr/branches/branch-1.4/lib/lucene-memory-2.9.1.jar
    lucene/solr/branches/branch-1.4/lib/lucene-misc-2.9.1.jar
    lucene/solr/branches/branch-1.4/lib/lucene-queries-2.9.1.jar
    lucene/solr/branches/branch-1.4/lib/lucene-snowball-2.9.1.jar
    lucene/solr/branches/branch-1.4/lib/lucene-spellchecker-2.9.1.jar
Modified:
    lucene/solr/branches/branch-1.4/CHANGES.txt
    lucene/solr/branches/branch-1.4/common-build.xml
    lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template

Modified: lucene/solr/branches/branch-1.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/CHANGES.txt?rev=950282&r1=950281&r2=950282&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/CHANGES.txt (original)
+++ lucene/solr/branches/branch-1.4/CHANGES.txt Tue Jun  1 22:02:02 2010
@@ -33,7 +33,7 @@ from Solr 1.4.
 
 Versions of Major Components
 ----------------------------
-Apache Lucene 2.9.1  (r832363  on 2.9 branch)
+Apache Lucene 2.9.2
 Apache Tika 0.4
 Carrot2 3.1.0
 
@@ -41,13 +41,17 @@ Lucene Information
 ----------------
 
 Since Solr is built on top of Lucene, many people add customizations to Solr
-that are dependent on Lucene.  Please see http://lucene.apache.org/java/2_9_0/,
-especially http://lucene.apache.org/java/2_9_0/changes/Changes.html for more
+that are dependent on Lucene.  Please see http://lucene.apache.org/java/2_9_2/,
+especially http://lucene.apache.org/java/2_9_2/changes/Changes.html for more
 information on the version of Lucene used in Solr.
 
 Bug Fixes
 ----------------------
 
+* SOLR-1934: Upgrade to Apache Lucene 2.9.2 to obtain several bug
+  fixes from the previous 2.9.1.  See the Lucene 2.9.2 release notes
+  for details.  (hossman)
+
 * SOLR-1432: Make the new ValueSource.getValues(context,reader) delegate
   to the original ValueSource.getValues(reader) so custom sources
   will work. (yonik)
@@ -115,7 +119,7 @@ Bug Fixes
   (Akshay Ukey via shalin)
 
 * SOLR-1936: The JSON response format needed to escape unicode code point
-  U+2028 - 'LINE SEPARATOR' (Robert Hofstra, yonik
+  U+2028 - 'LINE SEPARATOR' (Robert Hofstra, yonik)
 
 ================== Release 1.4.0 ==================
 Release Date:  See http://lucene.apache.org/solr for the official release date.

Modified: lucene/solr/branches/branch-1.4/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/common-build.xml?rev=950282&r1=950281&r2=950282&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/common-build.xml (original)
+++ lucene/solr/branches/branch-1.4/common-build.xml Tue Jun  1 22:02:02 2010
@@ -92,7 +92,7 @@
   <property name="javadoc.link.junit"
             value="http://junit.sourceforge.net/javadoc/"/>
   <property name="javadoc.link.lucene"
-            value="http://lucene.apache.org/java/2_9_0/api/all/"/>
+            value="http://lucene.apache.org/java/2_9_2/api/all/"/>
   <property name="javadoc.packages" value="org.apache.solr.*"/>
   <property name="build.docs" value="${dest}/docs"/>
   <property name="build.javadoc" value="${common.dir}/${build.docs}/api"/>
@@ -114,7 +114,7 @@
        The version suffix of the Lucene artifacts checked into "lib" 
        IF YOU CHANGE THIS, SANITY CHECK "javadoc.link.lucene"
   -->
-  <property name="lucene_version" value="2.9.1"/>
+  <property name="lucene_version" value="2.9.2"/>
   <!-- The version number to assign to the Maven artifacts. -->
   <property name="maven_version" value="1.4.1-SNAPSHOT"/>
 
@@ -265,6 +265,7 @@
     <sequential>
       <copy file="@{pom.xml}" tofile="${maven.build.dir}/@{pom.xml}">
         <filterset begintoken="@" endtoken="@">
+          <filter token="lucene_version" value="${lucene_version}"/>
           <filter token="maven_version" value="${maven_version}"/>
         </filterset>
       </copy>

Added: lucene/solr/branches/branch-1.4/lib/lucene-analyzers-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/lib/lucene-analyzers-2.9.2.jar?rev=950282&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/branches/branch-1.4/lib/lucene-analyzers-2.9.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/branches/branch-1.4/lib/lucene-core-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/lib/lucene-core-2.9.2.jar?rev=950282&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/branches/branch-1.4/lib/lucene-core-2.9.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/branches/branch-1.4/lib/lucene-highlighter-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/lib/lucene-highlighter-2.9.2.jar?rev=950282&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/branches/branch-1.4/lib/lucene-highlighter-2.9.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/branches/branch-1.4/lib/lucene-memory-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/lib/lucene-memory-2.9.2.jar?rev=950282&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/branches/branch-1.4/lib/lucene-memory-2.9.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/branches/branch-1.4/lib/lucene-misc-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/lib/lucene-misc-2.9.2.jar?rev=950282&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/branches/branch-1.4/lib/lucene-misc-2.9.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/branches/branch-1.4/lib/lucene-queries-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/lib/lucene-queries-2.9.2.jar?rev=950282&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/branches/branch-1.4/lib/lucene-queries-2.9.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/branches/branch-1.4/lib/lucene-snowball-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/lib/lucene-snowball-2.9.2.jar?rev=950282&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/branches/branch-1.4/lib/lucene-snowball-2.9.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lucene/solr/branches/branch-1.4/lib/lucene-spellchecker-2.9.2.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/lib/lucene-spellchecker-2.9.2.jar?rev=950282&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/solr/branches/branch-1.4/lib/lucene-spellchecker-2.9.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template?rev=950282&r1=950281&r2=950282&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template (original)
+++ lucene/solr/branches/branch-1.4/src/maven/solr-core-pom.xml.template Tue Jun  1 22:02:02 2010
@@ -49,37 +49,37 @@
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-analyzers</artifactId>
-      <version>2.9.1</version>
+      <version>@lucene_version@</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-highlighter</artifactId>
-      <version>2.9.1</version>
+      <version>@lucene_version@</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-queries</artifactId>
-      <version>2.9.1</version>
+      <version>@lucene_version@</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-snowball</artifactId>
-      <version>2.9.1</version>
+      <version>@lucene_version@</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-memory</artifactId>
-      <version>2.9.1</version>
+      <version>@lucene_version@</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-misc</artifactId>
-      <version>2.9.1</version>
+      <version>@lucene_version@</version>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-spellchecker</artifactId>
-      <version>2.9.1</version>
+      <version>@lucene_version@</version>
     </dependency>
 
     <!-- Apache Commons -->