Browse Source

Upgrade to Lucene-9.11.1 (#110234)

Ignacio Vera 1 year ago
parent
commit
a099c9f7e6

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

@@ -1,5 +1,5 @@
 elasticsearch     = 8.15.0
-lucene            = 9.11.0
+lucene            = 9.11.1
 
 bundled_jdk_vendor = openjdk
 bundled_jdk = 22.0.1+8@c7ec1332f7bb44aeba2eb341ae18aca4

+ 2 - 2
docs/Versions.asciidoc

@@ -1,8 +1,8 @@
 
 include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 
-:lucene_version:        9.11.0
-:lucene_version_path:   9_11_0
+:lucene_version:        9.11.1
+:lucene_version_path:   9_11_1
 :jdk:                   11.0.2
 :jdk_major:             11
 :build_type:            tar

+ 5 - 0
docs/changelog/110234.yaml

@@ -0,0 +1,5 @@
+pr: 110234
+summary: Upgrade to Lucene-9.11.1
+area: Search
+type: upgrade
+issues: []

+ 72 - 72
gradle/verification-metadata.xml

@@ -2724,124 +2724,124 @@
             <sha256 value="015d5c229f3cd5c0ebf175c1da08d596d94043362ae9d92637d88848c90537c8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-common" version="9.11.0">
-         <artifact name="lucene-analysis-common-9.11.0.jar">
-            <sha256 value="b66571a2f4bf0607704a8dc05d18bc2857c36b4cfa62c4f6356ee88a5be95280" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-common" version="9.11.1">
+         <artifact name="lucene-analysis-common-9.11.1.jar">
+            <sha256 value="8dfda34e75bc53906a611bae1b5870b38fd5aa3779a390565da40aa71e98d5d9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-icu" version="9.11.0">
-         <artifact name="lucene-analysis-icu-9.11.0.jar">
-            <sha256 value="db3874e7f92283e2bd39a2dcffe7e9c300615f7efffe78c72c2d5c6b922411fe" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-icu" version="9.11.1">
+         <artifact name="lucene-analysis-icu-9.11.1.jar">
+            <sha256 value="caf464abb2cabf9b875dabc0354b43636239170fbe299e103662b267eded136c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.11.0">
-         <artifact name="lucene-analysis-kuromoji-9.11.0.jar">
-            <sha256 value="7e623a91e947d39c7f7e2dfdcc95438f88670f5d49b2cd45834ede8ece886bc5" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.11.1">
+         <artifact name="lucene-analysis-kuromoji-9.11.1.jar">
+            <sha256 value="e48721f62cf61ab2084c6ad504194a1bfcf87ba7d3d0274a50466d9a2c5e0f4f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.11.0">
-         <artifact name="lucene-analysis-morfologik-9.11.0.jar">
-            <sha256 value="659c7e32c866ba2c8862b0bf68538bbfd4e167213ac01dd057030918ffa6a472" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.11.1">
+         <artifact name="lucene-analysis-morfologik-9.11.1.jar">
+            <sha256 value="ba7f25bcb2face90824d3fe9f9ae6cf258d512b6f2b3810e4a7f68e52261dd97" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-nori" version="9.11.0">
-         <artifact name="lucene-analysis-nori-9.11.0.jar">
-            <sha256 value="e88c5c26c4b0287196973fd10b4039784b22605ac94208c482df6eed68fe6cd0" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-nori" version="9.11.1">
+         <artifact name="lucene-analysis-nori-9.11.1.jar">
+            <sha256 value="de2092a41c4aeb135e8e240b977dabddf44e558926a836af0c8f3d81b99042dd" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.11.0">
-         <artifact name="lucene-analysis-phonetic-9.11.0.jar">
-            <sha256 value="e3dc916d515258ef5027cdbb4981e29e15831885aa3eb990c607533c22413d7f" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.11.1">
+         <artifact name="lucene-analysis-phonetic-9.11.1.jar">
+            <sha256 value="eb769dd82361eb9bc749d7789f45417f62e70ca4551928bece68e01a2978dbaa" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.11.0">
-         <artifact name="lucene-analysis-smartcn-9.11.0.jar">
-            <sha256 value="e3ccaaaefb1bbac4238693ee66c9a4c77def459308f9c1655dbd47be8968cc8f" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.11.1">
+         <artifact name="lucene-analysis-smartcn-9.11.1.jar">
+            <sha256 value="d574ad04cf5c0154a3f6d59b5ffcd1428304da5bf16f6f94dd48ebd1c6934f51" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.11.0">
-         <artifact name="lucene-analysis-stempel-9.11.0.jar">
-            <sha256 value="e391273a5cd9bcb574c85d26d123f9634a1f53fafb646335155d256fa6f57309" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.11.1">
+         <artifact name="lucene-analysis-stempel-9.11.1.jar">
+            <sha256 value="21a96efd877ef74fbd090f95bcc89a3999d703806cf56ac16433812957de6142" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-backward-codecs" version="9.11.0">
-         <artifact name="lucene-backward-codecs-9.11.0.jar">
-            <sha256 value="c00347144b4eb30d462de6de73bc77524a208b778592a8890f6590c726b0c6ec" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-backward-codecs" version="9.11.1">
+         <artifact name="lucene-backward-codecs-9.11.1.jar">
+            <sha256 value="d542520817bc9e30b4ece418b36696cfa913425ba6ccdabcb1b5250c08316556" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-codecs" version="9.11.0">
-         <artifact name="lucene-codecs-9.11.0.jar">
-            <sha256 value="62755bb538aec06552d607736763e32032eb3d8e2e64c7c8094acf07c9cad55a" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-codecs" version="9.11.1">
+         <artifact name="lucene-codecs-9.11.1.jar">
+            <sha256 value="3259aa9e06ea96cfb57b1929eb35a0228da51a334f452b9bbcc8f009eae6dc6d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-core" version="9.11.0">
-         <artifact name="lucene-core-9.11.0.jar">
-            <sha256 value="c8d7bbdac42edc8f82749001de734db482901802f3e4899fb5b115922013aa7d" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-core" version="9.11.1">
+         <artifact name="lucene-core-9.11.1.jar">
+            <sha256 value="cb7a9b121bce4ce054ab690ab43ac13ee11ae516d6cef67650130066beee7c9b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-expressions" version="9.11.0">
-         <artifact name="lucene-expressions-9.11.0.jar">
-            <sha256 value="d91822caf4e493425d3fd85662ef22f941a868aca1c119c7479f339297294f83" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-expressions" version="9.11.1">
+         <artifact name="lucene-expressions-9.11.1.jar">
+            <sha256 value="40637d9b983d4dd004b4e40b1facac6d446e6b85095b2caa499840c6eb62c693" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-grouping" version="9.11.0">
-         <artifact name="lucene-grouping-9.11.0.jar">
-            <sha256 value="6594f102bd043f09a7ce44fb7ef0e09ba6a96e93f411b431d7949251743ecce9" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-grouping" version="9.11.1">
+         <artifact name="lucene-grouping-9.11.1.jar">
+            <sha256 value="53fcb43e1a032001fc5ad207b8bf43d4fa13a88309f21761cb12caa0f61027fb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-highlighter" version="9.11.0">
-         <artifact name="lucene-highlighter-9.11.0.jar">
-            <sha256 value="eb83205bfbdf94af2519a7e3b206c5e92a116ef204ecaeed6a9c6f07966ffac0" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-highlighter" version="9.11.1">
+         <artifact name="lucene-highlighter-9.11.1.jar">
+            <sha256 value="af91d9a44a6519e6283ec004cf751dbd429018ae80881dd5073b3862fdfd404d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-join" version="9.11.0">
-         <artifact name="lucene-join-9.11.0.jar">
-            <sha256 value="d6a6a52b38579ddf5ad11870aa18dca91794b5a95593958de207f15856cabdf7" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-join" version="9.11.1">
+         <artifact name="lucene-join-9.11.1.jar">
+            <sha256 value="f2c751e8e1dbc788dc890c25f81930af95fa082f4ced4f977058385c39d92d15" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-memory" version="9.11.0">
-         <artifact name="lucene-memory-9.11.0.jar">
-            <sha256 value="a20f08b5d466eda114ac5cd8ea4017125c85e9bc9e0a1ca7c630d15382d99b2a" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-memory" version="9.11.1">
+         <artifact name="lucene-memory-9.11.1.jar">
+            <sha256 value="3ed0343383ae05a27adba87a841856a7c4ff230ae6d3c388d21e49e03c0524de" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-misc" version="9.11.0">
-         <artifact name="lucene-misc-9.11.0.jar">
-            <sha256 value="8e516bc3928098d54b913cd65f7e04440a46614e58a39dfe7a769f861f079490" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-misc" version="9.11.1">
+         <artifact name="lucene-misc-9.11.1.jar">
+            <sha256 value="03dc8018b503fb32e7c0c0e36dbefeaf4cdd20cccf8fb2766b81a383d6963c1b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-queries" version="9.11.0">
-         <artifact name="lucene-queries-9.11.0.jar">
-            <sha256 value="a8a0aaa41159ad0be990a0017b6196fce75c925192693c6b5282ec42804c0ac3" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-queries" version="9.11.1">
+         <artifact name="lucene-queries-9.11.1.jar">
+            <sha256 value="b3787d26fcadf362f3be77aa4da42ad41e1cf5bf49f040eee731ea95d28acd5a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-queryparser" version="9.11.0">
-         <artifact name="lucene-queryparser-9.11.0.jar">
-            <sha256 value="145f2396201bac06fd8d97085c0fd09f86f78baae1de5156a20848bbfbff7877" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-queryparser" version="9.11.1">
+         <artifact name="lucene-queryparser-9.11.1.jar">
+            <sha256 value="63e3f7d0cd7a08975d0cba31d2898de7fa00dc9f3677e37820f4413824538898" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-sandbox" version="9.11.0">
-         <artifact name="lucene-sandbox-9.11.0.jar">
-            <sha256 value="163a3c4e50bb27b014d5ea6e25e96189d68f563b39745a086b3d720b343be21b" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-sandbox" version="9.11.1">
+         <artifact name="lucene-sandbox-9.11.1.jar">
+            <sha256 value="a1a9118709d5cc52ca160f439c32280f3ba54ec3ba6e3a0db0c1a73a3d790fdb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-spatial-extras" version="9.11.0">
-         <artifact name="lucene-spatial-extras-9.11.0.jar">
-            <sha256 value="4f975adcd1bebc9afd60d9ce2d41cfabec9502f4d485c125296b1acfc1c65107" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-spatial-extras" version="9.11.1">
+         <artifact name="lucene-spatial-extras-9.11.1.jar">
+            <sha256 value="72760a0247b64869a27bf754473a67f32374ca3214bf47053f54f716c8666755" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-spatial3d" version="9.11.0">
-         <artifact name="lucene-spatial3d-9.11.0.jar">
-            <sha256 value="23755e972a65ea7d87a4885f1a761e7a3b5a754a6671d2e751b620f0552ded2a" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-spatial3d" version="9.11.1">
+         <artifact name="lucene-spatial3d-9.11.1.jar">
+            <sha256 value="3e485ee6b2b40898118c87f7b7c9376e8cf787966272aac57e1ef70528e5d7ab" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-suggest" version="9.11.0">
-         <artifact name="lucene-suggest-9.11.0.jar">
-            <sha256 value="cb771911aa9125a1d4be43eab630a7ab3e131f6c519fc03f09d4db36389e0424" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-suggest" version="9.11.1">
+         <artifact name="lucene-suggest-9.11.1.jar">
+            <sha256 value="ce03d7178182694a14ed0433cff532a44b3647cec8d9c1ac541afe7887972105" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-test-framework" version="9.11.0">
-         <artifact name="lucene-test-framework-9.11.0.jar">
-            <sha256 value="628cf5e058d00135342d7cea9ef16d8b1e03e72cb313a6ae03e83b7181fb0972" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-test-framework" version="9.11.1">
+         <artifact name="lucene-test-framework-9.11.1.jar">
+            <sha256 value="4a395a7e2a037c49ca869dd9e98693d91ea190c1390de626ccaf83e3afed0811" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.maven" name="maven-artifact" version="3.6.1">

+ 1 - 1
server/src/main/java/org/elasticsearch/index/IndexVersions.java

@@ -110,7 +110,7 @@ public class IndexVersions {
     public static final IndexVersion UPGRADE_TO_LUCENE_9_11 = def(8_508_00_0, Version.LUCENE_9_11_0);
     public static final IndexVersion UNIQUE_TOKEN_FILTER_POS_FIX = def(8_509_00_0, Version.LUCENE_9_11_0);
     public static final IndexVersion ADD_SECURITY_MIGRATION = def(8_510_00_0, Version.LUCENE_9_11_0);
-
+    public static final IndexVersion UPGRADE_TO_LUCENE_9_11_1 = def(8_511_00_0, Version.LUCENE_9_11_1);
     /*
      * STOP! READ THIS FIRST! No, really,
      *        ____ _____ ___  ____  _        ____  _____    _    ____    _____ _   _ ___ ____    _____ ___ ____  ____ _____ _