4.0 -> 5.0

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1343848 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2012-05-29 17:01:58 +00:00
parent 8e90661734
commit f5223505b0
14 changed files with 58 additions and 18 deletions

View File

@ -59,7 +59,7 @@
<tests.codec>random</tests.codec>
<tests.directory>random</tests.directory>
<tests.locale>random</tests.locale>
<tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
<tests.luceneMatchVersion>5.0</tests.luceneMatchVersion>
<tests.multiplier>1</tests.multiplier>
<tests.nightly>false</tests.nightly>
<tests.postingsformat>random</tests.postingsformat>

View File

@ -4,14 +4,19 @@ Lucene Change Log
For more information on past and future Lucene versions, please see:
http://s.apache.org/luceneversions
For "contrib" changes prior to 4.0, please see:
http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_3_6_0/lucene/contrib/CHANGES.txt
======================= Lucene 5.0.0 =======================
(No changes)
======================= Lucene 4.0.0 =======================
======================= Trunk (not yet released) =======================
More information about this release, including any errata related to the
release notes, upgrade instructions, or other changes may be found online at:
https://wiki.apache.org/lucene-java/Lucene4.0
For "contrib" changes prior to 4.0, please see:
http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_3_6_0/lucene/contrib/CHANGES.txt
Changes in backwards compatibility policy
* LUCENE-1458, LUCENE-2111, LUCENE-2354: Changes from flexible indexing:

View File

@ -46,8 +46,8 @@
<property name="name" value="${ant.project.name}"/>
<property name="Name" value="Lucene"/>
<property name="dev.version" value="4.0-SNAPSHOT"/>
<property name="tests.luceneMatchVersion" value="4.0"/>
<property name="dev.version" value="5.0-SNAPSHOT"/>
<property name="tests.luceneMatchVersion" value="5.0"/>
<property name="version" value="${dev.version}"/>
<property name="spec.version" value="${version}"/>
<property name="year" value="2000-${current.year}"/>

View File

@ -104,7 +104,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("4.0");
public static final String LUCENE_MAIN_VERSION = ident("5.0");
public static final String LUCENE_VERSION;
static {

View File

@ -81,13 +81,20 @@ public enum Version {
*/
@Deprecated
LUCENE_36,
/**
* Match settings and bugs in Lucene's 4.0 release.
* @deprecated (5.0) Use latest
*/
@Deprecated
LUCENE_40,
/** Match settings and bugs in Lucene's 4.0 release.
/** Match settings and bugs in Lucene's 5.0 release.
* <p>
* Use this to get the latest &amp; greatest settings, bug
* fixes, etc, for Lucene.
*/
LUCENE_40,
LUCENE_50,
/* Add new constants for later versions **here** to respect order! */

View File

@ -179,7 +179,7 @@ public abstract class LuceneTestCase extends Assert {
* 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_40;
public static final Version TEST_VERSION_CURRENT = Version.LUCENE_50;
/**
* True if and only if tests are run in verbose mode. If this flag is false

View File

@ -20,7 +20,11 @@ See the tutorial at http://lucene.apache.org/solr/tutorial.html
$Id$
================== 4.0.0-dev ==================
================== 5.0.0 ==================
(No changes)
================== 4.0.0 ==================
More information about this release, including any errata related to the
release notes, upgrade instructions, or other changes may be found online at:
https://wiki.apache.org/solr/Solr4.0

View File

@ -24,7 +24,7 @@
<dirname file="${ant.file.common-solr}" property="common-solr.dir"/>
<property name="Name" value="Solr" />
<property name="version" value="4.0-SNAPSHOT"/>
<property name="version" value="5.0-SNAPSHOT"/>
<condition property="version.contains.SNAPSHOT">
<contains casesensitive="true" string="${version}" substring="-SNAPSHOT"/>
</condition>
@ -76,7 +76,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.0.0.${dateversion}" />
<property name="solr.spec.version" value="5.0.0.${dateversion}" />
<path id="solr.base.classpath">
<pathelement path="${analyzers-common.jar}"/>

View File

@ -11,7 +11,11 @@ analyzers for Chinese and Polish.
$Id$
================== 4.0.0-dev ==============
================== 5.0.0 ==============
(No changes)
================== 4.0.0 ==============
* SOLR-2396: Add ICUCollationField, which is much more efficient than
the Solr 3.x ICUCollationKeyFilterFactory, and also supports

View File

@ -7,7 +7,11 @@ See http://wiki.apache.org/solr/ClusteringComponent
CHANGES
$Id$
================== Release 4.0.0-dev ==============
================== Release 5.0.0 ==============
(No changes)
================== Release 4.0.0 ==============
* SOLR-3470: Bug fix: custom Carrot2 tokenizer and stemmer factories are
respected now (Stanislaw Osinski, Dawid Weiss)

View File

@ -8,7 +8,11 @@ HTTP data sources quick and easy.
$Id$
================== 4.0.0-dev ==============
================== 5.0.0 ==============
(No changes)
================== 4.0.0 ==============
Bug Fixes
----------------------
* SOLR-3430: Added a new test against a real SQL database. Fixed problems revealed by this new test

View File

@ -24,7 +24,11 @@ Current Version: Tika 1.1 (released 2012-03-23)
$Id$
================== Release 4.0.0-dev ==============
================== Release 5.0.0 ==============
(No changes)
================== Release 4.0.0 ==============
* SOLR-3254: Upgrade Solr to Tika 1.1 (janhoy)

View File

@ -7,6 +7,10 @@ See http://wiki.apache.org/solr/LanguageDetection for details
$Id$
================== Release 5.0.0 ==================
(No changes)
================== Release 4.0.0 ==================
(No changes)

View File

@ -22,7 +22,11 @@ WhitespaceTokenizer v2.3.1
$Id$
================== 4.0.0-dev ==============
================== 5.0.0 ==============
(No Changes)
================== 4.0.0 ==============
(No Changes)