diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index cf42511b01a..d3ef091d5ce 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -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 diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java index 0d55b7a97d5..10b2d5f4f15 100755 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java @@ -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()); diff --git a/lucene/core/src/java/org/apache/lucene/util/Version.java b/lucene/core/src/java/org/apache/lucene/util/Version.java index 95115e49708..4078c138afe 100644 --- a/lucene/core/src/java/org/apache/lucene/util/Version.java +++ b/lucene/core/src/java/org/apache/lucene/util/Version.java @@ -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. *

* 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); diff --git a/lucene/version.properties b/lucene/version.properties index 21538dc183b..56f12fcd103 100644 --- a/lucene/version.properties +++ b/lucene/version.properties @@ -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 diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 37e9c1ed6f1..863ae86db74 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -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 diff --git a/solr/example/example-DIH/solr/db/conf/solrconfig.xml b/solr/example/example-DIH/solr/db/conf/solrconfig.xml index 710ed72fd92..03b437bbb29 100755 --- a/solr/example/example-DIH/solr/db/conf/solrconfig.xml +++ b/solr/example/example-DIH/solr/db/conf/solrconfig.xml @@ -35,7 +35,7 @@ that you fully re-index after changing this setting as it can affect both how text is indexed and queried. --> - 5.0.0 + 6.0.0 - 5.0.0 + 6.0.0 - 5.0.0 + 6.0.0 - 5.0.0 + 6.0.0 - 5.0.0 + 6.0.0 - 5.0.0 + 6.0.0 - 5.0.0 + 6.0.0 diff --git a/solr/example/multicore/core1/conf/solrconfig.xml b/solr/example/multicore/core1/conf/solrconfig.xml index cd2a1d549aa..27d3d108aa1 100644 --- a/solr/example/multicore/core1/conf/solrconfig.xml +++ b/solr/example/multicore/core1/conf/solrconfig.xml @@ -21,7 +21,7 @@ It is *not* a good example to work from. --> - 5.0.0 + 6.0.0 diff --git a/solr/example/solr/collection1/conf/solrconfig.xml b/solr/example/solr/collection1/conf/solrconfig.xml index b30dd47e58b..92f5dd1d926 100755 --- a/solr/example/solr/collection1/conf/solrconfig.xml +++ b/solr/example/solr/collection1/conf/solrconfig.xml @@ -35,7 +35,7 @@ that you fully re-index after changing this setting as it can affect both how text is indexed and queried. --> - 5.0.0 + 6.0.0