[Upgrade] to lucene-9.5.0-snapshot-a4ef70f (#4979)

* [Upgrade] to lucene-9.5.0-snapshot-a4ef70f Upgrades to latest snapshot of lucene 9.5. Signed-off-by: Nicholas Walter Knize <[email protected]> * update changelog Signed-off-by: Nicholas Walter Knize <[email protected]> Signed-off-by: Nicholas Walter Knize <[email protected]>
opensearch-project · Oct 29, 2022 · d2c2ade · d2c2ade
1 parent 171d141
commit d2c2ade
Show file tree

Hide file tree

Showing 47 changed files with 26 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -79,6 +79,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - 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))
 - Bump `woodstox-core` to 6.4.0 ([#4947](https://github.com/opensearch-project/OpenSearch/pull/4947))
+- Update Apache Lucene to 9.5.0-snapshot-a4ef70f ([#4979](https://github.com/opensearch-project/OpenSearch/pull/4979))
 
 ### 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.1
+lucene            = 9.5.0-snapshot-a4ef70f
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 17.0.4+8
@@ -14,7 +14,7 @@ jackson_databind  = 2.13.4.2
 snakeyaml         = 1.32
 icu4j             = 70.1
 supercsv          = 2.4.0
-# Update to 2.17.2+ is breaking OpenSearchJsonLayout (see https://issues.apache.org/jira/browse/LOG4J2-3562) 
+# Update to 2.17.2+ is breaking OpenSearchJsonLayout (see https://issues.apache.org/jira/browse/LOG4J2-3562)
 log4j             = 2.17.1
 slf4j             = 1.7.36
 asm               = 9.4

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
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.5.0-snapshot-a4ef70f.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+c92a0928724b04224157ce2d3e105953f57f94db
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
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-a4ef70f.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+a7c38619d8f2cc48f792e007aa25b430f4f25698
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
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-a4ef70f.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+6243383e5fbcf87551ded4c1b48b69a4276bb748
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
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-a4ef70f.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+91d1560bc927f1a431bb92e47fda9395d3b3e551
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
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-a4ef70f.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+26bbfd1a796d62006dff9c7e32d31a0397a8025e
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
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-a4ef70f.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+a1a26c04e24d9a8573e6bd9a0bacad184821dd33
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
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-a4ef70f.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+19aa9eff0e0671fd91eb435a2e2fa29dec52cf5c
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
diff --git a/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-a4ef70f.jar.sha1 b/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+05ff979dfe3ded901ccd72d5a5d66349286c44bf
diff --git a/server/licenses/lucene-analysis-common-9.4.1.jar.sha1 b/server/licenses/lucene-analysis-common-9.4.1.jar.sha1
diff --git a/server/licenses/lucene-analysis-common-9.5.0-snapshot-a4ef70f.jar.sha1 b/server/licenses/lucene-analysis-common-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+84d717ed509f8ce484c57fea720d8de2a6afdaa6
diff --git a/server/licenses/lucene-backward-codecs-9.4.1.jar.sha1 b/server/licenses/lucene-backward-codecs-9.4.1.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-9.5.0-snapshot-a4ef70f.jar.sha1 b/server/licenses/lucene-backward-codecs-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+087bcc11526f8dcc56742dd8188bd05ad0329161
diff --git a/server/licenses/lucene-core-9.4.1.jar.sha1 b/server/licenses/lucene-core-9.4.1.jar.sha1
diff --git a/server/licenses/lucene-core-9.5.0-snapshot-a4ef70f.jar.sha1 b/server/licenses/lucene-core-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+e949897fa24e14d2701a3c41fe27a4f094681b81
diff --git a/server/licenses/lucene-grouping-9.4.1.jar.sha1 b/server/licenses/lucene-grouping-9.4.1.jar.sha1
diff --git a/server/licenses/lucene-grouping-9.5.0-snapshot-a4ef70f.jar.sha1 b/server/licenses/lucene-grouping-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+6cb53ca55f7e313ed19852ae37fca4ad2e4caa0c
diff --git a/server/licenses/lucene-highlighter-9.4.1.jar.sha1 b/server/licenses/lucene-highlighter-9.4.1.jar.sha1
diff --git a/server/licenses/lucene-highlighter-9.5.0-snapshot-a4ef70f.jar.sha1 b/server/licenses/lucene-highlighter-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+c7f650e33ac11e01bb5c2e35e4eb080a9ce245b8
diff --git a/server/licenses/lucene-join-9.4.1.jar.sha1 b/server/licenses/lucene-join-9.4.1.jar.sha1
diff --git a/server/licenses/lucene-join-9.5.0-snapshot-a4ef70f.jar.sha1 b/server/licenses/lucene-join-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+914ea03f71043a9291623628396a97a4c1901f8c
diff --git a/server/licenses/lucene-memory-9.4.1.jar.sha1 b/server/licenses/lucene-memory-9.4.1.jar.sha1
diff --git a/server/licenses/lucene-memory-9.5.0-snapshot-a4ef70f.jar.sha1 b/server/licenses/lucene-memory-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+e83ecf8c4f5991f8e4ea319fc9194c933e02f66d
diff --git a/server/licenses/lucene-misc-9.4.1.jar.sha1 b/server/licenses/lucene-misc-9.4.1.jar.sha1
diff --git a/server/licenses/lucene-misc-9.5.0-snapshot-a4ef70f.jar.sha1 b/server/licenses/lucene-misc-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+5adc5753c741847cd84cb11ebfcd613bedc11beb
diff --git a/server/licenses/lucene-queries-9.4.1.jar.sha1 b/server/licenses/lucene-queries-9.4.1.jar.sha1
diff --git a/server/licenses/lucene-queries-9.5.0-snapshot-a4ef70f.jar.sha1 b/server/licenses/lucene-queries-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+824272a064aa2fff1f952b5ae383e80aef4e45f8
diff --git a/server/licenses/lucene-queryparser-9.4.1.jar.sha1 b/server/licenses/lucene-queryparser-9.4.1.jar.sha1
diff --git a/server/licenses/lucene-queryparser-9.5.0-snapshot-a4ef70f.jar.sha1 b/server/licenses/lucene-queryparser-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+d5bf983dfb6183b390bdc9d3b41b88b6ee6f780e
diff --git a/server/licenses/lucene-sandbox-9.4.1.jar.sha1 b/server/licenses/lucene-sandbox-9.4.1.jar.sha1
diff --git a/server/licenses/lucene-sandbox-9.5.0-snapshot-a4ef70f.jar.sha1 b/server/licenses/lucene-sandbox-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+fff58cc6b79887348b45c9d06bff39d055540738
diff --git a/server/licenses/lucene-spatial-extras-9.4.1.jar.sha1 b/server/licenses/lucene-spatial-extras-9.4.1.jar.sha1
diff --git a/server/licenses/lucene-spatial-extras-9.5.0-snapshot-a4ef70f.jar.sha1 b/server/licenses/lucene-spatial-extras-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+c391f1df56d63dff3c6543da15c87105f2106c86
diff --git a/server/licenses/lucene-spatial3d-9.4.1.jar.sha1 b/server/licenses/lucene-spatial3d-9.4.1.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-9.5.0-snapshot-a4ef70f.jar.sha1 b/server/licenses/lucene-spatial3d-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+794109c75534b1c3a19a29bcb66692f0e0708744
diff --git a/server/licenses/lucene-suggest-9.4.1.jar.sha1 b/server/licenses/lucene-suggest-9.4.1.jar.sha1
diff --git a/server/licenses/lucene-suggest-9.5.0-snapshot-a4ef70f.jar.sha1 b/server/licenses/lucene-suggest-9.5.0-snapshot-a4ef70f.jar.sha1
@@ -0,0 +1 @@
+dc5fdd92541f4e78256152d3efc11bdb67ffdc91
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_1);
-    public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_4_1);
+    public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_5_0);
     public static final Version CURRENT = V_3_0_0;
 
     public static Version readVersion(StreamInput in) throws IOException {