lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1433064 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/core/src/java/org/apache/lucene/util/ lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ solr/ solr/example/example-DIH/solr/db/conf/ solr/example/example-DIH/so...
Date Mon, 14 Jan 2013 19:21:27 GMT
Author: sarowe
Date: Mon Jan 14 19:21:25 2013
New Revision: 1433064

URL: http://svn.apache.org/viewvc?rev=1433064&view=rev
Log:
4.1 -> 4.2

Modified:
    lucene/dev/branches/branch_4x/build.xml
    lucene/dev/branches/branch_4x/lucene/CHANGES.txt
    lucene/dev/branches/branch_4x/lucene/common-build.xml
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Constants.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Version.java
    lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
    lucene/dev/branches/branch_4x/solr/CHANGES.txt
    lucene/dev/branches/branch_4x/solr/common-build.xml
    lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
    lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
    lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
    lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
    lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
    lucene/dev/branches/branch_4x/solr/example/multicore/core0/conf/solrconfig.xml
    lucene/dev/branches/branch_4x/solr/example/multicore/core1/conf/solrconfig.xml
    lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml

Modified: lucene/dev/branches/branch_4x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/build.xml?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/build.xml (original)
+++ lucene/dev/branches/branch_4x/build.xml Mon Jan 14 19:21:25 2013
@@ -109,7 +109,7 @@
     </subant>
   </target>
 
-  <property name="version" value="4.1-SNAPSHOT"/>
+  <property name="version" value="4.2-SNAPSHOT"/>
   <property name="maven-build-dir" value="maven-build"/>
   <property name="maven-version" value="2.2.1"/>
   
@@ -252,7 +252,7 @@
   <property name="python32.exe" value="python3.2" />
   <property name="fakeRelease" location="lucene/build/fakeRelease"/>
   <property name="fakeReleaseTmp" location="lucene/build/fakeReleaseTmp"/>
-  <property name="fakeReleaseVersion" value="4.1.0"/> <!-- *not* -SNAPSHOT, the
real version -->
+  <property name="fakeReleaseVersion" value="4.2.0"/> <!-- *not* -SNAPSHOT, the
real version -->
 
   <target name="-load-env">
      <!-- load the properties only here, so not on every invocation /usr/bin/env is called:
-->

Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Mon Jan 14 19:21:25 2013
@@ -4,6 +4,10 @@ Lucene Change Log
 For more information on past and future Lucene versions, please see:
 http://s.apache.org/luceneversions
 
+======================= Lucene 4.2.0 =======================
+
+(No changes yet)
+
 ======================= Lucene 4.1.0 =======================
 
 Changes in backwards compatibility policy

Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Mon Jan 14 19:21:25 2013
@@ -49,8 +49,8 @@
 
   <property name="name" value="${ant.project.name}"/>
   <property name="Name" value="Lucene"/>
-  <property name="dev.version" value="4.1-SNAPSHOT"/>
-  <property name="tests.luceneMatchVersion" value="4.1"/>
+  <property name="dev.version" value="4.2-SNAPSHOT"/>
+  <property name="tests.luceneMatchVersion" value="4.2"/>
   <property name="version" value="${dev.version}"/>
   <property name="spec.version" value="${version}"/>	
   <property name="year" value="2000-${current.year}"/>

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Constants.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Constants.java?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Constants.java
(original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Constants.java
Mon Jan 14 19:21:25 2013
@@ -122,7 +122,7 @@ public final class Constants {
   /**
    * This is the internal Lucene version, recorded into each segment.
    */
-  public static final String LUCENE_MAIN_VERSION = ident("4.1");
+  public static final String LUCENE_MAIN_VERSION = ident("4.2");
 
   /**
    * This is the Lucene version for display purposes.

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Version.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Version.java?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Version.java
(original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/util/Version.java
Mon Jan 14 19:21:25 2013
@@ -89,13 +89,20 @@ public enum Version {
   @Deprecated
   LUCENE_40,
 
-  /** Match settings and bugs in Lucene's 4.1 release. 
+  /** Match settings and bugs in Lucene's 4.1 release.
    *  <p>
    *  Use this to get the latest &amp; greatest settings, bug
    *  fixes, etc, for Lucene.
    */
   LUCENE_41,
-  
+
+  /** Match settings and bugs in Lucene's 4.2 release.
+   *  <p>
+   *  Use this to get the latest &amp; greatest settings, bug
+   *  fixes, etc, for Lucene.
+   */
+  LUCENE_42,
+
   /* Add new constants for later versions **here** to respect order! */
 
   /**

Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
(original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
Mon Jan 14 19:21:25 2013
@@ -303,7 +303,7 @@ public class DirectoryTaxonomyWriter imp
  
     // Make sure we use a MergePolicy which always merges adjacent segments and thus
     // keeps the doc IDs ordered as well (this is crucial for the taxonomy index).
-    return new IndexWriterConfig(Version.LUCENE_41,
+    return new IndexWriterConfig(Version.LUCENE_42,
         new KeywordAnalyzer()).setOpenMode(openMode).setMergePolicy(
         new LogByteSizeMergePolicy());
   }

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Jan 14 19:21:25 2013
@@ -20,6 +20,26 @@ See the tutorial at http://lucene.apache
 
 $Id$
 
+==================  4.2.0 ==================
+
+Versions of Major Components
+---------------------
+Apache Tika 1.2
+Carrot2 3.6.2
+Velocity 1.7 and Velocity Tools 2.0
+Apache UIMA 2.3.1
+Apache ZooKeeper 3.4.5
+
+Upgrading from Solr 4.1.0
+----------------------
+
+(No upgrade instructions yet)
+
+Detailed Change List
+----------------------
+
+(No changes yet)
+
 ==================  4.1.0 ==================
 
 Versions of Major Components

Modified: lucene/dev/branches/branch_4x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/common-build.xml?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/common-build.xml Mon Jan 14 19:21:25 2013
@@ -24,7 +24,7 @@
   <dirname file="${ant.file.common-solr}" property="common-solr.dir"/>
   
   <property name="Name" value="Solr" />
-  <property name="version" value="4.1-SNAPSHOT"/>
+  <property name="version" value="4.2-SNAPSHOT"/>
   <property name="fullname" value="${ant.project.name}"/>
   <property name="fullnamever" value="${fullname}-${version}"/>
   <property name="final.name" value="${fullnamever}"/>
@@ -67,7 +67,7 @@
        By default, this should be set to "X.Y.M.${dateversion}"
        where X.Y.M is the last version released (on this branch).
     -->
-  <property name="solr.spec.version" value="4.1.0.${dateversion}" />
+  <property name="solr.spec.version" value="4.2.0.${dateversion}" />
 
   <path id="solr.lucene.libs">
     <!-- List of jars that will be used as the foundation for both

Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/conf/solrconfig.xml?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/conf/solrconfig.xml Mon
Jan 14 19:21:25 2013
@@ -24,7 +24,7 @@
     that you fully re-index after changing this setting as it can affect both how text is
indexed
     and queried.
   -->
-  <luceneMatchVersion>LUCENE_41</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_42</luceneMatchVersion>
 
   <jmx />
 

Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml Mon
Jan 14 19:21:25 2013
@@ -24,7 +24,7 @@
     that you fully re-index after changing this setting as it can affect both how text is
indexed
     and queried.
   -->
-  <luceneMatchVersion>LUCENE_41</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_42</luceneMatchVersion>
 
   <!--
       NOTE: In order to reduce Jar duplication, dataimporthandler-extras 

Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml Mon
Jan 14 19:21:25 2013
@@ -24,7 +24,7 @@
     that you fully re-index after changing this setting as it can affect both how text is
indexed
     and queried.
   -->
-  <luceneMatchVersion>LUCENE_41</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_42</luceneMatchVersion>
 
   <jmx />
 

Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/solr/conf/solrconfig.xml Mon
Jan 14 19:21:25 2013
@@ -24,7 +24,7 @@
     that you fully re-index after changing this setting as it can affect both how text is
indexed
     and queried.
   -->
-  <luceneMatchVersion>LUCENE_41</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_42</luceneMatchVersion>
 
   <jmx />
 

Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml Mon
Jan 14 19:21:25 2013
@@ -24,7 +24,7 @@
     that you fully re-index after changing this setting as it can affect both how text is
indexed
     and queried.
   -->
-  <luceneMatchVersion>LUCENE_41</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_42</luceneMatchVersion>
 
   <!--
       NOTE: In order to reduce Jar duplication, dataimporthandler-extras 

Modified: lucene/dev/branches/branch_4x/solr/example/multicore/core0/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/multicore/core0/conf/solrconfig.xml?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/multicore/core0/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/multicore/core0/conf/solrconfig.xml Mon Jan
14 19:21:25 2013
@@ -21,7 +21,7 @@
  It is *not* a good example to work from. 
 -->
 <config>
-  <luceneMatchVersion>LUCENE_41</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_42</luceneMatchVersion>
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication.
-->

Modified: lucene/dev/branches/branch_4x/solr/example/multicore/core1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/multicore/core1/conf/solrconfig.xml?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/multicore/core1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/multicore/core1/conf/solrconfig.xml Mon Jan
14 19:21:25 2013
@@ -21,7 +21,7 @@
  It is *not* a good example to work from. 
 -->
 <config>
-  <luceneMatchVersion>LUCENE_41</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_42</luceneMatchVersion>
   <!--  The DirectoryFactory to use for indexes.
         solr.StandardDirectoryFactory, the default, is filesystem based.
         solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication.
-->

Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml?rev=1433064&r1=1433063&r2=1433064&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/solrconfig.xml Mon Jan
14 19:21:25 2013
@@ -35,7 +35,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>LUCENE_41</luceneMatchVersion>
+  <luceneMatchVersion>LUCENE_42</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load an Jars
        identified and use them to resolve any "plugins" specified in



Mime
View raw message