You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by iv...@apache.org on 2021/02/17 07:29:23 UTC
[lucene-solr] branch master updated: LUCENE-9777: Fix out of date
versions on releases 8.7.0 and 8.8.0 (#2377)
This is an automated email from the ASF dual-hosted git repository.
ivera pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new cfd0cce LUCENE-9777: Fix out of date versions on releases 8.7.0 and 8.8.0 (#2377)
cfd0cce is described below
commit cfd0ccefe18b980a3583f10f95c09929acde8097
Author: Ignacio Vera <iv...@apache.org>
AuthorDate: Wed Feb 17 08:29:05 2021 +0100
LUCENE-9777: Fix out of date versions on releases 8.7.0 and 8.8.0 (#2377)
---
dev-tools/scripts/addBackcompatIndexes.py | 8 ++++----
.../backward_index/TestBackwardsCompatibility.java | 10 ++++++++--
.../apache/lucene/backward_index/index.8.7.0-cfs.zip | Bin 0 -> 16765 bytes
.../apache/lucene/backward_index/index.8.7.0-nocfs.zip | Bin 0 -> 16773 bytes
.../apache/lucene/backward_index/index.8.8.0-cfs.zip | Bin 0 -> 16685 bytes
.../apache/lucene/backward_index/index.8.8.0-nocfs.zip | Bin 0 -> 16694 bytes
.../org/apache/lucene/backward_index/sorted.8.7.0.zip | Bin 0 -> 131475 bytes
.../org/apache/lucene/backward_index/sorted.8.8.0.zip | Bin 0 -> 612376 bytes
.../core/src/java/org/apache/lucene/util/Version.java | 14 ++++++++++++++
9 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/dev-tools/scripts/addBackcompatIndexes.py b/dev-tools/scripts/addBackcompatIndexes.py
index ef2ad3e..289839b 100755
--- a/dev-tools/scripts/addBackcompatIndexes.py
+++ b/dev-tools/scripts/addBackcompatIndexes.py
@@ -53,7 +53,7 @@ def create_and_add_index(source, indextype, index_version, current_version, temp
print(' creating %s...' % filename, end='', flush=True)
module = 'backward-codecs'
- index_dir = os.path.join('lucene', module, 'src/test/org/apache/lucene/index')
+ index_dir = os.path.join('lucene', module, 'src/test/org/apache/lucene/backward_index')
test_file = os.path.join(index_dir, filename)
if os.path.exists(os.path.join(index_dir, filename)):
print('uptodate')
@@ -98,13 +98,13 @@ def create_and_add_index(source, indextype, index_version, current_version, temp
def update_backcompat_tests(types, index_version, current_version):
print(' adding new indexes %s to backcompat tests...' % types, end='', flush=True)
module = 'lucene/backward-codecs'
- filename = '%s/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java' % module
+ filename = '%s/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java' % module
if not current_version.is_back_compat_with(index_version):
matcher = re.compile(r'final String\[\] unsupportedNames = {|};')
elif 'sorted' in types:
- matcher = re.compile(r'final static String\[\] oldSortedNames = {|};')
+ matcher = re.compile(r'static final String\[\] oldSortedNames = {|};')
else:
- matcher = re.compile(r'final static String\[\] oldNames = {|};')
+ matcher = re.compile(r'static final String\[\] oldNames = {|};')
strip_dash_suffix_re = re.compile(r'-.*')
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java
index 7c75d5a..2deced7 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/TestBackwardsCompatibility.java
@@ -361,7 +361,11 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
"8.6.2-cfs",
"8.6.2-nocfs",
"8.6.3-cfs",
- "8.6.3-nocfs"
+ "8.6.3-nocfs",
+ "8.7.0-cfs",
+ "8.7.0-nocfs",
+ "8.8.0-cfs",
+ "8.8.0-nocfs"
};
public static String[] getOldNames() {
@@ -383,7 +387,9 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
"sorted.8.6.0",
"sorted.8.6.1",
"sorted.8.6.2",
- "sorted.8.6.3"
+ "sorted.8.6.3",
+ "sorted.8.7.0",
+ "sorted.8.8.0"
};
public static String[] getOldSortedNames() {
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.8.7.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.8.7.0-cfs.zip
new file mode 100644
index 0000000..c49a667
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.8.7.0-cfs.zip differ
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.8.7.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.8.7.0-nocfs.zip
new file mode 100644
index 0000000..a3b5b2e
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.8.7.0-nocfs.zip differ
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.8.8.0-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.8.8.0-cfs.zip
new file mode 100644
index 0000000..5a623f9
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.8.8.0-cfs.zip differ
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.8.8.0-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.8.8.0-nocfs.zip
new file mode 100644
index 0000000..6e2cb9c
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/index.8.8.0-nocfs.zip differ
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.8.7.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.8.7.0.zip
new file mode 100644
index 0000000..5a65b07
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.8.7.0.zip differ
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.8.8.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.8.8.0.zip
new file mode 100644
index 0000000..cf117db
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/backward_index/sorted.8.8.0.zip differ
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 f1be05e..a1d43ae 100644
--- a/lucene/core/src/java/org/apache/lucene/util/Version.java
+++ b/lucene/core/src/java/org/apache/lucene/util/Version.java
@@ -134,6 +134,20 @@ public final class Version {
@Deprecated public static final Version LUCENE_8_6_3 = new Version(8, 6, 3);
/**
+ * Match settings and bugs in Lucene's 8.7.0 release.
+ *
+ * @deprecated Use latest
+ */
+ @Deprecated public static final Version LUCENE_8_7_0 = new Version(8, 7, 0);
+
+ /**
+ * Match settings and bugs in Lucene's 8.8.0 release.
+ *
+ * @deprecated Use latest
+ */
+ @Deprecated public static final Version LUCENE_8_8_0 = new Version(8, 8, 0);
+
+ /**
* Match settings and bugs in Lucene's 9.0.0 release.
*
* <p>Use this to get the latest & greatest settings, bug fixes, etc, for Lucene.