Update Apache Lucene to 9.4.1 (opensearch-project#4922)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
ashking94 · Nov 7, 2022 · b405801 · b405801
1 parent e97af7c
commit b405801
Show file tree

Hide file tree

Showing 47 changed files with 25 additions and 24 deletions.
diff --git 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
@@ -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
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
@@ -0,0 +1 @@
+574ac602f98475c1d061adee71ed90dce2eee679
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
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
@@ -0,0 +1 @@
+b217251a8c13669ec4066871d026e4cb84abf702
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
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
@@ -0,0 +1 @@
+d80cf8993498784bcb6e4dcefdcebd3ddc4ca022
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
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
@@ -0,0 +1 @@
+082f4870f58b17bcc60dedb399fe82964ef0ad6f
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
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
@@ -0,0 +1 @@
+733411a30c1b1b473b93d4b28f59f8914d7ed83f
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
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
@@ -0,0 +1 @@
+19d011e47bab7ccd1389095834d18ad7bf98f050
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
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
@@ -0,0 +1 @@
+7e48a8d411fffb331484c9485a6bdbf1d856ba06
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
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
@@ -0,0 +1 @@
+ec94415a249a7814fa76d96667173fae875112a2
diff --git a/server/licenses/lucene-analysis-common-9.4.0.jar.sha1 b/server/licenses/lucene-analysis-common-9.4.0.jar.sha1
diff --git a/server/licenses/lucene-analysis-common-9.4.1.jar.sha1 b/server/licenses/lucene-analysis-common-9.4.1.jar.sha1
@@ -0,0 +1 @@
+692cbd2e220222adff279e922d1c14bb10dae8b0
diff --git a/server/licenses/lucene-backward-codecs-9.4.0.jar.sha1 b/server/licenses/lucene-backward-codecs-9.4.0.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-9.4.1.jar.sha1 b/server/licenses/lucene-backward-codecs-9.4.1.jar.sha1
@@ -0,0 +1 @@
+2826b0fd18033b6d1625b8313ab28c7f43fac692
diff --git a/server/licenses/lucene-core-9.4.0.jar.sha1 b/server/licenses/lucene-core-9.4.0.jar.sha1
diff --git a/server/licenses/lucene-core-9.4.1.jar.sha1 b/server/licenses/lucene-core-9.4.1.jar.sha1
@@ -0,0 +1 @@
+48ff655927016066d4746b485d63f0586d859c5f
diff --git a/server/licenses/lucene-grouping-9.4.0.jar.sha1 b/server/licenses/lucene-grouping-9.4.0.jar.sha1
diff --git a/server/licenses/lucene-grouping-9.4.1.jar.sha1 b/server/licenses/lucene-grouping-9.4.1.jar.sha1
@@ -0,0 +1 @@
+690585f53f4ea00fae94c72fbf711f693a3981c5
diff --git a/server/licenses/lucene-highlighter-9.4.0.jar.sha1 b/server/licenses/lucene-highlighter-9.4.0.jar.sha1
diff --git a/server/licenses/lucene-highlighter-9.4.1.jar.sha1 b/server/licenses/lucene-highlighter-9.4.1.jar.sha1
@@ -0,0 +1 @@
+e97e3003a80c67ddf33a456ab54413b12764d23d
diff --git a/server/licenses/lucene-join-9.4.0.jar.sha1 b/server/licenses/lucene-join-9.4.0.jar.sha1
diff --git a/server/licenses/lucene-join-9.4.1.jar.sha1 b/server/licenses/lucene-join-9.4.1.jar.sha1
@@ -0,0 +1 @@
+8749a1b71eacb85c47ed90265ea98c1c8b4e5abd
diff --git a/server/licenses/lucene-memory-9.4.0.jar.sha1 b/server/licenses/lucene-memory-9.4.0.jar.sha1
diff --git a/server/licenses/lucene-memory-9.4.1.jar.sha1 b/server/licenses/lucene-memory-9.4.1.jar.sha1
@@ -0,0 +1 @@
+89797042e65179325f40c173fc20e227d3df4f29
diff --git a/server/licenses/lucene-misc-9.4.0.jar.sha1 b/server/licenses/lucene-misc-9.4.0.jar.sha1
diff --git a/server/licenses/lucene-misc-9.4.1.jar.sha1 b/server/licenses/lucene-misc-9.4.1.jar.sha1
@@ -0,0 +1 @@
+ae8465d5499ab39012c3c81d82014667c5c03dd2
diff --git a/server/licenses/lucene-queries-9.4.0.jar.sha1 b/server/licenses/lucene-queries-9.4.0.jar.sha1
diff --git a/server/licenses/lucene-queries-9.4.1.jar.sha1 b/server/licenses/lucene-queries-9.4.1.jar.sha1
@@ -0,0 +1 @@
+c78e99a46fabd2a7a175fe170a1537de2b9bca95
diff --git a/server/licenses/lucene-queryparser-9.4.0.jar.sha1 b/server/licenses/lucene-queryparser-9.4.0.jar.sha1
diff --git a/server/licenses/lucene-queryparser-9.4.1.jar.sha1 b/server/licenses/lucene-queryparser-9.4.1.jar.sha1
@@ -0,0 +1 @@
+98051f363cd92fd324aca47b662c4a71b9419e49
diff --git a/server/licenses/lucene-sandbox-9.4.0.jar.sha1 b/server/licenses/lucene-sandbox-9.4.0.jar.sha1
diff --git a/server/licenses/lucene-sandbox-9.4.1.jar.sha1 b/server/licenses/lucene-sandbox-9.4.1.jar.sha1
@@ -0,0 +1 @@
+6c82a38b0fe1042ef11751cdbb1be689b7a00428
diff --git a/server/licenses/lucene-spatial-extras-9.4.0.jar.sha1 b/server/licenses/lucene-spatial-extras-9.4.0.jar.sha1
diff --git a/server/licenses/lucene-spatial-extras-9.4.1.jar.sha1 b/server/licenses/lucene-spatial-extras-9.4.1.jar.sha1
@@ -0,0 +1 @@
+7171406be9b864a4929edff8601b3d69645c64ae
diff --git a/server/licenses/lucene-spatial3d-9.4.0.jar.sha1 b/server/licenses/lucene-spatial3d-9.4.0.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-9.4.1.jar.sha1 b/server/licenses/lucene-spatial3d-9.4.1.jar.sha1
@@ -0,0 +1 @@
+5ede97d83f0c62ba84ae1e2279f411ae87ecaca1
diff --git a/server/licenses/lucene-suggest-9.4.0.jar.sha1 b/server/licenses/lucene-suggest-9.4.0.jar.sha1
diff --git a/server/licenses/lucene-suggest-9.4.1.jar.sha1 b/server/licenses/lucene-suggest-9.4.1.jar.sha1
@@ -0,0 +1 @@
+60e7740d2894ac7a0e97c3eabaee4823a02b0f9c
diff --git 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<Version>, 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 {