diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index c0925e8ab64..48aa462e1f9 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -3,6 +3,9 @@ Lucene Change Log For more information on past and future Lucene versions, please see: http://s.apache.org/luceneversions +======================= Lucene 7.0.0 ======================= +(No Changes) + ======================= Lucene 6.0.0 ======================= System Requirements diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java index 57b8d2ddbcd..755983b6b69 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java @@ -216,26 +216,6 @@ public class TestBackwardsCompatibility extends LuceneTestCase { } final static String[] oldNames = { - "5.0.0-cfs", - "5.0.0-nocfs", - "5.1.0-cfs", - "5.1.0-nocfs", - "5.2.0-cfs", - "5.2.0-nocfs", - "5.2.1-cfs", - "5.2.1-nocfs", - "5.3.0-cfs", - "5.3.0-nocfs", - "5.3.1-cfs", - "5.3.1-nocfs", - "5.3.2-cfs", - "5.3.2-nocfs", - "5.4.0-cfs", - "5.4.0-nocfs", - "5.4.1-cfs", - "5.4.1-nocfs", - "5.5.0-cfs", - "5.5.0-nocfs" }; final String[] unsupportedNames = { @@ -338,7 +318,27 @@ public class TestBackwardsCompatibility extends LuceneTestCase { "4.10.4-cfs", "4.10.4-nocfs", "5x-with-4x-segments-cfs", - "5x-with-4x-segments-nocfs" + "5x-with-4x-segments-nocfs", + "5.0.0-cfs", + "5.0.0-nocfs", + "5.1.0-cfs", + "5.1.0-nocfs", + "5.2.0-cfs", + "5.2.0-nocfs", + "5.2.1-cfs", + "5.2.1-nocfs", + "5.3.0-cfs", + "5.3.0-nocfs", + "5.3.1-cfs", + "5.3.1-nocfs", + "5.3.2-cfs", + "5.3.2-nocfs", + "5.4.0-cfs", + "5.4.0-nocfs", + "5.4.1-cfs", + "5.4.1-nocfs", + "5.5.0-cfs", + "5.5.0-nocfs" }; final static String[] oldSingleSegmentNames = { diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexFormatTooOldException.java b/lucene/core/src/java/org/apache/lucene/index/IndexFormatTooOldException.java index 0644dd69f3c..b7c02f5299e 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexFormatTooOldException.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexFormatTooOldException.java @@ -42,7 +42,7 @@ public class IndexFormatTooOldException extends IOException { * @lucene.internal */ public IndexFormatTooOldException(String resourceDescription, String reason) { super("Format version is not supported (resource " + resourceDescription + "): " + - reason + ". This version of Lucene only supports indexes created with release 4.0 and later."); + reason + ". This version of Lucene only supports indexes created with release 6.0 and later."); this.resourceDescription = resourceDescription; this.reason = reason; this.version = null; @@ -72,7 +72,7 @@ public class IndexFormatTooOldException extends IOException { public IndexFormatTooOldException(String resourceDescription, int version, int minVersion, int maxVersion) { super("Format version is not supported (resource " + resourceDescription + "): " + version + " (needs to be between " + minVersion + " and " + maxVersion + - "). This version of Lucene only supports indexes created with release 4.0 and later."); + "). This version of Lucene only supports indexes created with release 6.0 and later."); this.resourceDescription = resourceDescription; this.version = version; this.minVersion = minVersion; 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 2b4cc57bf01..6a8a25d364d 100644 --- a/lucene/core/src/java/org/apache/lucene/util/Version.java +++ b/lucene/core/src/java/org/apache/lucene/util/Version.java @@ -106,9 +106,18 @@ public final class Version { *

* Use this to get the latest & greatest settings, bug * fixes, etc, for Lucene. + * @deprecated (7.0.0) Use latest */ + @Deprecated public static final Version LUCENE_6_0_0 = new Version(6, 0, 0); + /** + * Match settings and bugs in Lucene's 7.0.0 release. + * @deprecated Use latest + */ + @Deprecated + public static final Version LUCENE_7_0_0 = new Version(7, 0, 0); + // To add a new version: // * Only add above this comment // * If the new version is the newest, change LATEST below and deprecate the previous LATEST @@ -128,7 +137,7 @@ public final class Version { * some defaults may have changed and may break functionality * in your application. */ - public static final Version LATEST = LUCENE_6_0_0; + public static final Version LATEST = LUCENE_7_0_0; /** * Constant for backwards compatibility. diff --git a/lucene/version.properties b/lucene/version.properties index cf7133213ba..55730a2e85d 100644 --- a/lucene/version.properties +++ b/lucene/version.properties @@ -2,7 +2,7 @@ # RELEASE MANAGER must change this file after creating a release and # enter new base version (format "x.y.z", no prefix/appendix): -version.base=6.0.0 +version.base=7.0.0 # Other version property defaults, don't change: version.suffix=SNAPSHOT diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 77511cd701b..6eaf862a00c 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -16,6 +16,9 @@ In this release, there is an example Solr server including a bundled servlet container in the directory named "example". See the Quick Start guide at http://lucene.apache.org/solr/quickstart.html +================== 7.0.0 ================== +(No Changes) + ================== 6.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 aceeee05e17..e5415657e6a 100644 --- 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. --> - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0 - 6.0.0 + 7.0.0