You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/11/21 11:51:50 UTC
svn commit: r1204442 - in /lucene/dev/branches/branch_3x: lucene/
lucene/contrib/ lucene/src/java/org/apache/lucene/util/
lucene/src/test-framework/java/org/apache/lucene/util/ solr/
solr/contrib/analysis-extras/ solr/contrib/clustering/ solr/contrib/d...
Author: simonw
Date: Mon Nov 21 10:51:49 2011
New Revision: 1204442
URL: http://svn.apache.org/viewvc?rev=1204442&view=rev
Log:
preparing Lucene 3.5 release moving over to 3.6
Modified:
lucene/dev/branches/branch_3x/lucene/CHANGES.txt
lucene/dev/branches/branch_3x/lucene/common-build.xml
lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/Constants.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/Version.java
lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/common-build.xml
lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/CHANGES.txt
lucene/dev/branches/branch_3x/solr/contrib/clustering/CHANGES.txt
lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/CHANGES.txt
lucene/dev/branches/branch_3x/solr/contrib/extraction/CHANGES.txt
lucene/dev/branches/branch_3x/solr/contrib/langid/CHANGES.txt
lucene/dev/branches/branch_3x/solr/contrib/uima/CHANGES.txt
lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
lucene/dev/branches/branch_3x/solr/example/multicore/core0/conf/solrconfig.xml
lucene/dev/branches/branch_3x/solr/example/multicore/core1/conf/solrconfig.xml
lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml
Modified: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/CHANGES.txt?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/CHANGES.txt Mon Nov 21 10:51:49 2011
@@ -3,6 +3,10 @@ Lucene Change Log
For more information on past and future Lucene versions, please see:
http://s.apache.org/luceneversions
+======================= Lucene 3.6.0 =======================
+
+(No Changes)
+
======================= Lucene 3.5.0 =======================
Changes in backwards compatibility policy
Modified: lucene/dev/branches/branch_3x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/common-build.xml?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Mon Nov 21 10:51:49 2011
@@ -45,8 +45,8 @@
<property name="name" value="${ant.project.name}"/>
<property name="Name" value="Lucene"/>
- <property name="dev.version" value="3.5-SNAPSHOT"/>
- <property name="tests.luceneMatchVersion" value="3.5"/>
+ <property name="dev.version" value="3.6-SNAPSHOT"/>
+ <property name="tests.luceneMatchVersion" value="3.6"/>
<property name="version" value="${dev.version}"/>
<property name="spec.version" value="${version}"/>
<property name="year" value="2000-${current.year}"/>
Modified: lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt Mon Nov 21 10:51:49 2011
@@ -3,6 +3,10 @@ Lucene contrib change Log
For more information on past and future Lucene versions, please see:
http://s.apache.org/luceneversions
+======================= Lucene 3.6.0 ================
+
+(No Changes)
+
======================= Lucene 3.5.0 ================
Changes in backwards compatibility policy
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/Constants.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/Constants.java?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/Constants.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/Constants.java Mon Nov 21 10:51:49 2011
@@ -102,7 +102,7 @@ public final class Constants {
// NOTE: we track per-segment version as a String with the "X.Y" format, e.g.
// "4.0", "3.1", "3.0". Therefore when we change this constant, we should keep
// the format.
- public static final String LUCENE_MAIN_VERSION = ident("3.5");
+ public static final String LUCENE_MAIN_VERSION = ident("3.6");
public static final String LUCENE_VERSION;
static {
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/Version.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/Version.java?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/Version.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/Version.java Mon Nov 21 10:51:49 2011
@@ -82,14 +82,17 @@ public enum Version {
/** Match settings and bugs in Lucene's 3.4 release. */
LUCENE_34,
+
+ /** Match settings and bugs in Lucene's 3.5 release. */
+ LUCENE_35,
/**
- * Match settings and bugs in Lucene's 3.5 release.
+ * Match settings and bugs in Lucene's 3.6 release.
* <p>
* Use this to get the latest & greatest settings, bug
* fixes, etc, for Lucene.
*/
- LUCENE_35,
+ LUCENE_36,
/* Add new constants for later versions **here** to respect order! */
@@ -115,4 +118,4 @@ public enum Version {
public boolean onOrAfter(Version other) {
return compareTo(other) >= 0;
}
-}
\ No newline at end of file
+}
Modified: lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test-framework/java/org/apache/lucene/util/LuceneTestCase.java Mon Nov 21 10:51:49 2011
@@ -100,7 +100,7 @@ public abstract class LuceneTestCase ext
/** Use this constant when creating Analyzers and any other version-dependent stuff.
* <p><b>NOTE:</b> Change this when development starts for new Lucene version:
*/
- public static final Version TEST_VERSION_CURRENT = Version.LUCENE_35;
+ public static final Version TEST_VERSION_CURRENT = Version.LUCENE_36;
/**
* If this is set, it is the only method that should run.
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Mon Nov 21 10:51:49 2011
@@ -21,6 +21,8 @@ when more advanced customization is requ
See README.txt and http://lucene.apache.org/solr for more information
on how to get started.
+================== 3.6.0 ==================
+
================== 3.5.0 ==================
Versions of Major Components
---------------------
Modified: lucene/dev/branches/branch_3x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/common-build.xml?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/common-build.xml Mon Nov 21 10:51:49 2011
@@ -24,7 +24,7 @@
<dirname file="${ant.file.common-solr}" property="common-solr.dir"/>
<property name="Name" value="Solr" />
- <property name="version" value="3.5-SNAPSHOT"/>
+ <property name="version" value="3.6-SNAPSHOT"/>
<property name="fullname" value="apache-${ant.project.name}"/>
<property name="fullnamever" value="${fullname}-${version}"/>
<property name="final.name" value="${fullnamever}"/>
@@ -71,7 +71,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="3.5.0.${dateversion}" />
+ <property name="solr.spec.version" value="3.6.0.${dateversion}" />
<path id="solr.base.classpath">
<pathelement path="${analyzers-common.jar}"/>
Modified: lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/CHANGES.txt?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/CHANGES.txt Mon Nov 21 10:51:49 2011
@@ -11,6 +11,10 @@ analyzers for Chinese and Polish.
$Id$
+================== 3.6.0 ==================
+
+(No Changes)
+
================== 3.5.0 ==================
(No Changes)
Modified: lucene/dev/branches/branch_3x/solr/contrib/clustering/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/clustering/CHANGES.txt?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/clustering/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/clustering/CHANGES.txt Mon Nov 21 10:51:49 2011
@@ -7,6 +7,9 @@ See http://wiki.apache.org/solr/Clusteri
CHANGES
$Id$
+================== Release 3.6.0 ==================
+
+(No Changes)
================== Release 3.5.0 ==================
Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/CHANGES.txt?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/CHANGES.txt Mon Nov 21 10:51:49 2011
@@ -9,6 +9,10 @@ HTTP data sources quick and easy.
$Id$
+================== 3.6.0 ==================
+
+(No Changes)
+
================== 3.5.0 ==================
Bug Fixes
Modified: lucene/dev/branches/branch_3x/solr/contrib/extraction/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/extraction/CHANGES.txt?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/extraction/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/extraction/CHANGES.txt Mon Nov 21 10:51:49 2011
@@ -24,6 +24,10 @@ Current Version: Tika 0.10 (released 201
$Id$
+================== Release 3.6.0 ==================
+
+(No Changes)
+
================== Release 3.5.0 ==================
* SOLR-2372: Upgrade Solr to Tika 0.10 (janhoy)
Modified: lucene/dev/branches/branch_3x/solr/contrib/langid/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/langid/CHANGES.txt?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/langid/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/langid/CHANGES.txt Mon Nov 21 10:51:49 2011
@@ -7,6 +7,10 @@ See http://wiki.apache.org/solr/Language
$Id$
+================== Release 3.6.0 ==================
+
+(No Changes)
+
================== Release 3.5.0 ==================
Initial release. See README.txt.
Modified: lucene/dev/branches/branch_3x/solr/contrib/uima/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/uima/CHANGES.txt?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/uima/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/uima/CHANGES.txt Mon Nov 21 10:51:49 2011
@@ -19,6 +19,10 @@ WhitespaceTokenizer v2.3.1
$Id$
+================== 3.6.0 ==================
+
+(No Changes)
+
================== 3.5.0 ==================
Other Changes
Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml Mon Nov 21 10:51:49 2011
@@ -18,7 +18,7 @@
<config>
- <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
+ <luceneMatchVersion>LUCENE_36</luceneMatchVersion>
<jmx />
Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml Mon Nov 21 10:51:49 2011
@@ -18,7 +18,7 @@
<config>
- <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
+ <luceneMatchVersion>LUCENE_36</luceneMatchVersion>
<!-- Set this to 'false' if you want solr to continue working after it has
encountered an severe configuration error. In a production environment,
Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml Mon Nov 21 10:51:49 2011
@@ -18,7 +18,7 @@
<config>
- <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
+ <luceneMatchVersion>LUCENE_36</luceneMatchVersion>
<jmx />
Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml Mon Nov 21 10:51:49 2011
@@ -18,7 +18,7 @@
<config>
- <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
+ <luceneMatchVersion>LUCENE_36</luceneMatchVersion>
<!-- Set this to 'false' if you want solr to continue working after it has
encountered an severe configuration error. In a production environment,
Modified: lucene/dev/branches/branch_3x/solr/example/multicore/core0/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/multicore/core0/conf/solrconfig.xml?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/multicore/core0/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/multicore/core0/conf/solrconfig.xml Mon Nov 21 10:51:49 2011
@@ -21,7 +21,7 @@
It is *not* a good example to work from.
-->
<config>
- <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
+ <luceneMatchVersion>LUCENE_36</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_3x/solr/example/multicore/core1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/multicore/core1/conf/solrconfig.xml?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/multicore/core1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/multicore/core1/conf/solrconfig.xml Mon Nov 21 10:51:49 2011
@@ -21,7 +21,7 @@
It is *not* a good example to work from.
-->
<config>
- <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
+ <luceneMatchVersion>LUCENE_36</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_3x/solr/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml?rev=1204442&r1=1204441&r2=1204442&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml Mon Nov 21 10:51:49 2011
@@ -47,7 +47,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
+ <luceneMatchVersion>LUCENE_36</luceneMatchVersion>
<!-- lib directives can be used to instruct Solr to load an Jars
identified and use them to resolve any "plugins" specified in