Browse Source

Upgrade to lucene-9.4.1 (#91074)

Ignacio Vera 3 years ago
parent
commit
708d3290f4

+ 1 - 1
build-tools-internal/version.properties

@@ -1,5 +1,5 @@
 elasticsearch     = 8.6.0
-lucene            = 9.4.0
+lucene            = 9.4.1
 
 bundled_jdk_vendor = openjdk
 bundled_jdk = 19.0.1+10@afdd2e245b014143b62ccb916125e3ce

+ 2 - 2
docs/Versions.asciidoc

@@ -1,8 +1,8 @@
 
 include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 
-:lucene_version:        9.4.0
-:lucene_version_path:   9_4_0
+:lucene_version:        9.4.1
+:lucene_version_path:   9_4_1
 :jdk:                   11.0.2
 :jdk_major:             11
 :build_type:            tar

+ 72 - 72
gradle/verification-metadata.xml

@@ -2496,124 +2496,124 @@
             <sha256 value="015d5c229f3cd5c0ebf175c1da08d596d94043362ae9d92637d88848c90537c8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-common" version="9.4.0">
-         <artifact name="lucene-analysis-common-9.4.0.jar">
-            <sha256 value="c80f161c4657a99180502244d596c5a17e736cf88bdcfd96873d853371093e5c" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-common" version="9.4.1">
+         <artifact name="lucene-analysis-common-9.4.1.jar">
+            <sha256 value="22b845d28c39e5fa3478db276ac0a75e6285ea00d30a938146686bfa75f44b8f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-icu" version="9.4.0">
-         <artifact name="lucene-analysis-icu-9.4.0.jar">
-            <sha256 value="b1cdd7577d7b88da35f8695131483fb129594c43663fa1efbc6818f88c18ae87" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-icu" version="9.4.1">
+         <artifact name="lucene-analysis-icu-9.4.1.jar">
+            <sha256 value="a5f35d7294ef475e9e3145e0a191551f5841da738212c4923b0a403a027db200" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.4.0">
-         <artifact name="lucene-analysis-kuromoji-9.4.0.jar">
-            <sha256 value="3a447f7471067d5b4efcfc3265f2d2b0d7ad620ef1c17d32818e20dabd1b9fbc" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.4.1">
+         <artifact name="lucene-analysis-kuromoji-9.4.1.jar">
+            <sha256 value="daaf3c6939a9b234682d45102b8c26872f0b2d33631feefb4795a54a6dddc75a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.4.0">
-         <artifact name="lucene-analysis-morfologik-9.4.0.jar">
-            <sha256 value="6723b0894887690ef759a6fa70464ed659dbcb4b7ed943ff3db6f1e9914272de" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.4.1">
+         <artifact name="lucene-analysis-morfologik-9.4.1.jar">
+            <sha256 value="55cc0c58ef51d62ad0db64d130bbf163ec2bb9431acb898446e9039165c97f5b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-nori" version="9.4.0">
-         <artifact name="lucene-analysis-nori-9.4.0.jar">
-            <sha256 value="cb44d6f8119baa11138570a0f6ff4ca00f06a86f1803a0e1356b7e689cc4cb34" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-nori" version="9.4.1">
+         <artifact name="lucene-analysis-nori-9.4.1.jar">
+            <sha256 value="f3e3119787e002606181078e2d2d28715ea80222dd82d5f34013ab11a097e786" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.4.0">
-         <artifact name="lucene-analysis-phonetic-9.4.0.jar">
-            <sha256 value="79e76b57491f2283d6874878111fac1d0f7f51defc6377f330a1e28c61bfbca0" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.4.1">
+         <artifact name="lucene-analysis-phonetic-9.4.1.jar">
+            <sha256 value="57b21cf3c13a128d5817c369b43bb843a332ada8569bee99300b2439024daf1a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.4.0">
-         <artifact name="lucene-analysis-smartcn-9.4.0.jar">
-            <sha256 value="e1bcf3ec96869d6d46fb660e66b40da4732e4cca8346c7ab2d5e833e32551b5e" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.4.1">
+         <artifact name="lucene-analysis-smartcn-9.4.1.jar">
+            <sha256 value="ff65b08a942c4e9b4050f4d4a697cb550fe04e12464af14869c09f02fc75bab5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.4.0">
-         <artifact name="lucene-analysis-stempel-9.4.0.jar">
-            <sha256 value="763efbfb61b310ec64c2aa5269920e3bf77aeb62cb77756417c02776e0950b39" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.4.1">
+         <artifact name="lucene-analysis-stempel-9.4.1.jar">
+            <sha256 value="d32007019f35bef2f0ff47b192f4d2faac457bafa448336c905e0c1433e929e7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-backward-codecs" version="9.4.0">
-         <artifact name="lucene-backward-codecs-9.4.0.jar">
-            <sha256 value="cdf7cf51523762089f7f2e20d86961da46bbb7b153136ea62933247e6cd52e22" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-backward-codecs" version="9.4.1">
+         <artifact name="lucene-backward-codecs-9.4.1.jar">
+            <sha256 value="abdbf830fae812b27ddc98d8287e60582c8f9cffd8292a064f1f9aa8ab5e0ff0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-codecs" version="9.4.0">
-         <artifact name="lucene-codecs-9.4.0.jar">
-            <sha256 value="23fa5e6bc460c0e4db701ef711207f894cec469d67b9dac711ba1a6994361f1a" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-codecs" version="9.4.1">
+         <artifact name="lucene-codecs-9.4.1.jar">
+            <sha256 value="e69bcce29b43e9e09c85eb9e8a17128aa90a631c8a1b014b4efc7b8487222f4e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-core" version="9.4.0">
-         <artifact name="lucene-core-9.4.0.jar">
-            <sha256 value="e29ac050a8f4550fec0014f39e79e9258b4f7e99e0ce14934897233c31655151" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-core" version="9.4.1">
+         <artifact name="lucene-core-9.4.1.jar">
+            <sha256 value="992f847526c953f734a18295901b6fbb8977a1d99275e01ed219e7e57cc0ae34" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-expressions" version="9.4.0">
-         <artifact name="lucene-expressions-9.4.0.jar">
-            <sha256 value="2b5c025972fd1534b1640e8a3f442279639cc49467e66b1a5f6f6fce790886e9" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-expressions" version="9.4.1">
+         <artifact name="lucene-expressions-9.4.1.jar">
+            <sha256 value="b037fbd8131443cf8a2f35f9c07eb68bf4d95cab01be67733a9225e7629a94e7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-grouping" version="9.4.0">
-         <artifact name="lucene-grouping-9.4.0.jar">
-            <sha256 value="710d23b52218da6a439728faa451b5f243fa7fe3c96e6a49dd701ae8b36f79b7" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-grouping" version="9.4.1">
+         <artifact name="lucene-grouping-9.4.1.jar">
+            <sha256 value="dd88245285b240246280a4f922780a68831ed79df40a4884650d17902a33e361" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-highlighter" version="9.4.0">
-         <artifact name="lucene-highlighter-9.4.0.jar">
-            <sha256 value="2768b515d5b6df80f8afe563bdc943a5f5fa4a8d633bc3f8f707cfe7e587d829" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-highlighter" version="9.4.1">
+         <artifact name="lucene-highlighter-9.4.1.jar">
+            <sha256 value="241af5dd27834d0a37e9ab2ef235aa125ca680181a78c51248511ee80c053240" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-join" version="9.4.0">
-         <artifact name="lucene-join-9.4.0.jar">
-            <sha256 value="59d5f9f9dfd8c8e6647b18e7cff4fe52801782be193db6b4a923c5e69ca15206" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-join" version="9.4.1">
+         <artifact name="lucene-join-9.4.1.jar">
+            <sha256 value="1dfd06b72ce8ac45e1747a1781bf7f75681de366e17e88756c171e506f0719bb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-memory" version="9.4.0">
-         <artifact name="lucene-memory-9.4.0.jar">
-            <sha256 value="acc1e3469c719083e87e6285bd4ea9f89205ceb34fe3510f9c510b0e1d80e71e" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-memory" version="9.4.1">
+         <artifact name="lucene-memory-9.4.1.jar">
+            <sha256 value="2426d5a2475c9163dcc28b2e6f2624381abc2b83ede3f6140ab3833724ac60e6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-misc" version="9.4.0">
-         <artifact name="lucene-misc-9.4.0.jar">
-            <sha256 value="7d4b3f0e33c7d1ff1aa569008db5e66f53f94599f76da0f8c8382dd434130b73" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-misc" version="9.4.1">
+         <artifact name="lucene-misc-9.4.1.jar">
+            <sha256 value="de8335139c1622234fc3c0d4973fcee9a7a7d53b26bc1b9ac72c3ba2c2f59b58" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-queries" version="9.4.0">
-         <artifact name="lucene-queries-9.4.0.jar">
-            <sha256 value="acbd97baccca162582521a657043bfff4bd08c673f50e422ca2c17f7fa952cc5" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-queries" version="9.4.1">
+         <artifact name="lucene-queries-9.4.1.jar">
+            <sha256 value="0fce03ae6070868fb7369763ea4a29aecdcc13c6342c7fc94c90d3ae29860a40" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-queryparser" version="9.4.0">
-         <artifact name="lucene-queryparser-9.4.0.jar">
-            <sha256 value="fe8f8717443b4133809a23228875c88d0fdd221b538f971ec4231053ac4db915" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-queryparser" version="9.4.1">
+         <artifact name="lucene-queryparser-9.4.1.jar">
+            <sha256 value="c7bf66dea0ae9e7dc840347fd7eaefa9250a91f018bc2503888afed08010adea" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-sandbox" version="9.4.0">
-         <artifact name="lucene-sandbox-9.4.0.jar">
-            <sha256 value="dbc2404351dbebf64e87c3043604f5f551f7643e7fe38e6d170f5ad012f320ef" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-sandbox" version="9.4.1">
+         <artifact name="lucene-sandbox-9.4.1.jar">
+            <sha256 value="ddc756a446986101ab17ac15aedfeb14588832afff38b86c07a13cd93e6e4890" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-spatial-extras" version="9.4.0">
-         <artifact name="lucene-spatial-extras-9.4.0.jar">
-            <sha256 value="5374a1990248e5e4d28980b4467a7fcf653eeb593a912069cebfbcb26db96de9" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-spatial-extras" version="9.4.1">
+         <artifact name="lucene-spatial-extras-9.4.1.jar">
+            <sha256 value="2fe68c8a9141af9f7a7862b576c88b74ad4509f5a2427cb423463d4233e76d4c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-spatial3d" version="9.4.0">
-         <artifact name="lucene-spatial3d-9.4.0.jar">
-            <sha256 value="790df75703a77da3a5c90922237aeaa7e23caedc84281fd4f0a261c165f0d05a" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-spatial3d" version="9.4.1">
+         <artifact name="lucene-spatial3d-9.4.1.jar">
+            <sha256 value="5911614baa3f6e75ee55d0ad63aa16286887766b2fda0654507ce6412d16353b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-suggest" version="9.4.0">
-         <artifact name="lucene-suggest-9.4.0.jar">
-            <sha256 value="fdb22e72a8f3ed0e2aab564bf19b2425d417fbc7e8d60e9820d515ae1b1989cf" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-suggest" version="9.4.1">
+         <artifact name="lucene-suggest-9.4.1.jar">
+            <sha256 value="0bd1662bfaa60d6cba12e69b74f90e162900ed077320fe37fbf9e8f5cd78e59f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-test-framework" version="9.4.0">
-         <artifact name="lucene-test-framework-9.4.0.jar">
-            <sha256 value="035f789a9e4ce9b6db65df834c5c7bb15260b1b33c1ec14c292f932ea85114bb" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-test-framework" version="9.4.1">
+         <artifact name="lucene-test-framework-9.4.1.jar">
+            <sha256 value="63850af6b753e0802cba7697db7821727b9b2e23eef11177c1ddbfb37ef3eaf2" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.maven" name="maven-model" version="3.6.2">

+ 1 - 1
server/src/main/java/org/elasticsearch/Version.java

@@ -124,7 +124,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_8_4_3 = new Version(8_04_03_99, org.apache.lucene.util.Version.LUCENE_9_3_0);
     public static final Version V_8_4_4 = new Version(8_04_04_99, org.apache.lucene.util.Version.LUCENE_9_3_0);
     public static final Version V_8_5_0 = new Version(8_05_00_99, org.apache.lucene.util.Version.LUCENE_9_4_0);
-    public static final Version V_8_6_0 = new Version(8_06_00_99, org.apache.lucene.util.Version.LUCENE_9_4_0);
+    public static final Version V_8_6_0 = new Version(8_06_00_99, org.apache.lucene.util.Version.LUCENE_9_4_1);
     public static final Version CURRENT = V_8_6_0;
 
     private static final Map<Integer, Version> idToVersion;