diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 07e40a22b6c..a7f46a545cf 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,5 +1,5 @@ opensearch = 1.1.0 -lucene = 8.8.2 +lucene = 8.9.0 bundled_jdk_vendor = adoptopenjdk bundled_jdk = 15.0.1+9 diff --git a/modules/lang-expression/licenses/lucene-expressions-8.8.2.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.8.2.jar.sha1 deleted file mode 100644 index 6ad83d9e604..00000000000 --- a/modules/lang-expression/licenses/lucene-expressions-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -85c06b0d5b966e6d8a75dd568a6eb1a7c3b34bdd \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-8.9.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.9.0.jar.sha1 new file mode 100644 index 00000000000..ae69d7ff512 --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-8.9.0.jar.sha1 @@ -0,0 +1 @@ +c52e0f197d8f37fec8e679660a4814b8928e4db2 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.8.2.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.8.2.jar.sha1 deleted file mode 100644 index 1cd3a225ba1..00000000000 --- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dcda3ccd38ca68e23ec57c8ca16d13553066672b \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.9.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.9.0.jar.sha1 new file mode 100644 index 00000000000..8862b763012 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.9.0.jar.sha1 @@ -0,0 +1 @@ +390ebbb1cdb3ab1e8e5286ae4d77d336fd3895ba \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.8.2.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.8.2.jar.sha1 deleted file mode 100644 index 20af2a97f28..00000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -829b06a76ffaf0e551c5cda4a1e56990080ea6de \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.9.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.9.0.jar.sha1 new file mode 100644 index 00000000000..1b60c193938 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.9.0.jar.sha1 @@ -0,0 +1 @@ +d7553997ad55671bb8c4c023f607f71463da4d0f \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.8.2.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.8.2.jar.sha1 deleted file mode 100644 index a52d7d859bd..00000000000 --- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2c23e33c49fb255d96e0bf42ca7c58f030011727 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.9.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.9.0.jar.sha1 new file mode 100644 index 00000000000..b9ea18c6de2 --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.9.0.jar.sha1 @@ -0,0 +1 @@ +99ae12d053d27e2b8d78d084e1bf1c893b896554 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.8.2.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.8.2.jar.sha1 deleted file mode 100644 index 5443c1de42c..00000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b0ccf32c2baa88815b89c157f19b264a24958180 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.9.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.9.0.jar.sha1 new file mode 100644 index 00000000000..19d4411ac82 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.9.0.jar.sha1 @@ -0,0 +1 @@ +144cbfb8c5a66ae9ac7abddb8855974599d1ea67 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.8.2.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.8.2.jar.sha1 deleted file mode 100644 index cd9ce6b5143..00000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d7fb0c151dccc1954547acd3289cdf1369cda969 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.9.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.9.0.jar.sha1 new file mode 100644 index 00000000000..81834aaa9b9 --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.9.0.jar.sha1 @@ -0,0 +1 @@ +35f24955ae3d079a262a3aa7ac2ca2449c6d10ee \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.8.2.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.8.2.jar.sha1 deleted file mode 100644 index 54d737721e2..00000000000 --- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ca1b3379c99553c64d6b76271a5701f2bc2a2ce4 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.9.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.9.0.jar.sha1 new file mode 100644 index 00000000000..ff6375c1634 --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.9.0.jar.sha1 @@ -0,0 +1 @@ +d2a6fb6327e54c4eccfaa0f8e74953cd69a31e07 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.8.2.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.8.2.jar.sha1 deleted file mode 100644 index fb745852be9..00000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2070b7dd21682b4b9bd23f77146a73d0e3f3b05f \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.9.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.9.0.jar.sha1 new file mode 100644 index 00000000000..f901aa40fa5 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.9.0.jar.sha1 @@ -0,0 +1 @@ +37fd6e23bbb1c146c729bb32b6c043ed0642a73e \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.8.2.jar.sha1 b/server/licenses/lucene-analyzers-common-8.8.2.jar.sha1 deleted file mode 100644 index 9dd818c4f24..00000000000 --- a/server/licenses/lucene-analyzers-common-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fa4b3c1d847f4bb91a3afaa990889dd164883d86 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.9.0.jar.sha1 b/server/licenses/lucene-analyzers-common-8.9.0.jar.sha1 new file mode 100644 index 00000000000..8cd5ba872a3 --- /dev/null +++ b/server/licenses/lucene-analyzers-common-8.9.0.jar.sha1 @@ -0,0 +1 @@ +18f3bbff2b7672ea0b9cc18c8110ef69c763ae6b \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.8.2.jar.sha1 b/server/licenses/lucene-backward-codecs-8.8.2.jar.sha1 deleted file mode 100644 index edec595d413..00000000000 --- a/server/licenses/lucene-backward-codecs-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f4a0475a1404d7be87e911f5c85f8b913ec9770b \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.9.0.jar.sha1 b/server/licenses/lucene-backward-codecs-8.9.0.jar.sha1 new file mode 100644 index 00000000000..932c95dc8cf --- /dev/null +++ b/server/licenses/lucene-backward-codecs-8.9.0.jar.sha1 @@ -0,0 +1 @@ +fec88b5e71c699ceddc3ae0369481697ac9a5c96 \ No newline at end of file diff --git a/server/licenses/lucene-core-8.8.2.jar.sha1 b/server/licenses/lucene-core-8.8.2.jar.sha1 deleted file mode 100644 index 8254464770e..00000000000 --- a/server/licenses/lucene-core-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e039fa90ee900c475bbc0943989ed5dccc556d3e \ No newline at end of file diff --git a/server/licenses/lucene-core-8.9.0.jar.sha1 b/server/licenses/lucene-core-8.9.0.jar.sha1 new file mode 100644 index 00000000000..859cdb20134 --- /dev/null +++ b/server/licenses/lucene-core-8.9.0.jar.sha1 @@ -0,0 +1 @@ +5c3f72357089f7f0c1ef44bbe7b4c67b6149a5af \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.8.2.jar.sha1 b/server/licenses/lucene-grouping-8.8.2.jar.sha1 deleted file mode 100644 index 9d66d2ff701..00000000000 --- a/server/licenses/lucene-grouping-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -207ac15287656b6ce61ea921fefec3070a8dd99d \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.9.0.jar.sha1 b/server/licenses/lucene-grouping-8.9.0.jar.sha1 new file mode 100644 index 00000000000..e28e73fb699 --- /dev/null +++ b/server/licenses/lucene-grouping-8.9.0.jar.sha1 @@ -0,0 +1 @@ +9440fdd430b1c2dadbf3bc72656848d61e6f747f \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.8.2.jar.sha1 b/server/licenses/lucene-highlighter-8.8.2.jar.sha1 deleted file mode 100644 index ee1068853ce..00000000000 --- a/server/licenses/lucene-highlighter-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2674644580108335c08a25fd2e0f0c7dee010700 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.9.0.jar.sha1 b/server/licenses/lucene-highlighter-8.9.0.jar.sha1 new file mode 100644 index 00000000000..111b023f950 --- /dev/null +++ b/server/licenses/lucene-highlighter-8.9.0.jar.sha1 @@ -0,0 +1 @@ +94e80bdeab170b0ce1b36a32b6a790d23d7f6d7b \ No newline at end of file diff --git a/server/licenses/lucene-join-8.8.2.jar.sha1 b/server/licenses/lucene-join-8.8.2.jar.sha1 deleted file mode 100644 index 1ae40a66596..00000000000 --- a/server/licenses/lucene-join-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6eb956741169fe8a5643fa39b14aef2fc067d865 \ No newline at end of file diff --git a/server/licenses/lucene-join-8.9.0.jar.sha1 b/server/licenses/lucene-join-8.9.0.jar.sha1 new file mode 100644 index 00000000000..9b8322851df --- /dev/null +++ b/server/licenses/lucene-join-8.9.0.jar.sha1 @@ -0,0 +1 @@ +5ae97803efd3344597f6b6bdf823b18d130e8851 \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.8.2.jar.sha1 b/server/licenses/lucene-memory-8.8.2.jar.sha1 deleted file mode 100644 index 2f6eb772a24..00000000000 --- a/server/licenses/lucene-memory-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -63b6e8e862c898d263b941ffa55fe6c85bcdf2df \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.9.0.jar.sha1 b/server/licenses/lucene-memory-8.9.0.jar.sha1 new file mode 100644 index 00000000000..bd7fbba668f --- /dev/null +++ b/server/licenses/lucene-memory-8.9.0.jar.sha1 @@ -0,0 +1 @@ +09423a6dca2a9ba665e644d86a713d9a6b2b0d3f \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.8.2.jar.sha1 b/server/licenses/lucene-misc-8.8.2.jar.sha1 deleted file mode 100644 index eabe707aa70..00000000000 --- a/server/licenses/lucene-misc-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a3a916c27c42ff6773c52d0be4045d4e5c00f7f8 \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.9.0.jar.sha1 b/server/licenses/lucene-misc-8.9.0.jar.sha1 new file mode 100644 index 00000000000..dd4e7baeb3c --- /dev/null +++ b/server/licenses/lucene-misc-8.9.0.jar.sha1 @@ -0,0 +1 @@ +067494d621ba2ef1f2e4da3ef167106f00b52051 \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.8.2.jar.sha1 b/server/licenses/lucene-queries-8.8.2.jar.sha1 deleted file mode 100644 index 460156c4b1b..00000000000 --- a/server/licenses/lucene-queries-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1f324c3a6e1a7634bbada993b2c014d12d09cb83 \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.9.0.jar.sha1 b/server/licenses/lucene-queries-8.9.0.jar.sha1 new file mode 100644 index 00000000000..682553f8776 --- /dev/null +++ b/server/licenses/lucene-queries-8.9.0.jar.sha1 @@ -0,0 +1 @@ +c6bda4622abf240da6567a128242f46708fa6c00 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.8.2.jar.sha1 b/server/licenses/lucene-queryparser-8.8.2.jar.sha1 deleted file mode 100644 index 35d68676948..00000000000 --- a/server/licenses/lucene-queryparser-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -67c6580f8a5187fdb7f9eb2404bdecc4635b3328 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.9.0.jar.sha1 b/server/licenses/lucene-queryparser-8.9.0.jar.sha1 new file mode 100644 index 00000000000..d1978b318fd --- /dev/null +++ b/server/licenses/lucene-queryparser-8.9.0.jar.sha1 @@ -0,0 +1 @@ +95a9d8cf8ca8eaf9f241fd323697d26d211721b2 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.8.2.jar.sha1 b/server/licenses/lucene-sandbox-8.8.2.jar.sha1 deleted file mode 100644 index b1ff4925a5f..00000000000 --- a/server/licenses/lucene-sandbox-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b674deb4957a64db5c8f4afb9127400f4e65c334 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.9.0.jar.sha1 b/server/licenses/lucene-sandbox-8.9.0.jar.sha1 new file mode 100644 index 00000000000..9e0539ea7ae --- /dev/null +++ b/server/licenses/lucene-sandbox-8.9.0.jar.sha1 @@ -0,0 +1 @@ +af9f6c0287465e17a520b93b684474712433b293 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-8.8.2.jar.sha1 b/server/licenses/lucene-spatial-extras-8.8.2.jar.sha1 deleted file mode 100644 index 84dcad6d406..00000000000 --- a/server/licenses/lucene-spatial-extras-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -227672b3b88c877b2df27608850ca15d834ec35c \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-8.9.0.jar.sha1 b/server/licenses/lucene-spatial-extras-8.9.0.jar.sha1 new file mode 100644 index 00000000000..cedc910adb5 --- /dev/null +++ b/server/licenses/lucene-spatial-extras-8.9.0.jar.sha1 @@ -0,0 +1 @@ +c89f4e78712806e8d5bb4adfb21cf0722ad3f175 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.8.2.jar.sha1 b/server/licenses/lucene-spatial3d-8.8.2.jar.sha1 deleted file mode 100644 index fe4ad693544..00000000000 --- a/server/licenses/lucene-spatial3d-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eb77b665a3b3e9ca6b3bb82c3342b843d9729d0d \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.9.0.jar.sha1 b/server/licenses/lucene-spatial3d-8.9.0.jar.sha1 new file mode 100644 index 00000000000..f0c08e6e6bd --- /dev/null +++ b/server/licenses/lucene-spatial3d-8.9.0.jar.sha1 @@ -0,0 +1 @@ +0d1238c4e8bf4409b3bb3fbddf2e977b0f19b24b \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.8.2.jar.sha1 b/server/licenses/lucene-suggest-8.8.2.jar.sha1 deleted file mode 100644 index c25fdf198fd..00000000000 --- a/server/licenses/lucene-suggest-8.8.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -36fd5301e7143f0fcb0ba933f96148dc1e132b66 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.9.0.jar.sha1 b/server/licenses/lucene-suggest-8.9.0.jar.sha1 new file mode 100644 index 00000000000..f6f8bb83d66 --- /dev/null +++ b/server/licenses/lucene-suggest-8.9.0.jar.sha1 @@ -0,0 +1 @@ +98cb69950b48b829b6605a003c99aa7eb86fa9eb \ No newline at end of file diff --git a/server/src/main/java/org/opensearch/Version.java b/server/src/main/java/org/opensearch/Version.java index c511f49ad2a..9969ef182b0 100644 --- a/server/src/main/java/org/opensearch/Version.java +++ b/server/src/main/java/org/opensearch/Version.java @@ -71,7 +71,7 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_EMPTY = new Version(V_EMPTY_ID, org.apache.lucene.util.Version.LATEST); public static final Version V_1_0_0 = new Version(1000099, org.apache.lucene.util.Version.LUCENE_8_8_2); - public static final Version V_1_1_0 = new Version(1010099, org.apache.lucene.util.Version.LUCENE_8_8_2); + public static final Version V_1_1_0 = new Version(1010099, org.apache.lucene.util.Version.LUCENE_8_9_0); public static final Version CURRENT = V_1_1_0; public static Version readVersion(StreamInput in) throws IOException { diff --git a/server/src/main/java/org/opensearch/index/engine/NoOpEngine.java b/server/src/main/java/org/opensearch/index/engine/NoOpEngine.java index 047358c5cb6..7aa3024bbf7 100644 --- a/server/src/main/java/org/opensearch/index/engine/NoOpEngine.java +++ b/server/src/main/java/org/opensearch/index/engine/NoOpEngine.java @@ -86,7 +86,7 @@ public final class NoOpEngine extends ReadOnlyEngine { final Directory directory = commit.getDirectory(); final List indexCommits = DirectoryReader.listCommits(directory); final IndexCommit indexCommit = indexCommits.get(indexCommits.size() - 1); - return new DirectoryReader(directory, new LeafReader[0]) { + return new DirectoryReader(directory, new LeafReader[0], null) { @Override protected DirectoryReader doOpenIfChanged() { return null; diff --git a/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java index 8358e7cde65..579a69d92bb 100644 --- a/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java +++ b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java @@ -208,6 +208,10 @@ public abstract class AnalysisFactoryTestCase extends OpenSearchTestCase { // LUCENE-8936 .put("spanishminimalstem", Void.class) .put("delimitedboost", Void.class) + // LUCENE-9574: test flags on tokens vs a bitmask and drops tokens that have all specified flags + .put("dropifflagged", Void.class) + // LUCENE-9575: recognize arbitrary patterns that include punctuation + .put("patterntyping", Void.class) .immutableMap(); static final Map> KNOWN_CHARFILTERS = new MapBuilder>()