diff --git a/CHANGELOG.md b/CHANGELOG.md index ccee7bf050c0a..1795e8971704d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,6 +76,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bumps `protobuf-java` from 3.21.7 to 3.21.8 ([#4886](https://github.com/opensearch-project/OpenSearch/pull/4886)) - Upgrade netty to 4.1.84.Final ([#4893](https://github.com/opensearch-project/OpenSearch/pull/4893)) - Dependency updates: asm 9.3 -> 9.4, bytebuddy 1.12.12 -> 1.12.18 ([#4889](https://github.com/opensearch-project/OpenSearch/pull/4889)) +- Update Apache Lucene to 9.4.1 ([#4922](https://github.com/opensearch-project/OpenSearch/pull/4922)) ### Changed - Dependency updates (httpcore, mockito, slf4j, httpasyncclient, commons-codec) ([#4308](https://github.com/opensearch-project/OpenSearch/pull/4308)) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 8ff74b40cc2eb..ccd90bcf7d802 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,5 +1,5 @@ opensearch = 3.0.0 -lucene = 9.4.0 +lucene = 9.4.1 bundled_jdk_vendor = adoptium bundled_jdk = 17.0.4+8 diff --git a/modules/lang-expression/licenses/lucene-expressions-9.4.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.4.0.jar.sha1 deleted file mode 100644 index 2b647c1270e14..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -19749e264805171009836cbedecc5494b13cd920 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-9.4.1.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..f8eb0a7bdb033 --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-9.4.1.jar.sha1 @@ -0,0 +1 @@ +574ac602f98475c1d061adee71ed90dce2eee679 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.4.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.4.0.jar.sha1 deleted file mode 100644 index 0038e3153b139..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aa0f250558375922f3091820361156e514fe1842 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.4.1.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..77c20d4ed8073 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.4.1.jar.sha1 @@ -0,0 +1 @@ +b217251a8c13669ec4066871d026e4cb84abf702 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.4.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.4.0.jar.sha1 deleted file mode 100644 index ec8c78a580543..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -32eb1ad367ab1289804aeed95ea7216711a7764d \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.4.1.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..b2090016c9f5d --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.4.1.jar.sha1 @@ -0,0 +1 @@ +d80cf8993498784bcb6e4dcefdcebd3ddc4ca022 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.4.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.4.0.jar.sha1 deleted file mode 100644 index 438585ee3afa8..0000000000000 --- a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -63661714be65f882a921d281965b0779fd487b90 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.4.1.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..2f5d27452f2f3 --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.4.1.jar.sha1 @@ -0,0 +1 @@ +082f4870f58b17bcc60dedb399fe82964ef0ad6f \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.4.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.4.0.jar.sha1 deleted file mode 100644 index 019a98dc594b3..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1034d876551fc21f7835b456dab01db21b9a4af6 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.4.1.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..146d5eebbe800 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.4.1.jar.sha1 @@ -0,0 +1 @@ +733411a30c1b1b473b93d4b28f59f8914d7ed83f \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.4.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.4.0.jar.sha1 deleted file mode 100644 index cc8e31b7a248f..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f704ee4b14e2fe2622bb983f04b36a32df8fd4a7 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.4.1.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..61f11cfb32aee --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.4.1.jar.sha1 @@ -0,0 +1 @@ +19d011e47bab7ccd1389095834d18ad7bf98f050 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.4.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.4.0.jar.sha1 deleted file mode 100644 index 25e115b84308d..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a95ff17b51da6b3da641fa4053e5ee9ea2ff5daf \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.4.1.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..9259308e80d4b --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.4.1.jar.sha1 @@ -0,0 +1 @@ +7e48a8d411fffb331484c9485a6bdbf1d856ba06 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.4.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.4.0.jar.sha1 deleted file mode 100644 index 7cc4a7131f866..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -13e1ae2c760d8c0d7990ffe3296e46d9d8e6f842 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.4.1.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..77f7bdd37cd8f --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.4.1.jar.sha1 @@ -0,0 +1 @@ +ec94415a249a7814fa76d96667173fae875112a2 \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-9.4.0.jar.sha1 b/server/licenses/lucene-analysis-common-9.4.0.jar.sha1 deleted file mode 100644 index d4db2877c486b..0000000000000 --- a/server/licenses/lucene-analysis-common-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -02fbd4e87241411fcf5d34e92a50bee46ab164dc \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-9.4.1.jar.sha1 b/server/licenses/lucene-analysis-common-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..dcee87ac5273a --- /dev/null +++ b/server/licenses/lucene-analysis-common-9.4.1.jar.sha1 @@ -0,0 +1 @@ +692cbd2e220222adff279e922d1c14bb10dae8b0 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-9.4.0.jar.sha1 b/server/licenses/lucene-backward-codecs-9.4.0.jar.sha1 deleted file mode 100644 index 1b7b53ef9fe70..0000000000000 --- a/server/licenses/lucene-backward-codecs-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -259863dfd107645de6146b3c87b4ecee66a4d43d \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-9.4.1.jar.sha1 b/server/licenses/lucene-backward-codecs-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..927cdf30dce6f --- /dev/null +++ b/server/licenses/lucene-backward-codecs-9.4.1.jar.sha1 @@ -0,0 +1 @@ +2826b0fd18033b6d1625b8313ab28c7f43fac692 \ No newline at end of file diff --git a/server/licenses/lucene-core-9.4.0.jar.sha1 b/server/licenses/lucene-core-9.4.0.jar.sha1 deleted file mode 100644 index 66f7f24485172..0000000000000 --- a/server/licenses/lucene-core-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cca1116f813c0f0c63acfac4c952baf29d46d76b \ No newline at end of file diff --git a/server/licenses/lucene-core-9.4.1.jar.sha1 b/server/licenses/lucene-core-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..8a12d131b158e --- /dev/null +++ b/server/licenses/lucene-core-9.4.1.jar.sha1 @@ -0,0 +1 @@ +48ff655927016066d4746b485d63f0586d859c5f \ No newline at end of file diff --git a/server/licenses/lucene-grouping-9.4.0.jar.sha1 b/server/licenses/lucene-grouping-9.4.0.jar.sha1 deleted file mode 100644 index fe79c0efd34e4..0000000000000 --- a/server/licenses/lucene-grouping-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -51bec1d5acc8ecaf9f50e047d3f86d60c7a958f4 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-9.4.1.jar.sha1 b/server/licenses/lucene-grouping-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..c6507cada010f --- /dev/null +++ b/server/licenses/lucene-grouping-9.4.1.jar.sha1 @@ -0,0 +1 @@ +690585f53f4ea00fae94c72fbf711f693a3981c5 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-9.4.0.jar.sha1 b/server/licenses/lucene-highlighter-9.4.0.jar.sha1 deleted file mode 100644 index 54700f08a3fdb..0000000000000 --- a/server/licenses/lucene-highlighter-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c8cf8c9308d8fb18a927c7ed267a14ace3990a5f \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-9.4.1.jar.sha1 b/server/licenses/lucene-highlighter-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..58019cc9702d0 --- /dev/null +++ b/server/licenses/lucene-highlighter-9.4.1.jar.sha1 @@ -0,0 +1 @@ +e97e3003a80c67ddf33a456ab54413b12764d23d \ No newline at end of file diff --git a/server/licenses/lucene-join-9.4.0.jar.sha1 b/server/licenses/lucene-join-9.4.0.jar.sha1 deleted file mode 100644 index 752006d3a66dd..0000000000000 --- a/server/licenses/lucene-join-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -99b2d3c8e137a6853a2503456897d47d4f18974b \ No newline at end of file diff --git a/server/licenses/lucene-join-9.4.1.jar.sha1 b/server/licenses/lucene-join-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..2f0765f2b0a3c --- /dev/null +++ b/server/licenses/lucene-join-9.4.1.jar.sha1 @@ -0,0 +1 @@ +8749a1b71eacb85c47ed90265ea98c1c8b4e5abd \ No newline at end of file diff --git a/server/licenses/lucene-memory-9.4.0.jar.sha1 b/server/licenses/lucene-memory-9.4.0.jar.sha1 deleted file mode 100644 index 27b488699968e..0000000000000 --- a/server/licenses/lucene-memory-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -881cb214e79da14de35cb0e8e6779d2722828a96 \ No newline at end of file diff --git a/server/licenses/lucene-memory-9.4.1.jar.sha1 b/server/licenses/lucene-memory-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..8a8674b776623 --- /dev/null +++ b/server/licenses/lucene-memory-9.4.1.jar.sha1 @@ -0,0 +1 @@ +89797042e65179325f40c173fc20e227d3df4f29 \ No newline at end of file diff --git a/server/licenses/lucene-misc-9.4.0.jar.sha1 b/server/licenses/lucene-misc-9.4.0.jar.sha1 deleted file mode 100644 index f9924475b9acd..0000000000000 --- a/server/licenses/lucene-misc-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a126123e482e6bf2e7aea670d221a2a39d3277dc \ No newline at end of file diff --git a/server/licenses/lucene-misc-9.4.1.jar.sha1 b/server/licenses/lucene-misc-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..3c4e6f89400bc --- /dev/null +++ b/server/licenses/lucene-misc-9.4.1.jar.sha1 @@ -0,0 +1 @@ +ae8465d5499ab39012c3c81d82014667c5c03dd2 \ No newline at end of file diff --git a/server/licenses/lucene-queries-9.4.0.jar.sha1 b/server/licenses/lucene-queries-9.4.0.jar.sha1 deleted file mode 100644 index 65e441bfdaf90..0000000000000 --- a/server/licenses/lucene-queries-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fe74dbfe9dba9ee9ee2cb80f151fde97fb4efd12 \ No newline at end of file diff --git a/server/licenses/lucene-queries-9.4.1.jar.sha1 b/server/licenses/lucene-queries-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..f897fda0074bf --- /dev/null +++ b/server/licenses/lucene-queries-9.4.1.jar.sha1 @@ -0,0 +1 @@ +c78e99a46fabd2a7a175fe170a1537de2b9bca95 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-9.4.0.jar.sha1 b/server/licenses/lucene-queryparser-9.4.0.jar.sha1 deleted file mode 100644 index 2d454942d52e1..0000000000000 --- a/server/licenses/lucene-queryparser-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -13f108a8572fcf0670c7df3ba8dbe1076d0e0dbe \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-9.4.1.jar.sha1 b/server/licenses/lucene-queryparser-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..f82637ff48a42 --- /dev/null +++ b/server/licenses/lucene-queryparser-9.4.1.jar.sha1 @@ -0,0 +1 @@ +98051f363cd92fd324aca47b662c4a71b9419e49 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-9.4.0.jar.sha1 b/server/licenses/lucene-sandbox-9.4.0.jar.sha1 deleted file mode 100644 index 4ebcf3f6edc8f..0000000000000 --- a/server/licenses/lucene-sandbox-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e7a676a12ea50dcbf64564f4e4022f939f0a627d \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-9.4.1.jar.sha1 b/server/licenses/lucene-sandbox-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..210fc28c4d45a --- /dev/null +++ b/server/licenses/lucene-sandbox-9.4.1.jar.sha1 @@ -0,0 +1 @@ +6c82a38b0fe1042ef11751cdbb1be689b7a00428 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-9.4.0.jar.sha1 b/server/licenses/lucene-spatial-extras-9.4.0.jar.sha1 deleted file mode 100644 index c0f181ad19eb6..0000000000000 --- a/server/licenses/lucene-spatial-extras-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -84d956d1cb1458c51967af1c4acadd2a1f92634d \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-9.4.1.jar.sha1 b/server/licenses/lucene-spatial-extras-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..b1430cf47a867 --- /dev/null +++ b/server/licenses/lucene-spatial-extras-9.4.1.jar.sha1 @@ -0,0 +1 @@ +7171406be9b864a4929edff8601b3d69645c64ae \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-9.4.0.jar.sha1 b/server/licenses/lucene-spatial3d-9.4.0.jar.sha1 deleted file mode 100644 index 3414f36b02bef..0000000000000 --- a/server/licenses/lucene-spatial3d-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -76887ca708f23b13613e45fb9e307c548b22c6da \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-9.4.1.jar.sha1 b/server/licenses/lucene-spatial3d-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..482526b6032b6 --- /dev/null +++ b/server/licenses/lucene-spatial3d-9.4.1.jar.sha1 @@ -0,0 +1 @@ +5ede97d83f0c62ba84ae1e2279f411ae87ecaca1 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-9.4.0.jar.sha1 b/server/licenses/lucene-suggest-9.4.0.jar.sha1 deleted file mode 100644 index 563a0b5ad966b..0000000000000 --- a/server/licenses/lucene-suggest-9.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -406c9c539f262449d3b1e57e7bc4302efeecaf6c \ No newline at end of file diff --git a/server/licenses/lucene-suggest-9.4.1.jar.sha1 b/server/licenses/lucene-suggest-9.4.1.jar.sha1 new file mode 100644 index 0000000000000..ed4e8c4e3ca66 --- /dev/null +++ b/server/licenses/lucene-suggest-9.4.1.jar.sha1 @@ -0,0 +1 @@ +60e7740d2894ac7a0e97c3eabaee4823a02b0f9c \ 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 3387eee2dffc8..8020ae97d456a 100644 --- a/server/src/main/java/org/opensearch/Version.java +++ b/server/src/main/java/org/opensearch/Version.java @@ -100,7 +100,7 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_2_3_0 = new Version(2030099, org.apache.lucene.util.Version.LUCENE_9_3_0); public static final Version V_2_3_1 = new Version(2030199, org.apache.lucene.util.Version.LUCENE_9_3_0); public static final Version V_2_4_0 = new Version(2040099, org.apache.lucene.util.Version.LUCENE_9_4_0); - public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_4_0); + public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_4_1); public static final Version CURRENT = V_3_0_0; public static Version readVersion(StreamInput in) throws IOException {