Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-5944: Bump version in trunk 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1625976 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2014-09-18 13:37:14 +00:00
parent 6e6aa0b2ac
commit 002860d524
14 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/CHANGES.txt
View File

@ -3,7 +3,7 @@ Lucene Change Log
For more information on past and future Lucene versions, please see:
http://s.apache.org/luceneversions
======================= Lucene 5.0.0 =======================
======================= Lucene 6.0.0 =======================
New Features
@ -97,7 +97,7 @@ Other
* LUCENE-5915: Remove Pulsing postings format. (Robert Muir)
======================= Lucene 4.11.0 ======================
======================= Lucene 5.0.0 ======================
New Features

4
lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java
View File

@ -54,8 +54,8 @@ public class Lucene46SegmentInfoWriter extends SegmentInfoWriter {
try {
CodecUtil.writeHeader(output, Lucene46SegmentInfoFormat.CODEC_NAME, Lucene46SegmentInfoFormat.VERSION_CURRENT);
Version version = si.getVersion();
if (version.major < 4 || version.major > 5) {
throw new IllegalArgumentException("invalid major version: should be 4 or 5 but got: " + version.major + " segment=" + si);
if (version.major < 4) {
throw new IllegalArgumentException("invalid major version: should be >= 4 but got: " + version.major + " segment=" + si);
}
// Write the Lucene version that created this segment, since 3.1
output.writeString(version.toString());

14
lucene/core/src/java/org/apache/lucene/util/Version.java
View File

@ -172,18 +172,18 @@ public final class Version {
public static final Version LUCENE_4_10_0 = new Version(4, 10, 0);
/**
* Match settings and bugs in Lucene's 4.11.0 release.
* Match settings and bugs in Lucene's 5.0 release.
* @deprecated (5.0) Use latest
*/
@Deprecated
public static final Version LUCENE_4_11_0 = new Version(4, 11, 0);
public static final Version LUCENE_5_0_0 = new Version(5, 0, 0);
/** Match settings and bugs in Lucene's 5.0 release.
/** Match settings and bugs in Lucene's 6.0 release.
* <p>
* Use this to get the latest &amp; greatest settings, bug
* fixes, etc, for Lucene.
*/
public static final Version LUCENE_5_0_0 = new Version(5, 0, 0);
public static final Version LUCENE_6_0_0 = new Version(6, 0, 0);
// To add a new version:
// * Only add above this comment
@ -204,7 +204,7 @@ public final class Version {
* some defaults may have changed and may break functionality
* in your application.
*/
public static final Version LATEST = LUCENE_5_0_0;
public static final Version LATEST = LUCENE_6_0_0;
/**
* Constant for backwards compatibility.
@ -333,8 +333,8 @@ public final class Version {
this.minor = minor;
this.bugfix = bugfix;
this.prerelease = prerelease;
if (major > 5 || major < 4) {
throw new IllegalArgumentException("Lucene 5.x only supports 5.x and 4.x versions");
if (major > 6 || major < 4) { // TODO fix this!!!
throw new IllegalArgumentException("Lucene 6.x only supports 6.x, 5.x, and 4.x versions");
}
if (minor > 255 | minor < 0) {
throw new IllegalArgumentException("Illegal minor version: " + minor);

2
lucene/version.properties
View File

@ -2,7 +2,7 @@
# RELEAE MANAGER must change this file after creating a release and
# enter new base version (format "x.y.z", no prefix/appendix):
version.base=5.0.0
version.base=6.0.0
# Other version property defaults, don't change:
version.suffix=SNAPSHOT

6
solr/CHANGES.txt
View File

@ -17,7 +17,7 @@ In this release, there is an example Solr server including a bundled
servlet container in the directory named "example".
See the tutorial at http://lucene.apache.org/solr/tutorial.html
================== 5.0.0 ==================
================== 6.0.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
@ -57,7 +57,7 @@ Upgrading from Solr 4.x
* The CollectionsAPI SolrJ calls createCollection(), reloadCollection(),
deleteCollection(), requestStatus(), createShard(), splitShard(), deleteShard(),
createAlias() and deleteAlias() which were deprecated in 4.11 have been removed.
createAlias() and deleteAlias() which were deprecated in 5.0 have been removed.
The new usage involves a builder style construction of the call.
Detailed Change List
@ -108,7 +108,7 @@ Other Changes
* SOLR-6519: Make DirectoryFactory#create() take LockFactory.
(Uwe Schindler)
================== 4.11.0 =================
================== 5.0.0 =================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

2
solr/example/example-DIH/solr/db/conf/solrconfig.xml
View File

@ -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>5.0.0</luceneMatchVersion>
<luceneMatchVersion>6.0.0</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in

2
solr/example/example-DIH/solr/mail/conf/solrconfig.xml
View File

@ -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>5.0.0</luceneMatchVersion>
<luceneMatchVersion>6.0.0</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in

2
solr/example/example-DIH/solr/rss/conf/solrconfig.xml
View File

@ -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>5.0.0</luceneMatchVersion>
<luceneMatchVersion>6.0.0</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in

2
solr/example/example-DIH/solr/solr/conf/solrconfig.xml
View File

@ -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>5.0.0</luceneMatchVersion>
<luceneMatchVersion>6.0.0</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in

2
solr/example/example-DIH/solr/tika/conf/solrconfig.xml
View File

@ -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>5.0.0</luceneMatchVersion>
<luceneMatchVersion>6.0.0</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in

2
solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
View File

@ -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>5.0.0</luceneMatchVersion>
<luceneMatchVersion>6.0.0</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in

2
solr/example/multicore/core0/conf/solrconfig.xml
View File

@ -21,7 +21,7 @@
It is *not* a good example to work from.
-->
<config>
<luceneMatchVersion>5.0.0</luceneMatchVersion>
<luceneMatchVersion>6.0.0</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. -->

2
solr/example/multicore/core1/conf/solrconfig.xml
View File

@ -21,7 +21,7 @@
It is *not* a good example to work from.
-->
<config>
<luceneMatchVersion>5.0.0</luceneMatchVersion>
<luceneMatchVersion>6.0.0</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. -->

2
solr/example/solr/collection1/conf/solrconfig.xml
View File

@ -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>5.0.0</luceneMatchVersion>
<luceneMatchVersion>6.0.0</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in