You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/09/18 15:37:15 UTC
svn commit: r1625976 - in /lucene/dev/trunk: lucene/
lucene/core/src/java/org/apache/lucene/codecs/lucene46/
lucene/core/src/java/org/apache/lucene/util/ solr/
solr/example/example-DIH/solr/db/conf/
solr/example/example-DIH/solr/mail/conf/ solr/example...
Author: uschindler
Date: Thu Sep 18 13:37:14 2014
New Revision: 1625976
URL: http://svn.apache.org/r1625976
Log:
LUCENE-5944: Bump version in trunk
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Version.java
lucene/dev/trunk/lucene/version.properties
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml
lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
lucene/dev/trunk/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
lucene/dev/trunk/solr/example/multicore/core0/conf/solrconfig.xml
lucene/dev/trunk/solr/example/multicore/core1/conf/solrconfig.xml
lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1625976&r1=1625975&r2=1625976&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Thu Sep 18 13:37:14 2014
@@ -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
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java?rev=1625976&r1=1625975&r2=1625976&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java Thu Sep 18 13:37:14 2014
@@ -54,8 +54,8 @@ public class Lucene46SegmentInfoWriter e
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());
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Version.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Version.java?rev=1625976&r1=1625975&r2=1625976&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Version.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/Version.java Thu Sep 18 13:37:14 2014
@@ -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 & 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);
Modified: lucene/dev/trunk/lucene/version.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/version.properties?rev=1625976&r1=1625975&r2=1625976&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/version.properties (original)
+++ lucene/dev/trunk/lucene/version.properties Thu Sep 18 13:37:14 2014
@@ -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
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1625976&r1=1625975&r2=1625976&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Sep 18 13:37:14 2014
@@ -17,7 +17,7 @@ In this release, there is an example Sol
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
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml?rev=1625976&r1=1625975&r2=1625976&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/solrconfig.xml Thu Sep 18 13:37:14 2014
@@ -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
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=1625976&r1=1625975&r2=1625976&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/solrconfig.xml Thu Sep 18 13:37:14 2014
@@ -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
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml?rev=1625976&r1=1625975&r2=1625976&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/solrconfig.xml Thu Sep 18 13:37:14 2014
@@ -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
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solrconfig.xml?rev=1625976&r1=1625975&r2=1625976&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solrconfig.xml Thu Sep 18 13:37:14 2014
@@ -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
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml?rev=1625976&r1=1625975&r2=1625976&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/tika/conf/solrconfig.xml Thu Sep 18 13:37:14 2014
@@ -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
Modified: lucene/dev/trunk/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml?rev=1625976&r1=1625975&r2=1625976&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml Thu Sep 18 13:37:14 2014
@@ -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
Modified: lucene/dev/trunk/solr/example/multicore/core0/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/multicore/core0/conf/solrconfig.xml?rev=1625976&r1=1625975&r2=1625976&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/multicore/core0/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/multicore/core0/conf/solrconfig.xml Thu Sep 18 13:37:14 2014
@@ -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. -->
Modified: lucene/dev/trunk/solr/example/multicore/core1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/multicore/core1/conf/solrconfig.xml?rev=1625976&r1=1625975&r2=1625976&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/multicore/core1/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/multicore/core1/conf/solrconfig.xml Thu Sep 18 13:37:14 2014
@@ -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. -->
Modified: lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml?rev=1625976&r1=1625975&r2=1625976&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/solr/collection1/conf/solrconfig.xml Thu Sep 18 13:37:14 2014
@@ -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