You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by nk...@apache.org on 2016/03/02 09:37:59 UTC
lucene-solr git commit: Update master version to 7.0.0
Repository: lucene-solr
Updated Branches:
refs/heads/master 251cdbcee -> 96b195432
Update master version to 7.0.0
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/96b19543
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/96b19543
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/96b19543
Branch: refs/heads/master
Commit: 96b195432fbae2006e35138a7dfc3535c0d4aa8e
Parents: 251cdbc
Author: nknize <nk...@apache.org>
Authored: Wed Mar 2 02:37:33 2016 -0600
Committer: nknize <nk...@apache.org>
Committed: Wed Mar 2 02:37:33 2016 -0600
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 ++
.../index/TestBackwardsCompatibility.java | 42 ++++++++++----------
.../index/IndexFormatTooOldException.java | 4 +-
.../java/org/apache/lucene/util/Version.java | 11 ++++-
lucene/version.properties | 2 +-
solr/CHANGES.txt | 3 ++
.../example-DIH/solr/db/conf/solrconfig.xml | 2 +-
.../example-DIH/solr/mail/conf/solrconfig.xml | 2 +-
.../example-DIH/solr/rss/conf/solrconfig.xml | 2 +-
.../example-DIH/solr/solr/conf/solrconfig.xml | 2 +-
.../example-DIH/solr/tika/conf/solrconfig.xml | 2 +-
solr/example/files/conf/solrconfig.xml | 2 +-
.../basic_configs/conf/solrconfig.xml | 2 +-
.../conf/solrconfig.xml | 2 +-
.../conf/solrconfig.xml | 2 +-
15 files changed, 49 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96b19543/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index c0925e8..48aa462 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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96b19543/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
----------------------------------------------------------------------
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 57b8d2d..755983b 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 = {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96b19543/lucene/core/src/java/org/apache/lucene/index/IndexFormatTooOldException.java
----------------------------------------------------------------------
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 0644dd6..b7c02f5 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96b19543/lucene/core/src/java/org/apache/lucene/util/Version.java
----------------------------------------------------------------------
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 2b4cc57..6a8a25d 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 {
* <p>
* 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.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96b19543/lucene/version.properties
----------------------------------------------------------------------
diff --git a/lucene/version.properties b/lucene/version.properties
index cf71332..55730a2 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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96b19543/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 77511cd..6eaf862 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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96b19543/solr/example/example-DIH/solr/db/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/db/conf/solrconfig.xml b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
index aceeee0..e541565 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.
-->
- <luceneMatchVersion>6.0.0</luceneMatchVersion>
+ <luceneMatchVersion>7.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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96b19543/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
index f3a3273..30c61a8 100644
--- a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/mail/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.
-->
- <luceneMatchVersion>6.0.0</luceneMatchVersion>
+ <luceneMatchVersion>7.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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96b19543/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml b/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
index 4ec9180..a6597a1 100644
--- a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/rss/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.
-->
- <luceneMatchVersion>6.0.0</luceneMatchVersion>
+ <luceneMatchVersion>7.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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96b19543/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
index f501a08..84469d9 100644
--- a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/solr/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.
-->
- <luceneMatchVersion>6.0.0</luceneMatchVersion>
+ <luceneMatchVersion>7.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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96b19543/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
index b3c08e8..9c770a0 100644
--- a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/tika/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.
-->
- <luceneMatchVersion>6.0.0</luceneMatchVersion>
+ <luceneMatchVersion>7.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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96b19543/solr/example/files/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/files/conf/solrconfig.xml b/solr/example/files/conf/solrconfig.xml
index 97682f6..4dea6c9 100644
--- a/solr/example/files/conf/solrconfig.xml
+++ b/solr/example/files/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.
-->
- <luceneMatchVersion>6.0.0</luceneMatchVersion>
+ <luceneMatchVersion>7.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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96b19543/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
index f2f14e2..6b2f745 100644
--- a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/basic_configs/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.
-->
- <luceneMatchVersion>6.0.0</luceneMatchVersion>
+ <luceneMatchVersion>7.0.0</luceneMatchVersion>
<!-- Data Directory
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96b19543/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
index 00485c7..72d7bdf 100644
--- a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/data_driven_schema_configs/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.
-->
- <luceneMatchVersion>6.0.0</luceneMatchVersion>
+ <luceneMatchVersion>7.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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96b19543/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index bab4814..900a123 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/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.
-->
- <luceneMatchVersion>6.0.0</luceneMatchVersion>
+ <luceneMatchVersion>7.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