You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2019/01/07 13:28:54 UTC
[2/2] lucene-solr:master: Remove unnecessary back compatibility
Remove unnecessary back compatibility
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/906f94a8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/906f94a8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/906f94a8
Branch: refs/heads/master
Commit: 906f94a8ccdc3c7f1be7c9ba4b4f06e8a0e6614d
Parents: 04f48db
Author: Alan Woodward <ro...@apache.org>
Authored: Mon Jan 7 13:05:18 2019 +0000
Committer: Alan Woodward <ro...@apache.org>
Committed: Mon Jan 7 13:20:01 2019 +0000
----------------------------------------------------------------------
.../analysis/custom/TestCustomAnalyzer.java | 8 +-
.../index/TestBackwardsCompatibility.java | 68 ++++++++--------
.../lucene/index/TestIndexWriterOnOldIndex.java | 4 +-
.../org/apache/lucene/index/dvupdates.7.0.0.zip | Bin 13401 -> 0 bytes
.../org/apache/lucene/index/empty.7.0.0.zip | Bin 375 -> 0 bytes
.../org/apache/lucene/index/index.7.0.0-cfs.zip | Bin 15594 -> 0 bytes
.../apache/lucene/index/index.7.0.0-nocfs.zip | Bin 15586 -> 0 bytes
.../org/apache/lucene/index/index.7.0.1-cfs.zip | Bin 15597 -> 0 bytes
.../apache/lucene/index/index.7.0.1-nocfs.zip | Bin 18335 -> 0 bytes
.../org/apache/lucene/index/index.7.1.0-cfs.zip | Bin 15612 -> 0 bytes
.../apache/lucene/index/index.7.1.0-nocfs.zip | Bin 15609 -> 0 bytes
.../org/apache/lucene/index/index.7.2.0-cfs.zip | Bin 15641 -> 0 bytes
.../apache/lucene/index/index.7.2.0-nocfs.zip | Bin 15629 -> 0 bytes
.../org/apache/lucene/index/index.7.2.1-cfs.zip | Bin 15605 -> 0 bytes
.../apache/lucene/index/index.7.2.1-nocfs.zip | Bin 15606 -> 0 bytes
.../org/apache/lucene/index/index.7.3.0-cfs.zip | Bin 15538 -> 0 bytes
.../apache/lucene/index/index.7.3.0-nocfs.zip | Bin 15548 -> 0 bytes
.../org/apache/lucene/index/index.7.3.1-cfs.zip | Bin 15652 -> 0 bytes
.../apache/lucene/index/index.7.3.1-nocfs.zip | Bin 15640 -> 0 bytes
.../org/apache/lucene/index/index.7.4.0-cfs.zip | Bin 15484 -> 0 bytes
.../apache/lucene/index/index.7.4.0-nocfs.zip | Bin 15493 -> 0 bytes
.../org/apache/lucene/index/index.7.5.0-cfs.zip | Bin 15615 -> 0 bytes
.../apache/lucene/index/index.7.5.0-nocfs.zip | Bin 15629 -> 0 bytes
.../org/apache/lucene/index/index.7.6.0-cfs.zip | Bin 15655 -> 0 bytes
.../apache/lucene/index/index.7.6.0-nocfs.zip | Bin 15649 -> 0 bytes
.../org/apache/lucene/index/moreterms.7.0.0.zip | Bin 175822 -> 0 bytes
.../lucene/index/sorted-invalid.7.5.0.zip | Bin 908443 -> 0 bytes
.../org/apache/lucene/index/sorted.7.0.0.zip | Bin 74558 -> 0 bytes
.../org/apache/lucene/index/sorted.7.0.1.zip | Bin 176238 -> 0 bytes
.../org/apache/lucene/index/sorted.7.1.0.zip | Bin 81963 -> 0 bytes
.../org/apache/lucene/index/sorted.7.2.0.zip | Bin 87935 -> 0 bytes
.../org/apache/lucene/index/sorted.7.2.1.zip | Bin 93388 -> 0 bytes
.../org/apache/lucene/index/sorted.7.3.0.zip | Bin 393834 -> 0 bytes
.../org/apache/lucene/index/sorted.7.3.1.zip | Bin 80784 -> 0 bytes
.../org/apache/lucene/index/sorted.7.4.0.zip | Bin 158939 -> 0 bytes
.../org/apache/lucene/index/sorted.7.5.0.zip | Bin 82239 -> 0 bytes
.../org/apache/lucene/index/sorted.7.6.0.zip | Bin 74541 -> 0 bytes
.../lucene/index/unsupported.7.0.0-cfs.zip | Bin 0 -> 15594 bytes
.../lucene/index/unsupported.7.0.0-nocfs.zip | Bin 0 -> 15586 bytes
.../lucene/index/unsupported.7.0.1-cfs.zip | Bin 0 -> 15597 bytes
.../lucene/index/unsupported.7.0.1-nocfs.zip | Bin 0 -> 18335 bytes
.../lucene/index/unsupported.7.1.0-cfs.zip | Bin 0 -> 15612 bytes
.../lucene/index/unsupported.7.1.0-nocfs.zip | Bin 0 -> 15609 bytes
.../lucene/index/unsupported.7.2.0-cfs.zip | Bin 0 -> 15641 bytes
.../lucene/index/unsupported.7.2.0-nocfs.zip | Bin 0 -> 15629 bytes
.../lucene/index/unsupported.7.2.1-cfs.zip | Bin 0 -> 15605 bytes
.../lucene/index/unsupported.7.2.1-nocfs.zip | Bin 0 -> 15606 bytes
.../lucene/index/unsupported.7.3.0-cfs.zip | Bin 0 -> 15538 bytes
.../lucene/index/unsupported.7.3.0-nocfs.zip | Bin 0 -> 15548 bytes
.../lucene/index/unsupported.7.3.1-cfs.zip | Bin 0 -> 15652 bytes
.../lucene/index/unsupported.7.3.1-nocfs.zip | Bin 0 -> 15640 bytes
.../lucene/index/unsupported.7.4.0-cfs.zip | Bin 0 -> 15484 bytes
.../lucene/index/unsupported.7.4.0-nocfs.zip | Bin 0 -> 15493 bytes
.../lucene/index/unsupported.7.5.0-cfs.zip | Bin 0 -> 15615 bytes
.../lucene/index/unsupported.7.5.0-nocfs.zip | Bin 0 -> 15629 bytes
.../lucene/index/unsupported.7.6.0-cfs.zip | Bin 0 -> 15655 bytes
.../lucene/index/unsupported.7.6.0-nocfs.zip | Bin 0 -> 15649 bytes
.../index/unsupported.dvupdates.7.0.0.zip | Bin 0 -> 13401 bytes
.../lucene/index/unsupported.empty.7.0.0.zip | Bin 0 -> 375 bytes
.../index/unsupported.moreterms.7.0.0.zip | Bin 0 -> 175822 bytes
.../index/unsupported.sorted-invalid.7.5.0.zip | Bin 0 -> 908443 bytes
.../lucene/index/unsupported.sorted.7.0.0.zip | Bin 0 -> 74558 bytes
.../lucene/index/unsupported.sorted.7.0.1.zip | Bin 0 -> 176238 bytes
.../lucene/index/unsupported.sorted.7.1.0.zip | Bin 0 -> 81963 bytes
.../lucene/index/unsupported.sorted.7.2.0.zip | Bin 0 -> 87935 bytes
.../lucene/index/unsupported.sorted.7.2.1.zip | Bin 0 -> 93388 bytes
.../lucene/index/unsupported.sorted.7.3.0.zip | Bin 0 -> 393834 bytes
.../lucene/index/unsupported.sorted.7.3.1.zip | Bin 0 -> 80784 bytes
.../lucene/index/unsupported.sorted.7.4.0.zip | Bin 0 -> 158939 bytes
.../lucene/index/unsupported.sorted.7.5.0.zip | Bin 0 -> 82239 bytes
.../lucene/index/unsupported.sorted.7.6.0.zip | Bin 0 -> 74541 bytes
.../index/IndexFormatTooOldException.java | 4 +-
.../org/apache/lucene/index/LeafMetaData.java | 3 -
.../java/org/apache/lucene/util/Version.java | 78 -------------------
.../apache/lucene/index/TestSegmentInfos.java | 10 +--
.../org/apache/lucene/util/TestVersion.java | 18 ++---
.../java/org/apache/solr/core/SolrConfig.java | 2 +-
.../apache/solr/handler/ReplicationHandler.java | 7 --
.../apache/solr/parser/SolrQueryParserBase.java | 3 +-
.../solr/schema/FieldTypePluginLoader.java | 6 +-
.../solr/search/ExtendedDismaxQParser.java | 12 +--
.../TestNonDefinedSimilarityFactory.java | 21 -----
82 files changed, 65 insertions(+), 179 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java
index 0a0287a..1afb90e 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java
@@ -105,7 +105,7 @@ public class TestCustomAnalyzer extends BaseTokenStreamTestCase {
public void testFactoryHtmlStripClassicFolding() throws Exception {
CustomAnalyzer a = CustomAnalyzer.builder()
- .withDefaultMatchVersion(Version.LUCENE_7_0_0)
+ .withDefaultMatchVersion(Version.LUCENE_8_0_0)
.addCharFilter(HTMLStripCharFilterFactory.class)
.withTokenizer(ClassicTokenizerFactory.class)
.addTokenFilter(ASCIIFoldingFilterFactory.class, "preserveOriginal", "true")
@@ -124,7 +124,7 @@ public class TestCustomAnalyzer extends BaseTokenStreamTestCase {
assertSame(LowerCaseFilterFactory.class, tokenFilters.get(1).getClass());
assertEquals(100, a.getPositionIncrementGap("dummy"));
assertEquals(1000, a.getOffsetGap("dummy"));
- assertSame(Version.LUCENE_7_0_0, a.getVersion());
+ assertSame(Version.LUCENE_8_0_0, a.getVersion());
assertAnalyzesTo(a, "<p>foo bar</p> FOO BAR",
new String[] { "foo", "bar", "foo", "bar" },
@@ -137,7 +137,7 @@ public class TestCustomAnalyzer extends BaseTokenStreamTestCase {
public void testHtmlStripClassicFolding() throws Exception {
CustomAnalyzer a = CustomAnalyzer.builder()
- .withDefaultMatchVersion(Version.LUCENE_7_0_0)
+ .withDefaultMatchVersion(Version.LUCENE_8_0_0)
.addCharFilter("htmlstrip")
.withTokenizer("classic")
.addTokenFilter("asciifolding", "preserveOriginal", "true")
@@ -156,7 +156,7 @@ public class TestCustomAnalyzer extends BaseTokenStreamTestCase {
assertSame(LowerCaseFilterFactory.class, tokenFilters.get(1).getClass());
assertEquals(100, a.getPositionIncrementGap("dummy"));
assertEquals(1000, a.getOffsetGap("dummy"));
- assertSame(Version.LUCENE_7_0_0, a.getVersion());
+ assertSame(Version.LUCENE_8_0_0, a.getVersion());
assertAnalyzesTo(a, "<p>foo bar</p> FOO BAR",
new String[] { "foo", "bar", "foo", "bar" },
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/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 b2ffc1f..d66f17a 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
@@ -287,26 +287,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
}
final static String[] oldNames = {
- "7.0.0-cfs",
- "7.0.0-nocfs",
- "7.0.1-cfs",
- "7.0.1-nocfs",
- "7.1.0-cfs",
- "7.1.0-nocfs",
- "7.2.0-cfs",
- "7.2.0-nocfs",
- "7.2.1-cfs",
- "7.2.1-nocfs",
- "7.3.0-cfs",
- "7.3.0-nocfs",
- "7.3.1-cfs",
- "7.3.1-nocfs",
- "7.4.0-cfs",
- "7.4.0-nocfs",
- "7.5.0-cfs",
- "7.5.0-nocfs",
- "7.6.0-cfs",
- "7.6.0-nocfs"
+
};
public static String[] getOldNames() {
@@ -314,16 +295,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
}
final static String[] oldSortedNames = {
- "sorted.7.0.0",
- "sorted.7.0.1",
- "sorted.7.1.0",
- "sorted.7.2.0",
- "sorted.7.2.1",
- "sorted.7.3.0",
- "sorted.7.3.1",
- "sorted.7.4.0",
- "sorted.7.5.0",
- "sorted.7.6.0"
+
};
public static String[] getOldSortedNames() {
@@ -496,7 +468,27 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
"6.6.4-cfs",
"6.6.4-nocfs",
"6.6.5-cfs",
- "6.6.5-nocfs"
+ "6.6.5-nocfs",
+ "7.0.0-cfs",
+ "7.0.0-nocfs",
+ "7.0.1-cfs",
+ "7.0.1-nocfs",
+ "7.1.0-cfs",
+ "7.1.0-nocfs",
+ "7.2.0-cfs",
+ "7.2.0-nocfs",
+ "7.2.1-cfs",
+ "7.2.1-nocfs",
+ "7.3.0-cfs",
+ "7.3.0-nocfs",
+ "7.3.1-cfs",
+ "7.3.1-nocfs",
+ "7.4.0-cfs",
+ "7.4.0-nocfs",
+ "7.5.0-cfs",
+ "7.5.0-nocfs",
+ "7.6.0-cfs",
+ "7.6.0-nocfs"
};
// TODO: on 6.0.0 release, gen the single segment indices and add here:
@@ -1504,9 +1496,10 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
}
}
- public static final String emptyIndex = "empty.7.0.0.zip";
+ public static final String emptyIndex = "empty.8.0.0.zip";
public void testUpgradeEmptyOldIndex() throws Exception {
+ assumeTrue("Reenable when 8.0 is released", false);
Path oldIndexDir = createTempDir("emptyIndex");
TestUtil.unzip(getDataInputStream(emptyIndex), oldIndexDir);
Directory dir = newFSDirectory(oldIndexDir);
@@ -1518,9 +1511,10 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
dir.close();
}
- public static final String moreTermsIndex = "moreterms.7.0.0.zip";
+ public static final String moreTermsIndex = "moreterms.8.0.0.zip";
public void testMoreTerms() throws Exception {
+ assumeTrue("Reenable when 8.0 is released", false);
Path oldIndexDir = createTempDir("moreterms");
TestUtil.unzip(getDataInputStream(moreTermsIndex), oldIndexDir);
Directory dir = newFSDirectory(oldIndexDir);
@@ -1530,7 +1524,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
dir.close();
}
- public static final String dvUpdatesIndex = "dvupdates.7.0.0.zip";
+ public static final String dvUpdatesIndex = "dvupdates.8.0.0.zip";
private void assertNumericDocValues(LeafReader r, String f, String cf) throws IOException {
NumericDocValues ndvf = r.getNumericDocValues(f);
@@ -1565,6 +1559,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
}
public void testDocValuesUpdates() throws Exception {
+ assumeTrue("Reenable when 8.0 is released", false);
Path oldIndexDir = createTempDir("dvupdates");
TestUtil.unzip(getDataInputStream(dvUpdatesIndex), oldIndexDir);
Directory dir = newFSDirectory(oldIndexDir);
@@ -1593,6 +1588,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
}
public void testSoftDeletes() throws Exception {
+ assumeTrue("Reenable when 8.0 is released", false);
Path oldIndexDir = createTempDir("dvupdates");
TestUtil.unzip(getDataInputStream(dvUpdatesIndex), oldIndexDir);
Directory dir = newFSDirectory(oldIndexDir);
@@ -1613,6 +1609,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
}
public void testDocValuesUpdatesWithNewField() throws Exception {
+ assumeTrue("Reenable when 8.0 is released", false);
Path oldIndexDir = createTempDir("dvupdates");
TestUtil.unzip(getDataInputStream(dvUpdatesIndex), oldIndexDir);
Directory dir = newFSDirectory(oldIndexDir);
@@ -1726,8 +1723,9 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
* before https://issues.apache.org/jira/browse/LUCENE-8592.
*/
public void testSortedIndexWithInvalidSort() throws Exception {
+ assumeTrue("Reenable when 8.0 is released", false);
Path path = createTempDir("sorted");
- String name = "sorted-invalid.7.5.0.zip";
+ String name = "sorted-invalid.8.0.0.zip";
InputStream resource = TestBackwardsCompatibility.class.getResourceAsStream(name);
assertNotNull("Sorted index index " + name + " not found", resource);
TestUtil.unzip(resource, path);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/TestIndexWriterOnOldIndex.java
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestIndexWriterOnOldIndex.java b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestIndexWriterOnOldIndex.java
index db33fb3..3137854 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestIndexWriterOnOldIndex.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestIndexWriterOnOldIndex.java
@@ -29,8 +29,8 @@ import org.apache.lucene.util.Version;
public class TestIndexWriterOnOldIndex extends LuceneTestCase {
public void testOpenModeAndCreatedVersion() throws IOException {
- assumeTrue("Reenable when 7.0 is released", false);
- InputStream resource = getClass().getResourceAsStream("unsupported.index.single-empty-doc.7.0.0.zip");
+ assumeTrue("Reenable when 8.0 is released", false);
+ InputStream resource = getClass().getResourceAsStream("index.single-empty-doc.8.0.0.zip");
assertNotNull(resource);
Path path = createTempDir();
TestUtil.unzip(resource, path);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/dvupdates.7.0.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/dvupdates.7.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/dvupdates.7.0.0.zip
deleted file mode 100644
index 6c94eae..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/dvupdates.7.0.0.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/empty.7.0.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/empty.7.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/empty.7.0.0.zip
deleted file mode 100644
index d8dac24..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/empty.7.0.0.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.0-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.0-cfs.zip
deleted file mode 100644
index 1419931..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.0-cfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.0-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.0-nocfs.zip
deleted file mode 100644
index 83c3242..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.0-nocfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.1-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.1-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.1-cfs.zip
deleted file mode 100644
index 8662be0..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.1-cfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.1-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.1-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.1-nocfs.zip
deleted file mode 100644
index e40753b..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.0.1-nocfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.1.0-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.1.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.1.0-cfs.zip
deleted file mode 100644
index ff7fa54..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.1.0-cfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.1.0-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.1.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.1.0-nocfs.zip
deleted file mode 100644
index 1b3bbdc..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.1.0-nocfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.0-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.0-cfs.zip
deleted file mode 100644
index 5dc88f0..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.0-cfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.0-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.0-nocfs.zip
deleted file mode 100644
index da79b30..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.0-nocfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.1-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.1-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.1-cfs.zip
deleted file mode 100644
index e579dab..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.1-cfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.1-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.1-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.1-nocfs.zip
deleted file mode 100644
index 68f14a4..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.2.1-nocfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.0-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.0-cfs.zip
deleted file mode 100644
index c213632..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.0-cfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.0-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.0-nocfs.zip
deleted file mode 100644
index c12ca5f..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.0-nocfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.1-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.1-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.1-cfs.zip
deleted file mode 100644
index 4f940ea..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.1-cfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.1-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.1-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.1-nocfs.zip
deleted file mode 100644
index f3014dc..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.3.1-nocfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.4.0-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.4.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.4.0-cfs.zip
deleted file mode 100644
index b810fd0..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.4.0-cfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.4.0-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.4.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.4.0-nocfs.zip
deleted file mode 100644
index f2c4674..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.4.0-nocfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.5.0-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.5.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.5.0-cfs.zip
deleted file mode 100644
index 0e24be4..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.5.0-cfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.5.0-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.5.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.5.0-nocfs.zip
deleted file mode 100644
index f975332..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.5.0-nocfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.6.0-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.6.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.6.0-cfs.zip
deleted file mode 100644
index 79fb654..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.6.0-cfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.6.0-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.6.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.6.0-nocfs.zip
deleted file mode 100644
index daaee82..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.7.6.0-nocfs.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/moreterms.7.0.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/moreterms.7.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/moreterms.7.0.0.zip
deleted file mode 100644
index 5366c09..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/moreterms.7.0.0.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted-invalid.7.5.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted-invalid.7.5.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted-invalid.7.5.0.zip
deleted file mode 100644
index 615afdf..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted-invalid.7.5.0.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.0.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.0.0.zip
deleted file mode 100644
index 13948dc..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.0.0.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.0.1.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.0.1.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.0.1.zip
deleted file mode 100644
index 2ee6aab..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.0.1.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.1.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.1.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.1.0.zip
deleted file mode 100644
index f57a64c..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.1.0.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.2.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.2.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.2.0.zip
deleted file mode 100644
index 30dcec7..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.2.0.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.2.1.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.2.1.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.2.1.zip
deleted file mode 100644
index 80e676a..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.2.1.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.3.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.3.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.3.0.zip
deleted file mode 100644
index cc2b886..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.3.0.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.3.1.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.3.1.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.3.1.zip
deleted file mode 100644
index f81579f..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.3.1.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.4.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.4.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.4.0.zip
deleted file mode 100644
index b427a50..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.4.0.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.5.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.5.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.5.0.zip
deleted file mode 100644
index 2d91e9a..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.5.0.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.6.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.6.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.6.0.zip
deleted file mode 100644
index f510fce..0000000
Binary files a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.6.0.zip and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.0-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.0-cfs.zip
new file mode 100644
index 0000000..1419931
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.0-cfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.0-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.0-nocfs.zip
new file mode 100644
index 0000000..83c3242
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.0-nocfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.1-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.1-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.1-cfs.zip
new file mode 100644
index 0000000..8662be0
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.1-cfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.1-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.1-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.1-nocfs.zip
new file mode 100644
index 0000000..e40753b
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.0.1-nocfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.1.0-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.1.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.1.0-cfs.zip
new file mode 100644
index 0000000..ff7fa54
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.1.0-cfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.1.0-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.1.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.1.0-nocfs.zip
new file mode 100644
index 0000000..1b3bbdc
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.1.0-nocfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.0-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.0-cfs.zip
new file mode 100644
index 0000000..5dc88f0
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.0-cfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.0-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.0-nocfs.zip
new file mode 100644
index 0000000..da79b30
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.0-nocfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.1-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.1-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.1-cfs.zip
new file mode 100644
index 0000000..e579dab
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.1-cfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.1-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.1-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.1-nocfs.zip
new file mode 100644
index 0000000..68f14a4
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.2.1-nocfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.0-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.0-cfs.zip
new file mode 100644
index 0000000..c213632
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.0-cfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.0-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.0-nocfs.zip
new file mode 100644
index 0000000..c12ca5f
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.0-nocfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.1-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.1-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.1-cfs.zip
new file mode 100644
index 0000000..4f940ea
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.1-cfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.1-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.1-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.1-nocfs.zip
new file mode 100644
index 0000000..f3014dc
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.3.1-nocfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.4.0-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.4.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.4.0-cfs.zip
new file mode 100644
index 0000000..b810fd0
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.4.0-cfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.4.0-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.4.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.4.0-nocfs.zip
new file mode 100644
index 0000000..f2c4674
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.4.0-nocfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.5.0-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.5.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.5.0-cfs.zip
new file mode 100644
index 0000000..0e24be4
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.5.0-cfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.5.0-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.5.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.5.0-nocfs.zip
new file mode 100644
index 0000000..f975332
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.5.0-nocfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.6.0-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.6.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.6.0-cfs.zip
new file mode 100644
index 0000000..79fb654
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.6.0-cfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.6.0-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.6.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.6.0-nocfs.zip
new file mode 100644
index 0000000..daaee82
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.6.0-nocfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.dvupdates.7.0.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.dvupdates.7.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.dvupdates.7.0.0.zip
new file mode 100644
index 0000000..6c94eae
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.dvupdates.7.0.0.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.empty.7.0.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.empty.7.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.empty.7.0.0.zip
new file mode 100644
index 0000000..d8dac24
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.empty.7.0.0.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.moreterms.7.0.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.moreterms.7.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.moreterms.7.0.0.zip
new file mode 100644
index 0000000..5366c09
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.moreterms.7.0.0.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted-invalid.7.5.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted-invalid.7.5.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted-invalid.7.5.0.zip
new file mode 100644
index 0000000..615afdf
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted-invalid.7.5.0.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.0.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.0.0.zip
new file mode 100644
index 0000000..13948dc
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.0.0.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.0.1.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.0.1.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.0.1.zip
new file mode 100644
index 0000000..2ee6aab
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.0.1.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.1.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.1.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.1.0.zip
new file mode 100644
index 0000000..f57a64c
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.1.0.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.2.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.2.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.2.0.zip
new file mode 100644
index 0000000..30dcec7
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.2.0.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.2.1.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.2.1.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.2.1.zip
new file mode 100644
index 0000000..80e676a
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.2.1.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.3.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.3.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.3.0.zip
new file mode 100644
index 0000000..cc2b886
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.3.0.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.3.1.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.3.1.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.3.1.zip
new file mode 100644
index 0000000..f81579f
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.3.1.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.4.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.4.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.4.0.zip
new file mode 100644
index 0000000..b427a50
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.4.0.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.5.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.5.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.5.0.zip
new file mode 100644
index 0000000..2d91e9a
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.5.0.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.6.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.6.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.6.0.zip
new file mode 100644
index 0000000..f510fce
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.sorted.7.6.0.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/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 1fd7953..2495173 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 7.0 and later.");
+ reason + ". This version of Lucene only supports indexes created with release 8.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 6.0 and later.");
+ "). This version of Lucene only supports indexes created with release 8.0 and later.");
this.resourceDescription = resourceDescription;
this.version = version;
this.minVersion = minVersion;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/core/src/java/org/apache/lucene/index/LeafMetaData.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/LeafMetaData.java b/lucene/core/src/java/org/apache/lucene/index/LeafMetaData.java
index 567d43e..70b701d 100644
--- a/lucene/core/src/java/org/apache/lucene/index/LeafMetaData.java
+++ b/lucene/core/src/java/org/apache/lucene/index/LeafMetaData.java
@@ -38,9 +38,6 @@ public final class LeafMetaData {
if (createdVersionMajor < 6) {
throw new IllegalArgumentException("createdVersionMajor must be >= 6, got: " + createdVersionMajor);
}
- if (minVersion != null && minVersion.onOrAfter(Version.LUCENE_7_0_0) == false) {
- throw new IllegalArgumentException("minVersion must be >= 7.0.0: " + minVersion);
- }
if (createdVersionMajor >= 7 && minVersion == null) {
throw new IllegalArgumentException("minVersion must be set when createdVersionMajor is >= 7");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/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 213c12b..8a5628e 100644
--- a/lucene/core/src/java/org/apache/lucene/util/Version.java
+++ b/lucene/core/src/java/org/apache/lucene/util/Version.java
@@ -33,84 +33,6 @@ import java.util.Locale;
public final class Version {
/**
- * Match settings and bugs in Lucene's 7.0.0 release.
- * @deprecated (8.0.0) Use latest
- */
- @Deprecated
- public static final Version LUCENE_7_0_0 = new Version(7, 0, 0);
-
- /**
- * Match settings and bugs in Lucene's 7.0.1 release.
- * @deprecated Use latest
- */
- @Deprecated
- public static final Version LUCENE_7_0_1 = new Version(7, 0, 1);
-
- /**
- * Match settings and bugs in Lucene's 7.1.0 release.
- * @deprecated Use latest
- */
- @Deprecated
- public static final Version LUCENE_7_1_0 = new Version(7, 1, 0);
-
- /**
- * Match settings and bugs in Lucene's 7.2.0 release.
- * @deprecated Use latest
- */
- @Deprecated
- public static final Version LUCENE_7_2_0 = new Version(7, 2, 0);
-
- /**
- * Match settings and bugs in Lucene's 7.2.1 release.
- * @deprecated Use latest
- */
- @Deprecated
- public static final Version LUCENE_7_2_1 = new Version(7, 2, 1);
-
-
- /**
- * Match settings and bugs in Lucene's 7.3.0 release.
- * @deprecated Use latest
- */
- @Deprecated
- public static final Version LUCENE_7_3_0 = new Version(7, 3, 0);
-
- /**
- * Match settings and bugs in Lucene's 7.3.1 release.
- * @deprecated Use latest
- */
- @Deprecated
- public static final Version LUCENE_7_3_1 = new Version(7, 3, 1);
-
- /**
- * Match settings and bugs in Lucene's 7.4.0 release.
- * @deprecated Use latest
- */
- @Deprecated
- public static final Version LUCENE_7_4_0 = new Version(7, 4, 0);
-
- /**
- * Match settings and bugs in Lucene's 7.5.0 release.
- * @deprecated Use latest
- */
- @Deprecated
- public static final Version LUCENE_7_5_0 = new Version(7, 5, 0);
-
- /**
- * Match settings and bugs in Lucene's 7.6.0 release.
- * @deprecated Use latest
- */
- @Deprecated
- public static final Version LUCENE_7_6_0 = new Version(7, 6, 0);
-
- /**
- * Match settings and bugs in Lucene's 7.7.0 release.
- * @deprecated Use latest
- */
- @Deprecated
- public static final Version LUCENE_7_7_0 = new Version(7, 7, 0);
-
- /**
* Match settings and bugs in Lucene's 8.0.0 release.
* @deprecated (9.0.0) Use latest
*/
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java
index 7611d15..ac218e0 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java
@@ -61,7 +61,7 @@ public class TestSegmentInfos extends LuceneTestCase {
Codec codec = Codec.getDefault();
SegmentInfos sis = new SegmentInfos(Version.LATEST.major);
- SegmentInfo info = new SegmentInfo(dir, Version.LUCENE_8_0_0, Version.LUCENE_8_0_0, "_0", 1, false, Codec.getDefault(),
+ SegmentInfo info = new SegmentInfo(dir, Version.LUCENE_9_0_0, Version.LUCENE_9_0_0, "_0", 1, false, Codec.getDefault(),
Collections.<String,String>emptyMap(), id, Collections.<String,String>emptyMap(), null);
info.setFiles(Collections.<String>emptySet());
codec.segmentInfoFormat().write(dir, info, IOContext.DEFAULT);
@@ -70,7 +70,7 @@ public class TestSegmentInfos extends LuceneTestCase {
sis.add(commitInfo);
sis.commit(dir);
sis = SegmentInfos.readLatestCommit(dir);
- assertEquals(Version.LUCENE_8_0_0, sis.getMinSegmentLuceneVersion());
+ assertEquals(Version.LUCENE_9_0_0, sis.getMinSegmentLuceneVersion());
assertEquals(Version.LATEST, sis.getCommitLuceneVersion());
dir.close();
}
@@ -83,14 +83,14 @@ public class TestSegmentInfos extends LuceneTestCase {
Codec codec = Codec.getDefault();
SegmentInfos sis = new SegmentInfos(Version.LATEST.major);
- SegmentInfo info = new SegmentInfo(dir, Version.LUCENE_8_0_0, Version.LUCENE_8_0_0, "_0", 1, false, Codec.getDefault(),
+ SegmentInfo info = new SegmentInfo(dir, Version.LUCENE_9_0_0, Version.LUCENE_9_0_0, "_0", 1, false, Codec.getDefault(),
Collections.<String,String>emptyMap(), id, Collections.<String,String>emptyMap(), null);
info.setFiles(Collections.<String>emptySet());
codec.segmentInfoFormat().write(dir, info, IOContext.DEFAULT);
SegmentCommitInfo commitInfo = new SegmentCommitInfo(info, 0, 0, -1, -1, -1);
sis.add(commitInfo);
- info = new SegmentInfo(dir, Version.LUCENE_8_0_0, Version.LUCENE_8_0_0, "_1", 1, false, Codec.getDefault(),
+ info = new SegmentInfo(dir, Version.LUCENE_9_0_0, Version.LUCENE_9_0_0, "_1", 1, false, Codec.getDefault(),
Collections.<String,String>emptyMap(), id, Collections.<String,String>emptyMap(), null);
info.setFiles(Collections.<String>emptySet());
codec.segmentInfoFormat().write(dir, info, IOContext.DEFAULT);
@@ -99,7 +99,7 @@ public class TestSegmentInfos extends LuceneTestCase {
sis.commit(dir);
sis = SegmentInfos.readLatestCommit(dir);
- assertEquals(Version.LUCENE_8_0_0, sis.getMinSegmentLuceneVersion());
+ assertEquals(Version.LUCENE_9_0_0, sis.getMinSegmentLuceneVersion());
assertEquals(Version.LATEST, sis.getCommitLuceneVersion());
dir.close();
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/lucene/core/src/test/org/apache/lucene/util/TestVersion.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/util/TestVersion.java b/lucene/core/src/test/org/apache/lucene/util/TestVersion.java
index cc30a5d..e19c615 100644
--- a/lucene/core/src/test/org/apache/lucene/util/TestVersion.java
+++ b/lucene/core/src/test/org/apache/lucene/util/TestVersion.java
@@ -32,20 +32,20 @@ public class TestVersion extends LuceneTestCase {
assertTrue("LATEST must be always onOrAfter("+v+")", Version.LATEST.onOrAfter(v));
}
}
- assertTrue(Version.LUCENE_8_0_0.onOrAfter(Version.LUCENE_7_0_0));;
+ assertTrue(Version.LUCENE_9_0_0.onOrAfter(Version.LUCENE_8_0_0));;
}
public void testToString() {
- assertEquals("7.0.0", Version.LUCENE_7_0_0.toString());
assertEquals("8.0.0", Version.LUCENE_8_0_0.toString());
+ assertEquals("9.0.0", Version.LUCENE_9_0_0.toString());
}
public void testParseLeniently() throws Exception {
- assertEquals(Version.LUCENE_7_0_0, Version.parseLeniently("7.0"));
- assertEquals(Version.LUCENE_7_0_0, Version.parseLeniently("7.0.0"));
- assertEquals(Version.LUCENE_7_0_0, Version.parseLeniently("LUCENE_70"));
- assertEquals(Version.LUCENE_7_0_0, Version.parseLeniently("LUCENE_7_0"));
- assertEquals(Version.LUCENE_7_0_0, Version.parseLeniently("LUCENE_7_0_0"));
+ assertEquals(Version.LUCENE_9_0_0, Version.parseLeniently("9.0"));
+ assertEquals(Version.LUCENE_9_0_0, Version.parseLeniently("9.0.0"));
+ assertEquals(Version.LUCENE_9_0_0, Version.parseLeniently("LUCENE_90"));
+ assertEquals(Version.LUCENE_9_0_0, Version.parseLeniently("LUCENE_9_0"));
+ assertEquals(Version.LUCENE_9_0_0, Version.parseLeniently("LUCENE_9_0_0"));
assertEquals(Version.LUCENE_8_0_0, Version.parseLeniently("8.0"));
assertEquals(Version.LUCENE_8_0_0, Version.parseLeniently("8.0.0"));
assertEquals(Version.LUCENE_8_0_0, Version.parseLeniently("LUCENE_80"));
@@ -95,7 +95,7 @@ public class TestVersion extends LuceneTestCase {
}
public void testParse() throws Exception {
- assertEquals(Version.LUCENE_7_0_0, Version.parse("7.0.0"));
+ assertEquals(Version.LUCENE_9_0_0, Version.parse("9.0.0"));
assertEquals(Version.LUCENE_8_0_0, Version.parse("8.0.0"));
// Version does not pass judgement on the major version:
@@ -104,7 +104,7 @@ public class TestVersion extends LuceneTestCase {
}
public void testForwardsCompatibility() throws Exception {
- assertTrue(Version.parse("7.10.20").onOrAfter(Version.LUCENE_7_0_0));
+ assertTrue(Version.parse("8.10.20").onOrAfter(Version.LUCENE_8_0_0));
}
public void testParseExceptions() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/solr/core/src/java/org/apache/solr/core/SolrConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index 0b5f35b..a07ec46 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -315,7 +315,7 @@ public class SolrConfig extends XmlConfigFile implements MapSerializable {
"requestDispatcher/requestParsers/@enableStreamBody", false);
handleSelect = getBool(
- "requestDispatcher/@handleSelect", !luceneMatchVersion.onOrAfter(Version.LUCENE_7_0_0));
+ "requestDispatcher/@handleSelect", false);
addHttpRequestToContext = getBool(
"requestDispatcher/requestParsers/@addHttpRequestToContext", false);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
index d4db8c9..82a8231 100644
--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
@@ -69,7 +69,6 @@ import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.store.RateLimiter;
-import org.apache.lucene.util.Version;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.params.CommonParams;
@@ -110,7 +109,6 @@ import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import static org.apache.solr.common.params.CommonParams.NAME;
-import static org.apache.solr.core.XmlConfigFile.assertWarnOrFail;
/**
* <p> A Handler which provides a REST API for replication and serves replication requests from Slaves. </p>
@@ -1319,11 +1317,6 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
if (reserve != null && !reserve.trim().equals("")) {
reserveCommitDuration = readIntervalMs(reserve);
deprecatedReserveCommitDuration = reserveCommitDuration;
- // remove this error check & backcompat logic when Version.LUCENE_7_1_0 is removed
- assertWarnOrFail(
- "Beginning with Solr 7.1, master."+RESERVE + " is deprecated and should now be configured directly on the ReplicationHandler.",
- (null == reserve),
- core.getSolrConfig().luceneMatchVersion.onOrAfter(Version.LUCENE_7_1_0));
}
isMaster = true;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java b/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java
index 0068c9a..a97bae5 100644
--- a/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java
+++ b/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java
@@ -44,7 +44,6 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.RegexpQuery;
import org.apache.lucene.search.WildcardQuery;
import org.apache.lucene.util.QueryBuilder;
-import org.apache.lucene.util.Version;
import org.apache.lucene.util.automaton.Automata;
import org.apache.lucene.util.automaton.Automaton;
import org.apache.lucene.util.automaton.Operations;
@@ -228,9 +227,11 @@ public abstract class SolrQueryParserBase extends QueryBuilder {
this.defaultField = defaultField;
setAnalyzer(schema.getQueryAnalyzer());
// TODO in 8.0(?) remove this. Prior to 7.2 we defaulted to allowing sub-query parsing by default
+ /*
if (!parser.getReq().getCore().getSolrConfig().luceneMatchVersion.onOrAfter(Version.LUCENE_7_2_0)) {
setAllowSubQueryParsing(true);
} // otherwise defaults to false
+ */
}
// Turn on the "filter" bit and return the previous flags for the caller to save
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java b/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
index 25b5408..158d569 100644
--- a/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
+++ b/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
@@ -364,10 +364,10 @@ public final class FieldTypePluginLoader
Version version = (configuredVersion != null) ?
SolrConfig.parseLuceneVersionString(configuredVersion) : schema.getDefaultLuceneMatchVersion();
- if (!version.onOrAfter(Version.LUCENE_7_0_0)) {
+ if (!version.onOrAfter(Version.LUCENE_8_0_0)) {
log.warn(pluginClassName + " is using deprecated " + version +
- " emulation. You should at some point declare and reindex to at least 7.0, because " +
- "6.x emulation is deprecated and will be removed in 8.0");
+ " emulation. You should at some point declare and reindex to at least 8.0, because " +
+ "7.x emulation is deprecated and will be removed in 9.0");
}
return version;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
index d234121..95d723e 100644
--- a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
+++ b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
@@ -47,7 +47,6 @@ import org.apache.lucene.search.MultiPhraseQuery;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.spans.SpanQuery;
-import org.apache.lucene.util.Version;
import org.apache.solr.analysis.TokenizerChain;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.DisMaxParams;
@@ -1519,7 +1518,7 @@ public class ExtendedDismaxQParser extends QParser {
private DynamicField[] dynamicUserFields;
private DynamicField[] negativeDynamicUserFields;
- UserFields(Map<String, Float> ufm, boolean forbidSubQueryByDefault) {
+ UserFields(Map<String, Float> ufm) {
userFieldsMap = ufm;
if (0 == userFieldsMap.size()) {
userFieldsMap.put("*", null);
@@ -1537,7 +1536,7 @@ public class ExtendedDismaxQParser extends QParser {
}
}
// unless "_query_" was expressly allowed, we forbid it.
- if (forbidSubQueryByDefault && !userFieldsMap.containsKey(MagicFieldName.QUERY.field)) {
+ if (!userFieldsMap.containsKey(MagicFieldName.QUERY.field)) {
userFieldsMap.put("-" + MagicFieldName.QUERY.field, null);
}
Collections.sort(dynUserFields);
@@ -1691,8 +1690,7 @@ public class ExtendedDismaxQParser extends QParser {
solrParams = SolrParams.wrapDefaults(localParams, params);
schema = req.getSchema();
minShouldMatch = DisMaxQParser.parseMinShouldMatch(schema, solrParams); // req.getSearcher() here causes searcher refcount imbalance
- final boolean forbidSubQueryByDefault = req.getCore().getSolrConfig().luceneMatchVersion.onOrAfter(Version.LUCENE_7_2_0);
- userFields = new UserFields(U.parseFieldBoosts(solrParams.getParams(DMP.UF)), forbidSubQueryByDefault);
+ userFields = new UserFields(U.parseFieldBoosts(solrParams.getParams(DMP.UF)));
try {
queryFields = DisMaxQParser.parseQueryFields(schema, solrParams); // req.getSearcher() here causes searcher refcount imbalance
} catch (SyntaxError e) {
@@ -1723,9 +1721,7 @@ public class ExtendedDismaxQParser extends QParser {
altQ = solrParams.get( DisMaxParams.ALTQ );
- // lowercaseOperators defaults to true for luceneMatchVersion < 7.0 and to false for >= 7.0
- lowercaseOperators = solrParams.getBool(DMP.LOWERCASE_OPS,
- !req.getCore().getSolrConfig().luceneMatchVersion.onOrAfter(Version.LUCENE_7_0_0));
+ lowercaseOperators = solrParams.getBool(DMP.LOWERCASE_OPS, false);
/* * * Boosting Query * * */
boostParams = solrParams.getParams(DisMaxParams.BQ);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/906f94a8/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java b/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java
index dd30ca1..b5b9d2e 100644
--- a/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java
+++ b/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java
@@ -17,8 +17,6 @@
package org.apache.solr.search.similarities;
import org.apache.lucene.search.similarities.BM25Similarity;
-import org.apache.lucene.search.similarity.LegacyBM25Similarity;
-import org.apache.lucene.util.Version;
import org.junit.After;
/**
@@ -44,23 +42,4 @@ public class TestNonDefinedSimilarityFactory extends BaseSimilarityTestCase {
assertEquals(0.75F, sim.getB(), 0.0F);
}
- public void testLegacyBM25BeforeV8() throws Exception {
- System.setProperty("tests.luceneMatchVersion", Version.LUCENE_7_0_0.toString());
- initCore("solrconfig-basic.xml","schema-tiny.xml");
- System.clearProperty("tests.luceneMatchVersion");
- LegacyBM25Similarity sim = getSimilarity("text", LegacyBM25Similarity.class);
- assertEquals(0.75F, sim.getB(), 0.0F);
- deleteCore();
-
- System.setProperty("tests.luceneMatchVersion", "5.0.0");
- initCore("solrconfig-basic.xml","schema-tiny.xml");
- System.clearProperty("tests.luceneMatchVersion");
- getSimilarity("text", LegacyBM25Similarity.class);
- deleteCore();
-
- System.setProperty("tests.luceneMatchVersion", "6.0.0");
- initCore("solrconfig-basic.xml","schema-tiny.xml");
- System.clearProperty("tests.luceneMatchVersion");
- getSimilarity("text", LegacyBM25Similarity.class);
- }
}